Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add sum model #364

Open
wants to merge 57 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
94b6c29
plot: handle len_scale of 0
MuellerSeb Jul 26, 2024
abbb062
covmodel: init len_scale with integral_scale if given; remove unused …
MuellerSeb Jul 26, 2024
c39866a
bounds: allow interval with equal bounds if closed
MuellerSeb Jul 26, 2024
df9f2ba
CovModel: add force_values logic
MuellerSeb Jul 26, 2024
a3f1ec6
generator: shortcut for 0 variance
MuellerSeb Jul 27, 2024
8b3ad81
CovModel: safer usage of privat attr; anis set bug fix; simpler int s…
MuellerSeb Jul 28, 2024
a60b3d7
CovModel: check _init in bounds setter; also compare geo_scale; simpl…
MuellerSeb Jul 28, 2024
92210ad
CovModel: remove force arguments mechanic
MuellerSeb Jul 28, 2024
8999bf9
pylint fixes
MuellerSeb Jul 28, 2024
d643b45
TPL: remove var_raw and var_factor logic and only add intensity as pr…
MuellerSeb Aug 11, 2024
81e5421
tests: remove tests for var_raw
MuellerSeb Aug 11, 2024
669e9a2
CovModel: remove mechanism for fixed args again
MuellerSeb Aug 11, 2024
01d1d82
CovModel: simplify fitting routines
MuellerSeb Aug 11, 2024
418038f
CovModel: fix setting integral scale as list of values
MuellerSeb Aug 12, 2024
d8b037f
no need to set var last anymore
MuellerSeb Aug 12, 2024
0b63225
fit: add comment
MuellerSeb Aug 12, 2024
21d0e4a
add ratio error class; better arg checking routines
MuellerSeb Aug 14, 2024
e6374db
CovModel: better dim setting
MuellerSeb Aug 15, 2024
dcb003b
add sum_tools submodule
MuellerSeb Aug 15, 2024
057c888
add SumModel class
MuellerSeb Aug 15, 2024
656125a
add pure Nugget model
MuellerSeb Aug 15, 2024
dbdfa27
CovModel: let the sum magic happen
MuellerSeb Aug 15, 2024
2858f06
pylint fixes
MuellerSeb Aug 15, 2024
947619a
fix doc-string of SumModel for docs
MuellerSeb Aug 15, 2024
480fa32
CovModel: add switch to add doc string
MuellerSeb Aug 15, 2024
171efba
Fourier: fix doc
MuellerSeb Aug 15, 2024
e7838cf
SumModel: models need to either be all instances or all subclasses of…
MuellerSeb Aug 19, 2024
0e35a22
SumModel: sum models have a constant rescale factor of 1 since they a…
MuellerSeb Aug 19, 2024
2ded2e0
CovModel: add 'needs_fourier_transform' attribute
MuellerSeb Jan 1, 2025
aee1985
covmodel.tools: allow setting bounds of sub-args
MuellerSeb Jan 6, 2025
f30ebb7
sum-tools: prepare setting sub-args by weights
MuellerSeb Jan 6, 2025
a8ef32f
SumModel: prepare sum models for fitting
MuellerSeb Jan 6, 2025
050cc37
fit: enable fitting of sum-models; refactor fitting in general
MuellerSeb Jan 6, 2025
b120d93
tests: update tests to check for new var/nugget/sill handling
MuellerSeb Jan 6, 2025
302a056
CI: update to include py3.13
MuellerSeb Jan 6, 2025
9c2673e
Doc: use myst_parser instead of m2r2 and update docs
MuellerSeb Jan 6, 2025
eda015d
Merge branch 'main' into add_sum_model
MuellerSeb Jan 6, 2025
d03146f
lint
MuellerSeb Jan 6, 2025
ee485c2
Merge branch 'add_sum_model' of github.com:GeoStat-Framework/GSTools …
MuellerSeb Jan 6, 2025
5dc6b16
pylint: set all config in pyproject
MuellerSeb Jan 6, 2025
64b102e
Normalizer: implement simple derivative to remove scipy dependency
MuellerSeb Jan 6, 2025
f475c1e
fit: correctly check for parameters to fit
MuellerSeb Jan 6, 2025
8ea78f8
fit: fix init guess for var_i
MuellerSeb Jan 6, 2025
3eee1dd
fix typo
MuellerSeb Jan 6, 2025
e3b944e
Doc: add mini-gallery to tutorials
MuellerSeb Jan 6, 2025
8a97d0d
typo
MuellerSeb Jan 7, 2025
f0b113e
Docs: add first examples for sum models
MuellerSeb Jan 7, 2025
361860a
Merge branch 'main' into add_sum_model
MuellerSeb Jan 30, 2025
af06e49
SumModel: copy CovModel instances to prevent strange errors
MuellerSeb Feb 7, 2025
fb0a01e
SumModel: also copy models of other summodels
MuellerSeb Feb 7, 2025
e8ea93c
make sum-models comparable
MuellerSeb Feb 7, 2025
c64af49
SumModel: remove RatioError, use ValueError instead
MuellerSeb Feb 8, 2025
c885952
SumModel: add tests
MuellerSeb Feb 8, 2025
c66d722
add test data to manifest
MuellerSeb Feb 8, 2025
942bca7
Merge branch 'add_sum_model' of github.com:GeoStat-Framework/GSTools …
MuellerSeb Feb 8, 2025
fedb294
pylint fix
MuellerSeb Feb 8, 2025
48ec88c
SumModel: more tests
MuellerSeb Feb 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pylint fix
MuellerSeb committed Feb 8, 2025
commit fedb294ba8018ea9cb67edb3313050f6538105f1
2 changes: 1 addition & 1 deletion src/gstools/covmodel/sum_tools.py
Original file line number Diff line number Diff line change
@@ -219,7 +219,7 @@ def sum_compare(this, that):
return False
if not np.isclose(this.nugget, that.nugget):
return False
return all([mod1 == mod2 for (mod1, mod2) in zip(this, that)])
return all(mod1 == mod2 for (mod1, mod2) in zip(this, that))


def sum_model_repr(summod): # pragma: no cover