improve testing and stability

sibirrer · Jun 28, 2024 · caa13de · caa13de
1 parent 567b0d4
commit caa13de
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/hierarc/Sampling/Distributions/anisotropy_distributions.py b/hierarc/Sampling/Distributions/anisotropy_distributions.py
@@ -66,7 +66,7 @@ def draw_anisotropy(
                 else:
                     a_ani_draw = np.random.normal(a_ani, a_ani_sigma)
                 if a_ani_draw < self._a_ani_min or a_ani_draw > self._a_ani_max:
-                    return self.draw_anisotropy(a_ani, a_ani_sigma)
+                    return self.draw_anisotropy(a_ani, a_ani_sigma, beta_inf, beta_inf_sigma)
                 kwargs_return["a_ani"] = a_ani_draw
             else:
                 kwargs_return["a_ani"] = a_ani

diff --git a/test/test_Sampling/test_Distributions/test_anisotropy_distribution.py b/test/test_Sampling/test_Distributions/test_anisotropy_distribution.py
@@ -1,3 +1,4 @@
+import numpy.testing as npt
 from hierarc.Sampling.Distributions.anisotropy_distributions import (
     AnisotropyDistribution,
 )
@@ -47,3 +48,44 @@ def test_draw_anisotropy(self):
         )
         kwargs_drawn = ani_dist.draw_anisotropy()
         assert "a_ani" not in kwargs_drawn
+
+        ani_dist = AnisotropyDistribution(
+            anisotropy_model="GOM",
+            anisotropy_sampling=True,
+            distribution_function="NONE",
+            kwargs_anisotropy_min=None,
+            kwargs_anisotropy_max=None,
+        )
+        kwargs_drawn = ani_dist.draw_anisotropy(a_ani=1, beta_inf=0.9)
+        assert kwargs_drawn["a_ani"] == 1
+        assert kwargs_drawn["beta_inf"] == 0.9
+
+        kwargs_anisotropy = {
+            "a_ani": 1,
+            "beta_inf": 0.8,
+            "a_ani_sigma": 2,
+            "beta_inf_sigma": 2,
+        }
+
+        for i in range(100):
+            kwargs_drawn = self._ani_dist.draw_anisotropy(**kwargs_anisotropy)
+
+    def test_raises(self):
+
+        with npt.assert_raises(ValueError):
+            kwargs_anisotropy = {
+                "a_ani": -1,
+                "beta_inf": 0.8,
+                "a_ani_sigma": 0.1,
+                "beta_inf_sigma": 0.2,
+            }
+            kwargs_drawn = self._ani_dist.draw_anisotropy(**kwargs_anisotropy)
+
+        with npt.assert_raises(ValueError):
+            kwargs_anisotropy = {
+                "a_ani": 1,
+                "beta_inf": -1,
+                "a_ani_sigma": 0.1,
+                "beta_inf_sigma": 0.2,
+            }
+            kwargs_drawn = self._ani_dist.draw_anisotropy(**kwargs_anisotropy)