Merge branch 'develop' into fix_1165_asym_prof

pypesto/profile/options.py

@@ -66,6 +66,8 @@ def __init__(
         self.magic_factor_obj_value = magic_factor_obj_value
         self.whole_path = whole_path
 
+        self.validate()
+
     def __getattr__(self, key):
         """Allow usage of keys like attributes."""
         try:
@@ -91,3 +93,24 @@ def create_instance(
             return maybe_options
         options = ProfileOptions(**maybe_options)
         return options
+
+    def validate(self):
+        """Check if options are valid.
+
+        Raises ``ValueError`` if current settings aren't valid.
+        """
+        if self.min_step_size <= 0:
+            raise ValueError("min_step_size must be > 0.")
+        if self.max_step_size <= 0:
+            raise ValueError("max_step_size must be > 0.")
+        if self.min_step_size > self.max_step_size:
+            raise ValueError("min_step_size must be <= max_step_size.")
+        if self.default_step_size <= 0:
+            raise ValueError("default_step_size must be > 0.")
+        if self.default_step_size > self.max_step_size:
+            raise ValueError("default_step_size must be <= max_step_size.")
+        if self.default_step_size < self.min_step_size:
+            raise ValueError("default_step_size must be >= min_step_size.")
+
+        if self.magic_factor_obj_value < 0 or self.magic_factor_obj_value >= 1:
+            raise ValueError("magic_factor_obj_value must be >= 0 and < 1.")

pypesto/profile/profile.py

@@ -89,6 +89,7 @@ def parameter_profile(
     if profile_options is None:
         profile_options = ProfileOptions()
     profile_options = ProfileOptions.create_instance(profile_options)
+    profile_options.validate()
 
     # create a function handle that will be called later to get the next point
     if isinstance(next_guess_method, str):

test/profile/test_profile.py

@@ -415,6 +415,28 @@ def test_approximate_ci():
     assert np.isclose(ub, 9)
 
 
+def test_options_valid():
+    """Test ProfileOptions validity checks."""
+    # default settings are valid
+    profile.ProfileOptions()
+
+    # try to set invalid values
+    with pytest.raises(ValueError):
+        profile.ProfileOptions(default_step_size=-1)
+    with pytest.raises(ValueError):
+        profile.ProfileOptions(default_step_size=1, min_step_size=2)
+    with pytest.raises(ValueError):
+        profile.ProfileOptions(
+            default_step_size=2,
+            min_step_size=1,
+        )
+    with pytest.raises(ValueError):
+        profile.ProfileOptions(
+            min_step_size=2,
+            max_step_size=1,
+        )
+
+
 @pytest.mark.parametrize(
     "lb,ub",
     [(6 * np.ones(5), 10 * np.ones(5)), (-4 * np.ones(5), 1 * np.ones(5))],