Commit graph

530 commits

Author SHA1 Message Date
fjosw
4859640b41 Merge branch 'develop' into documentation 2023-11-17 17:57:32 +00:00
JanNeuendorf
e1a4d0c218
Additional GEVP method with errors (#195)
* Added the function error_gevp() to compute the gevp with statistical errors.

* Changed method name from error_gevp to error_GEVP and removed automatic gamma method

* added auto_gamma to error_GEVP

* Specified exceptions in Corr.error_GEVP

* Fixed a wrong path. It should be np.linalg.LinAlgError

* Added a test for error_GEVP

* The tests of error_gevp loads a test matrix

* Incorporated eigenvectors with uncertainties in GEVP routine

* Cleaned up GEVP routines

* Cleaned up breaking change from merge

* Released tolerance in test of GEVP

* Repaired broken GEVP test

---------

Co-authored-by: Simon Kuberski <simon.kuberski@uni-muenster.de>
2023-11-17 18:57:18 +01:00
fjosw
a1b9473293 Merge branch 'develop' into documentation 2023-11-10 18:13:28 +00:00
s-kuberski
d689959b1f
fix: Check if configs appears multiple times when creating an obs (#216) 2023-11-10 19:13:11 +01:00
fjosw
bdb7c7e2ee Merge branch 'develop' into documentation 2023-10-24 17:31:15 +00:00
s-kuberski
dc63142f8e
Fixed bugs for combined fits with multiple independent variables (#211) 2023-10-24 19:30:52 +02:00
fjosw
2423c7e49e Merge branch 'develop' into documentation 2023-10-20 17:23:13 +00:00
Justus Kuhlmann
0ef8649031
Feat/read sfcf multi (#210)
* make template

* read_sfcf_multi running with compact format

* fix append mode, norrmal tests work

* improve readability

* add simple test for multi_read

* simple multi_test works

* add first method to check sfcf param hashes

* add docstring

* simple test for o format working

* use benedict to make loops easier

* introduce python-benedict as dep

* no nice_out, less error prone, found bug in tests

* Revert "introduce python-benedict as dep"

This reverts commit 9696d68b7a.

* Revert "use benedict to make loops easier"

This reverts commit fa3987479b.

* no nice output after reverts

* [build] Added jkuhl-uni as CODEOWNER for sfcf.

* refactor: flatten internal dicts

* very small test extension

* ...flake8

* docu

* Delete second sep init

---------

Co-authored-by: Fabian Joswig <fabian.joswig@uni-muenster.de>
2023-10-20 19:22:55 +02:00
fjosw
4317187392 Merge branch 'develop' into documentation 2023-07-21 13:17:11 +00:00
Fabian Joswig
7f8c2ce33b
feat: added support for addition and multiplication of complex numbers (#209)
to Corr objects.
2023-07-21 14:15:41 +01:00
fjosw
af8ab0a59f Merge branch 'develop' into documentation 2023-07-19 14:06:38 +00:00
Fabian Joswig
af28f77ec5
__eq__ method for Corr class (#206)
* feat: implemented __eq__ method for Corr class.

* feat: __eq__ method now respects None entries in correlators.

* feat: Obs can now be compared to None, __ne__ method removed as it is
not required.

* feat: Corr.__eq__ rewritten to give a per element comparison.

* tests: additional test case for correlator comparison added.

* feat: comparison now also works for padding.
2023-07-19 15:06:19 +01:00
fjosw
9a186d6c30 Merge branch 'develop' into documentation 2023-07-19 11:13:42 +00:00
Fabian Joswig
1e438356fd
Vectorized gamma_method (#207)
* feat: vectorized gamma_method function added.

* feat: vectorized gamma method generalized to also work on other objects
like Corr or Fit_result.

* feat: alias gamma_method for vectorized gamma_method added.

* docs: example 5 updated to include vectorized gamma_method.

* docs: output of example 5 updated.
2023-07-19 12:13:20 +01:00
fjosw
9b06620d58 Merge branch 'develop' into documentation 2023-07-18 11:08:01 +00:00
Fabian Joswig
66d5f8be24
Corr array initialization generalized (#203)
* feat: corr array initialization generalized.

* feat: additional checks for three-dimensional arrays added.

* docs: Corr docstring improved.

* docs: typos corrected.

* docs: details about None padding added to Corr docstring.
2023-07-18 12:07:46 +01:00
fjosw
345b7404d3 Merge branch 'develop' into documentation 2023-07-17 10:49:15 +00:00
Fabian Joswig
f1150f09c8
Matmul overloaded for correlator class. (#199)
* feat: matmul method added to correlator class.

* feat: corr, corr matmul and correlator matrix trace added.

* tests: tests for matmul and trace added.

* tests: slightly reduced tolerance and good guess bad guess test.

* feat: rmatmul added and __array_priority__ set.

* tests: additional tests for rmatmul added.

* tests: one more tests for rmatmul added.

* docs: docstring added to Corr.trace.

* tests: associative property test added for complex Corr matmul.

* fix: Corr.roll method now also works for correlator matrices by
explicitly specifying the axis.

Co-authored-by: Matteo Di Carlo <matteo.dicarlo93@gmail.com>

* feat: exception type for correlator trace of 1dim correlator changed.

* tests: trace N=1 exception tested.

---------

Co-authored-by: Matteo Di Carlo <matteo.dicarlo93@gmail.com>
2023-07-17 11:48:57 +01:00
fjosw
faf1f78ee8 Merge branch 'develop' into documentation 2023-07-14 13:27:13 +00:00
Fabian Joswig
5c2a6de56f
fix: explicit Exception for combined fit constant edge case. (#202) 2023-07-14 14:26:54 +01:00
fjosw
6f3abd0b36 Merge branch 'develop' into documentation 2023-07-14 13:22:20 +00:00
s-kuberski
6dcd0c3518
feat: Added numerical integration of generic functions (#201)
* feat: Added numerical integration of generic functions

* refactored integration routines

* tests: two trivial tests for integration added.

* docs: quad docstring corrected.

* Small bugfix for integration without obs

---------

Co-authored-by: Fabian Joswig <fabian.joswig@ed.ac.uk>
2023-07-14 14:21:59 +01:00
fjosw
328869f300 Merge branch 'develop' into documentation 2023-07-14 12:38:38 +00:00
Fabian Joswig
8736d1cd3c
feat: CObs format added and complex Corr print improved. (#200) 2023-07-14 13:38:21 +01:00
fjosw
f72a2c5f94 Merge branch 'develop' into documentation 2023-07-14 12:12:27 +00:00
Fabian Joswig
b62a18643e
Bootstrap export/import (#198)
* feat: export_bootstrap method added.

* feat: import_bootstrap function added.

* tests: first test for import/export bootstrap added.

* feat: bootstrap feature cleaned up.

* docs: boostrap docstrings improved.
2023-07-14 13:12:11 +01:00
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