Demo: updated validator to use new method to more easily build condit…

…ions
mlte-team · Oct 3, 2024 · fa40461 · fa40461
1 parent 6894570
commit fa40461
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 43 deletions.
diff --git a/demo/scenarios/values/multiple_accuracy.py b/demo/scenarios/values/multiple_accuracy.py
@@ -14,9 +14,7 @@ class MultipleAccuracy(Array):
     @classmethod
     def all_accuracies_more_or_equal_than(cls, threshold: float) -> Condition:
         """Checks if the accuracy for multiple populations is fair by checking if all of them are over the given threshold."""
-        condition: Condition = Condition(
-            "all_accuracies_more_than",
-            [threshold],
+        condition: Condition = Condition.build_condition(
             lambda value: Success(
                 f"All accuracies are equal to or over threshold {threshold}"
             )

diff --git a/demo/scenarios/values/multiple_ranksums.py b/demo/scenarios/values/multiple_ranksums.py
@@ -47,9 +47,7 @@ def deserialize(
     @classmethod
     def all_p_values_greater_or_equal_than(cls, threshold: float) -> Condition:
         """Checks if the p-value for multiple ranksums is below given threshold."""
-        condition: Condition = Condition(
-            "all_p_values_greater_or_equal_than",
-            [threshold],
+        condition: Condition = Condition.build_condition(
             lambda value: Success(
                 f"All p-values are equal to or over threshold {value.get_total_p_value_threshold(threshold)}"
             )

diff --git a/demo/scenarios/values/operational_performance.py b/demo/scenarios/values/operational_performance.py
diff --git a/demo/scenarios/values/ranksums.py b/demo/scenarios/values/ranksums.py
@@ -13,9 +13,7 @@ class RankSums(Array):
 
     @classmethod
     def p_value_greater_or_equal_to(cls, threshold: float) -> Condition:
-        condition: Condition = Condition(
-            "p_value_greater_or_equal_to",
-            [threshold],
+        condition: Condition = Condition.build_condition(
             lambda value: Success(
                 f"P-Value {value.array[1]} is greater or equal to {threshold}"
             )

diff --git a/demo/scenarios/values/string.py b/demo/scenarios/values/string.py
@@ -34,9 +34,7 @@ def deserialize(
     @classmethod
     def contains(cls, substring: str) -> Condition:
         """Checks if the p-value for multiple ranksums is below given threshold."""
-        condition: Condition = Condition(
-            "contains",
-            [substring],
+        condition: Condition = Condition.build_condition(
             lambda value: Success(
                 f"Substring '{substring}' is contained in the string value."
             )
@@ -50,9 +48,7 @@ def contains(cls, substring: str) -> Condition:
     @classmethod
     def equal_to(cls, other_string: str) -> Condition:
         """Checks if the p-value for multiple ranksums is below given threshold."""
-        condition: Condition = Condition(
-            "equal_to",
-            [other_string],
+        condition: Condition = Condition.build_condition(
             lambda value: Success(
                 f"String '{other_string}' is equal to the internal string value."
             )