Commit graph

542 commits

Author SHA1 Message Date
fjosw
2b668c1636 Merge branch 'develop' into documentation 2024-09-13 17:16:13 +00:00
s-kuberski
4b1bb0872a
fix: corrected bug that prevented combined fits with multiple x-obs in some cases (#241)
* fix: corrected bug that prevented combined fits with multiple x-obs in some cases

* made test more complex

* [Fix] Slightly increase tolerance for matrix function test.

* Adapt test_merge_idx to compare lists

---------

Co-authored-by: Simon Kuberski <simon.kuberski@cern.ch>
Co-authored-by: Fabian Joswig <fjosw@users.noreply.github.com>
2024-09-13 19:15:59 +02:00
fjosw
b1774646f4 Merge branch 'develop' into documentation 2024-09-13 06:35:25 +00:00
Pia Leonie Jones Petrak
1d6f7f65c0
Feature/corr matrix and inverse cov matrix as input in least squares function for correlated fits (#223)
* feat: corr_matrix kwargs as input for least squares fit

* feat/tests: inverse covariance matrix and correlation matrix kwargs as input for least squares function

* feat/tests/example: reduced new kwargs to 'inv_chol_cov_matrix' and outsourced the inversion & cholesky decomposition of the covariance matrix (function 'invert_corr_cov_cholesky(corr, covdiag)')

* tests: added tests for inv_chol_cov_matrix kwarg for the case of combined fits

* fix: renamed covdiag to inverrdiag needed for the cholesky decomposition and corrected its documentation

* examples: added an example of a correlated combined fit to the least_squares documentation

* feat/tests/fix(of typos): added function 'sort_corr()' (and a test of it) to sort correlation matrix according to a list of alphabetically sorted keys

* docs: added more elaborate documentation/example of sort_corr(), fixed typos in documentation of invert_corr_cov_cholesky()
2024-09-13 08:35:10 +02:00
fjosw
ee6b82a17f Merge branch 'develop' into documentation 2024-04-25 18:46:09 +00:00
s-kuberski
db612597d2
[fix] Handle missing replia (#232)
* [fix] First version of a fix to cope with missing replica.

* [fix] added test for missing replica

* [fix] refactored fix for missing replica, modified tests

* [fix] refinement of tests
2024-04-25 20:45:53 +02:00
fjosw
eee4eb35bd Merge branch 'develop' into documentation 2024-04-17 12:53:52 +00:00
Fabian Joswig
43bd99b6c7
[fix] Numpy 2 breaking changes in tests (#234) 2024-04-17 14:53:34 +02:00
fjosw
6a344bcddf Merge branch 'develop' into documentation 2024-02-18 12:39:50 +00:00
Justus Kuhlmann
b930fab9c2
Fix keyword files with list of lists (#226)
* first impl. handle reps with list of lists

* implement explicit type checks
2024-02-18 13:39:35 +01:00
fjosw
efb8c0ca72 Merge branch 'develop' into documentation 2024-01-07 16:22:21 +00:00
Fabian Joswig
5122e260ea
Special function module (#221)
* [fix] Fixed intendation for flake8

* [feat] special module with Bessel functions added.

* [feat] init adapted.

* [tests] First test for special module added.

* [tests] Check kn special function derivative explicitly vs numerical
derivative of scipy function.

* [feat] Added remaining autograd scipy special functions to the special
module.

* [feat] Imports corrected, docstring added.
2024-01-07 17:22:05 +01:00
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