add param constrains and target constraints for #360

Author: peterhollender

src/openlifu/plan/param_constraint.py

@@ -78,3 +78,17 @@ def get_status(self, value: float) -> str:
 
     def get_status_symbol(self, value: float) -> str:
         return PARAM_STATUS_SYMBOLS[self.get_status(value)]
+
+    def get_table(self):
+        """Convert the parameter constraint to a table format."""
+        import pandas as pd
+        records = []
+        if self.operator in ['<', '<=', '>', '>='] or self.operator in ['within', 'inside', 'outside', 'outside_inclusive']:
+            value_template = f"value {self.operator} {{value}}"
+        else:
+            raise ValueError(f"Unsupported operator: {self.operator}")
+        if self.warning_value is not None:
+            records.append({"Name": "Warn if not", "Value": value_template.format(value=self.warning_value), "Unit": ""})
+        if self.error_value is not None:
+            records.append({"Name": "Error if not", "Value": value_template.format(value=self.error_value), "Unit": ""})
+        return pd.DataFrame.from_records(records)

src/openlifu/plan/protocol.py

@@ -193,7 +193,12 @@ def _append_subtable(category_name, sub_df):
         table = _append_subtable("Apodization Method", self.apod_method.get_table())
         table = _append_subtable("Segmentation Method", self.seg_method.get_table())
         table = _append_subtable("Simulation Setup", self.sim_setup.get_table())
-
+        for tc in self.target_constraints:
+            table = _append_subtable("Target Constraints", tc.to_table())
+        for param_id, param_constraint in self.param_constraints.items():
+            tp = param_constraint.get_table()
+            tp["Value"] = tp["Value"].str.replace("value", param_id)
+            table = _append_subtable("Parameter Constraints", tp)
         return table
 
 

src/openlifu/plan/target_constraints.py

@@ -64,6 +64,6 @@ def to_table(self):
         """
         import pandas as pd
         records = [
-            {"Name": self.name, "Value": f"{self.min} - {self.max}", "Unit": self.units},
+            {"Name": self.name, "Value": f"({self.min},{self.max})", "Unit": self.units},
         ]
         return pd.DataFrame.from_records(records)