Commit graph

504 commits

Author SHA1 Message Date
fjosw
9b1f60c00e Merge branch 'develop' into documentation 2023-07-10 15:33:35 +00:00
Fabian Joswig
db79cb2d95
tests: test for print_config added. 2023-07-10 15:44:06 +01:00
Fabian Joswig
9589820253
tests: coverage for all derivative variants extended. 2023-07-10 15:35:37 +01:00
fjosw
b5eb4a0bfd Merge branch 'develop' into documentation 2023-06-02 14:04:36 +00:00
Fabian Joswig
525c61ed20
Fix another edge case in _compute_drho (#194)
* tests: failing test for compute_drho edge case added.

* tests: example file for failing compute_drho added.

* tests: assertion that dvalue stays the same added to compute drho test.

* fix: another edge case in computation of drho fixed.
2023-06-02 15:04:15 +01:00
Justus Kuhlmann
9489b87a7e
fix nan to None test (#192) 2023-06-01 14:07:16 +01:00
fjosw
1802a4ee1c Merge branch 'develop' into documentation 2023-05-31 17:07:58 +00:00
Fabian Joswig
bb43a8afb7
Fix Obs in f-strings without specifier (#190)
* fix: Conversion of an array with ndim > 0 to a scalar deprecation fixed.

* fix: adjusted maximal value for rho in test_gamma_method_irregular.

* fix: obs in f-strings now work again when no specifier is provided.
2023-05-31 18:07:38 +01:00
fjosw
1da8d9183e Merge branch 'develop' into documentation 2023-05-30 14:29:37 +00:00
s-kuberski
34fe7f44fc
Bug fix for edge case in _compute_drho (#189) 2023-05-30 15:29:22 +01:00
Fabian Joswig
095f7c8a46
fix: adjusted maximal value for rho in test_gamma_method_irregular. (#188) 2023-05-30 14:03:01 +01:00
Fabian Joswig
dc73456759
tests: np.alltrue replaced by np.all. 2023-05-30 12:52:10 +01:00
fjosw
8f392816d5 Merge branch 'develop' into documentation 2023-05-26 12:02:09 +00:00
Justus Kuhlmann
1a811b04f3
Feat/files idl xsf (#185)
* added kwrg idl to ms5_xsf_read

* change output, warn user if expected idl not found
2023-05-26 13:01:52 +01:00
fjosw
20e5a0098f Merge branch 'develop' into documentation 2023-05-22 11:38:03 +00:00
Justus Kuhlmann
e97cc519a9
taking care of cols with only None values (#184) 2023-05-22 12:37:46 +01:00
fjosw
c34343a17a Merge branch 'develop' into documentation 2023-05-19 13:59:16 +00:00
s-kuberski
81e4f37934
Restored JSON output of dicts with non-string keys (#179)
* Restored JSON output of dicts with non-string keys

* Use numpy.integer instead of deprecated numpy.int
2023-05-19 14:58:56 +01:00
fjosw
53536e0943 Merge branch 'develop' into documentation 2023-05-18 16:12:07 +00:00
Justus Kuhlmann
a5b6f69160
Slightly better Typechecking when exporting to SQL (#174)
* corret type clause

* add tests, changes in create_json_string

* create json-string now gives back None

* revert changes

* fix panda sql export

* add SQL test

* fixed None type export for csv and sql.gz

* move None parsing to json io

* alter regex

* revert changes

* only replace None with empty str when necessary

* fixed deserialze_df for python 3.7

* add more tesets

* fix case where gz was ignored

* hand voer gz explicitly

* replace nan  by None in non-Obs columns

* moved warning to csv export, mroe tests

* only values able to be nan are put in np.isnan()

* added python float for warning
2023-05-18 17:11:52 +01:00
fjosw
ae5fbbee3c Merge branch 'develop' into documentation 2023-05-16 17:37:03 +00:00
s-kuberski
3198088f9c
Feat/flow (#176)
* fix: String conversion of Obs can now handle a dvalue that is NaN or inf

* Feat: Added extraction of w0/a from openQCD files

* Removed unnecessary round in w0 routine

* Improved error handling in fit_t0

* Allowed to change the reference flow time in t0 and w0 determinations.

* Added doc string to fit_t0
2023-05-16 18:29:13 +01:00
fjosw
ba6cc09814 Merge branch 'develop' into documentation 2023-05-16 17:28:53 +00:00
Justus Kuhlmann
5155effbbf
Fix/sort names (#177)
* cosmetic fix in sort_names

* bug fix, more tests
2023-05-16 18:28:32 +01:00
fjosw
1800790b19 Merge branch 'develop' into documentation 2023-05-03 14:31:18 +00:00
s-kuberski
15d07de87f
fix: String conversion of Obs can now handle a dvalue that is NaN or inf (#173) 2023-05-03 16:30:59 +02:00
fjosw
00961c151a Merge branch 'develop' into documentation 2023-04-28 17:15:13 +00:00
s-kuberski
65a9128a7d
Fix/merge idx (#172)
* Fix: Corrected merging of idls

* Fix: Computation of drho in cases where tau_int is large compared to the chain length

* Removed unnecessary imports

* Refactor list comparisons in obs.py
2023-04-28 18:14:51 +01:00
fjosw
f4e0bd1d7e Merge branch 'develop' into documentation 2023-04-20 16:34:23 +00:00
Fabian Joswig
be061fdc23
Feat/str format (#170)
* feat: _format_uncertainty now accepts a significance.

* feat: __format__ now accepts significance.

* feat: explicit + sign added to format.

* fix: - option removed from format specifier.

* feat: space format added.
2023-04-20 17:31:37 +01:00
fjosw
48694ee539 Merge branch 'develop' into documentation 2023-04-20 16:31:18 +00:00
s-kuberski
a214465413
Fix/gaps (#169)
* fix: Fixed range detection in gamma_method

* Corrected test in dobsio

* Changed expansion paradigm in gamma_method

* Extended tests

* Updated docstrings

* Removed unnecessary intermediate variable

* Removed unnecessary code

* Fixed previously introduced bug in output in obs.details()

* Fixed previously introduced bug in window determination

* New criterion for matching gapped replica, fixed determination of w_max and fixed tau_exp analysis with gaps

* tests: split up consistency test for gamma method.

---------

Co-authored-by: Fabian Joswig <fabian.joswig@ed.ac.uk>
2023-04-20 17:30:57 +01:00
fjosw
24d572c979 Merge branch 'develop' into documentation 2023-03-17 13:52:30 +00:00
nils-ht
2363b755dd
NHT changes plots combined fit (#166)
* NHT changes plots combined fit

* feat: Exception for illegal combination added and test fixed.

---------

Co-authored-by: Fabian Joswig <fabian.joswig@ed.ac.uk>
2023-03-17 13:52:07 +00:00
fjosw
3cc244e546 Merge branch 'develop' into documentation 2023-03-16 13:12:25 +00:00
Justus Kuhlmann
83204ce794
fixed appended mode reading (#165) 2023-03-16 13:12:03 +00:00
fjosw
8186f5cb6b Merge branch 'develop' into documentation 2023-03-15 17:46:38 +00:00
Justus Kuhlmann
41fec09816
Impr/fix refactor sfcf read (#164)
* refactor read_sfcf

* adding tests for find_corr and read_compact_file

* add necessary broken data for tests

* fixed appended mode reading

* factored out sort_names and find_files

* now also using sort_files in sfcf.py

* edited tests to fit with new structure

* added find_files function

* shifted helpfunctions to bottom of file

* removed some debug lines

* linting

* Fixed requested changes, added silent mode

* added Exception if correlator is not found by read_append_rep

* use tmp_path fixture

* linting silent keyword

* try to fix testing for a_bb

* tests: Exception testing in test_find_corr made more explicit.

---------

Co-authored-by: Fabian Joswig <fabian.joswig@ed.ac.uk>
2023-03-15 17:46:12 +00:00
fjosw
b27c2a1f94 Merge branch 'develop' into documentation 2023-03-10 14:17:41 +00:00
Fabian Joswig
3c942b380d
Serialize list of Obs in pandas.to_sql (#162)
* feat: Added serialization of list of Obs in pandas.to_sql.

* tests: test for list of Obs to sql added.

* feat: auto_gamma functionality added for deserialization of lists of
Obs.
2023-03-10 14:17:20 +00:00
fjosw
6fbf4d30c4 Merge branch 'develop' into documentation 2023-03-09 15:33:17 +00:00
Fabian Joswig
a7a098b861
fix: chisquare, dof and p-value also calculated when dof is 0. Test for
dof and chisquare_over_dof added.
2023-03-09 15:32:27 +00:00
Fabian Joswig
06ba2015be
tests: test for different methods in prior fit added. 2023-03-09 15:00:52 +00:00
fjosw
8f36de348d Merge branch 'develop' into documentation 2023-03-08 16:46:09 +00:00
Fabian Joswig
80f4eef912
chore: Exception in least_squares specified. 2023-03-08 16:45:29 +00:00
fjosw
c3eee00df7 Merge branch 'develop' into documentation 2023-03-07 16:15:37 +00:00
Fabian Joswig
839d9214ed
Improved prior fit (#161)
* refactor: merged combined fit and prior fit without breaking the
routine. Fitting with priors does not work yet.

* refactor: correlated fits without priors work now.

* refactor: prior error propagation and dof fixed.

* refactor: old prior fit implementation moved to tests.

* refactor: moved _extract_val_and_dval out of least_squares.

* refactor: comment removed.

* tests: additional tests and exceptions added.

* tests: test for constrained prior fit added.

* docs: least_squares docstring extended.

* fix: linting errors fixed.

* feat: additional if cause for fits without priors added to achieve
original speed.

* tests: test_constrained_and_prior_fit fixed.

* fix: fix array cast of least_squares dict mode.

* tests: test for lists in dict fit added.

* fix: additional asarray added in resplot.

Co-authored-by: Simon Kuberski <simon.kuberski@uni-muenster.de>
2023-03-07 16:15:16 +00:00
fjosw
bcb4f44a50 Merge branch 'develop' into documentation 2023-03-03 16:35:43 +00:00
Fabian Joswig
82cd2f11ea
fix: multi dim fits fixed in least squares. Test added. (#160)
Co-authored-by: Simon Kuberski <simon.kuberski@uni-muenster.de>
2023-03-03 16:35:26 +00:00
fjosw
00b05b4a7d Merge branch 'develop' into documentation 2023-03-02 18:54:58 +00:00