ExpInt: rename to 'Integral'

GeoStat-Framework · Oct 19, 2022 · dfdea63 · dfdea63
1 parent f704dee
commit dfdea63
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 21 deletions.
diff --git a/examples/02_cov_model/README.rst b/examples/02_cov_model/README.rst
@@ -62,8 +62,7 @@ The following standard covariance models are provided by GSTools
     Gaussian
     Exponential
     Matern
-    ExpInt
-    Mueller
+    Integral
     Stable
     Rational
     Cubic

diff --git a/src/gstools/__init__.py b/src/gstools/__init__.py
@@ -64,8 +64,7 @@
    Gaussian
    Exponential
    Matern
-   ExpInt
-   Mueller
+   Integral
    Stable
    Rational
    Cubic
@@ -143,14 +142,13 @@
     Circular,
     CovModel,
     Cubic,
-    ExpInt,
     Exponential,
     Gaussian,
     HyperSpherical,
+    Integral,
     JBessel,
     Linear,
     Matern,
-    Mueller,
     Rational,
     Spherical,
     Stable,
@@ -196,8 +194,7 @@
     "Gaussian",
     "Exponential",
     "Matern",
-    "ExpInt",
-    "Mueller",
+    "Integral",
     "Stable",
     "Rational",
     "Cubic",

diff --git a/src/gstools/covmodel/models.py b/src/gstools/covmodel/models.py
@@ -10,8 +10,7 @@
    Gaussian
    Exponential
    Matern
-   ExpInt
-   Mueller
+   Integral
    Stable
    Rational
    Cubic
@@ -36,8 +35,7 @@
     "Gaussian",
     "Exponential",
     "Matern",
-    "ExpInt",
-    "Mueller",
+    "Integral",
     "Stable",
     "Rational",
     "Cubic",
@@ -393,7 +391,7 @@ def calc_integral_scale(self):  # noqa: D102
         )
 
 
-class Mueller(CovModel):
+class Integral(CovModel):
     r"""The Exponential Integral covariance model.
 
     Notes
@@ -456,7 +454,7 @@ def default_opt_arg_bounds(self):
         return {"nu": [0.0, 50.0, "oc"]}
 
     def cor(self, h):
-        """ExpInt normalized correlation function."""
+        """Exponential Integral normalized correlation function."""
         h = np.asarray(h, dtype=np.double)
         return 0.5 * self.nu * exp_int(1.0 + 0.5 * self.nu, h**2)
 
@@ -484,9 +482,6 @@ def calc_integral_scale(self):  # noqa: D102
         )
 
 
-ExpInt = Mueller
-
-
 class Rational(CovModel):
     r"""The rational quadratic covariance model.
 

diff --git a/tests/test_covmodel.py b/tests/test_covmodel.py
@@ -13,10 +13,10 @@
     Exponential,
     Gaussian,
     HyperSpherical,
+    Integral,
     JBessel,
     Linear,
     Matern,
-    Mueller,
     Rational,
     Spherical,
     Stable,
@@ -83,7 +83,7 @@ def setUp(self):
             SuperSpherical,
             JBessel,
             TPLSimple,
-            Mueller,
+            Integral,
         ]
         self.tpl_cov_models = [
             TPLGaussian,
@@ -398,8 +398,8 @@ def test_rescale(self):
         self.assertAlmostEqual(model1.integral_scale, model3.integral_scale)
 
     def test_special_models(self):
-        # matern and mueller converge to gaussian
-        model0 = Mueller(rescale=0.5)
+        # Matern and Integral converge to gaussian
+        model0 = Integral(rescale=0.5)
         model0.set_arg_bounds(nu=[0, 1001])
         model0.nu = 1000
         model1 = Matern()