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

Draft
wants to merge 28 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 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
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
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ target-version = [
max-locals = 50
max-branches = 30
max-statements = 85
max-attributes = 25
max-attributes = 30
max-public-methods = 80

[tool.cibuildwheel]
Expand Down
6 changes: 6 additions & 0 deletions src/gstools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@

.. autosummary::
CovModel
SumModel

Covariance Models
^^^^^^^^^^^^^^^^^
Expand All @@ -62,6 +63,7 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~

.. autosummary::
Nugget
Gaussian
Exponential
Matern
Expand Down Expand Up @@ -153,9 +155,11 @@
JBessel,
Linear,
Matern,
Nugget,
Rational,
Spherical,
Stable,
SumModel,
SuperSpherical,
TPLExponential,
TPLGaussian,
Expand Down Expand Up @@ -198,6 +202,8 @@
__all__ += ["transform", "normalizer", "config"]
__all__ += [
"CovModel",
"SumModel",
"Nugget",
"Gaussian",
"Exponential",
"Matern",
Expand Down
7 changes: 6 additions & 1 deletion src/gstools/covmodel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
:toctree:

CovModel
SumModel

Covariance Models
^^^^^^^^^^^^^^^^^
Expand All @@ -27,6 +28,7 @@
.. autosummary::
:toctree:

Nugget
Gaussian
Exponential
Matern
Expand All @@ -53,7 +55,7 @@
TPLSimple
"""

from gstools.covmodel.base import CovModel
from gstools.covmodel.base import CovModel, SumModel
from gstools.covmodel.models import (
Circular,
Cubic,
Expand All @@ -64,6 +66,7 @@
JBessel,
Linear,
Matern,
Nugget,
Rational,
Spherical,
Stable,
Expand All @@ -78,6 +81,8 @@

__all__ = [
"CovModel",
"SumModel",
"Nugget",
"Gaussian",
"Exponential",
"Matern",
Expand Down
Loading
Loading