fixed tests

bofire/data_models/objectives/desirabilities.py

@@ -36,6 +36,27 @@ class DesirabilityObjective(IdentityObjective):
 
     type: Literal["DesirabilityObjective"] = "DesirabilityObjective"  # type: ignore
 
+    @pydantic.model_validator(mode="after")
+    def validate_clip(self):
+
+        if not "clip" in list(self.__dict__):
+            return self
+
+        if self.clip:
+            return self
+
+        log_shapes = {
+            key: val
+            for (key, val) in self.__dict__.items()
+            if key.startswith("log_shape_factor")
+        }
+        for key, log_shape_ in log_shapes.items():
+            if log_shape_ != 0:
+                raise ValueError(
+                    f"Log shape factor {key} must be zero if clip is False."
+                )
+        return self
+
 
 class IncreasingDesirabilityObjective(_SeriesNumpyCallable, DesirabilityObjective):
     """An objective returning a reward the scaled identity, but trimmed at the bounds:
@@ -88,25 +109,8 @@ def call_numpy(
 
         return y
 
-    @pydantic.model_validator(mode="after")
-    def validate_clip(self):
-        if self.clip:
-            return self
-
-        log_shapes = {
-            key: val
-            for (key, val) in self.__dict__.items()
-            if key.startswith("log_shape_factor")
-        }
-        for key, log_shape_ in log_shapes.items():
-            if log_shape_ != 0:
-                raise ValueError(
-                    f"Log shape factor {key} must be zero if clip is False."
-                )
-        return self
 
-
-class DecreasingDesirabilityObjective(IncreasingDesirabilityObjective):
+class DecreasingDesirabilityObjective(_SeriesNumpyCallable, DesirabilityObjective):
     """An objective returning a reward the negative, shifted scaled identity, but trimmed at the bounds:
 
         d = ((upper_bound - x) / (upper_bound - lower_bound))^t
@@ -131,6 +135,8 @@ class DecreasingDesirabilityObjective(IncreasingDesirabilityObjective):
     """
 
     type: Literal["DecreasingDesirabilityObjective"] = "DecreasingDesirabilityObjective"  # type: ignore
+    log_shape_factor: float = 0.0
+    clip: bool = True
 
     def call_numpy(
         self,
@@ -154,7 +160,7 @@ def call_numpy(
         return y
 
 
-class PeakDesirabilityObjective(IncreasingDesirabilityObjective):
+class PeakDesirabilityObjective(_SeriesNumpyCallable, DesirabilityObjective):
     """
     A piecewise (linear or convex/concave) objective that increases from the lower bound
     to the peak position and decreases from the peak position to the upper bound.
@@ -177,6 +183,8 @@ class PeakDesirabilityObjective(IncreasingDesirabilityObjective):
     """
 
     type: Literal["PeakDesirabilityObjective"] = "PeakDesirabilityObjective"  # type: ignore
+    log_shape_factor: float = 0.0
+    clip: bool = True
     log_shape_factor_decreasing: float = 0.0  # often named log_t
     peak_position: float = 0.5  # often named T
 

pyright_output.txt

@@ -753,7 +753,6 @@
     Type "Series | ndarray[Unknown, Unknown]" is not assignable to type "ndarray[Unknown, Unknown]"
       "Series" is not assignable to "ndarray[Unknown, Unknown]" (reportArgumentType)
   /Users/gdiwt/SourceCode/bofire_global/bofire/data_models/objectives/desirabilities.py:26:38 - error: "name" is possibly unbound (reportPossiblyUnboundVariable)
-  /Users/gdiwt/SourceCode/bofire_global/bofire/data_models/objectives/desirabilities.py:216:83 - error: "v" is not defined (reportUndefinedVariable)
 /Users/gdiwt/SourceCode/bofire_global/bofire/data_models/objectives/identity.py
   /Users/gdiwt/SourceCode/bofire_global/bofire/data_models/objectives/identity.py:82:5 - error: "type" overrides symbol of same name in class "IdentityObjective"
     Variable is mutable so its type is invariant
@@ -5023,4 +5022,4 @@
     "tuple[Literal[0], Literal[1]]" is not assignable to "List[float]" (reportArgumentType)
   /Users/gdiwt/SourceCode/bofire_global/tests/bofire/utils/test_torch_tools.py:1031:38 - error: Expected 3 more positional arguments (reportCallIssue)
   /Users/gdiwt/SourceCode/bofire_global/tests/bofire/utils/test_torch_tools.py:1040:38 - error: Expected 3 more positional arguments (reportCallIssue)
-1773 errors, 2 warnings, 0 informations
+1772 errors, 2 warnings, 0 informations 

tests/bofire/utils/test_torch_tools.py

@@ -113,7 +113,6 @@
         CloseToTargetObjective(target_value=2.0, exponent=1.0, w=0.5),
         MovingMaximizeSigmoidObjective(steepness=1, tp=-1, w=1),
         # ConstantObjective(w=0.5, value=1.0),
-        DesirabilityObjective(),
         IncreasingDesirabilityObjective(
             bounds=(0, 2.5), log_shape_factor=0.0, clip=False
         ),