add inequality pairs and inequality values to the get_data function

Author: lachlangrose

LoopStructural/modelling/features/_geological_feature.py

@@ -283,6 +283,8 @@ def get_data(self, value_map: Optional[dict] = None) -> List[Union[ValuePoints,
         value_constraints = self.builder.get_value_constraints()
         gradient_constraints = self.builder.get_gradient_constraints()
         norm_constraints = self.builder.get_norm_constraints()
+        inequality_values = self.builder.get_inequality_constraints()
+        inequality_pairs = self.builder.get_inequality_pairs_constraints()
         data = []
         if gradient_constraints.shape[0] > 0:
 
@@ -301,6 +303,22 @@ def get_data(self, value_map: Optional[dict] = None) -> List[Union[ValuePoints,
                     name=f'{self.name}_norm',
                 )
             )
+        if inequality_values.shape[0] > 0:
+            data.append(
+                ValuePoints(
+                    locations=self.model.rescale(inequality_values[:, :3]),
+                    values=inequality_values[:, 3],
+                    name=f'{self.name}_inequality',
+                )
+            )
+        if inequality_pairs.shape[0] > 0:
+            data.append(
+                ValuePoints(
+                    locations=self.model.rescale(inequality_pairs[:, :3]),
+                    values=inequality_pairs[:, 3],
+                    name=f'{self.name}_inequality_pairs',
+                )
+            )
         if value_constraints.shape[0] > 0:
             if value_map is not None:
                 for name, v in value_map.items():

LoopStructural/modelling/features/builders/_geological_feature_builder.py

@@ -395,7 +395,34 @@ def get_norm_constraints(self):
             )
         else:
             return np.zeros((0, 7))
+    def get_inequality_constraints(self):
+        """
+        Get the inequality constraints
 
+        Returns
+        -------
+        numpy array
+        """
+        mask = np.all(~np.isnan(self.data.loc[:, inequality_name()].to_numpy(float)), axis=1)
+        if mask.shape[0] > 0:
+            return self.data.loc[mask, xyz_names() + inequality_name()].to_numpy(float)
+        else:
+            return np.zeros((0, 4))
+        
+    def get_inequality_pairs_constraints(self):
+        """
+        Get the inequality pairs constraints
+
+        Returns
+        -------
+        numpy array
+        """
+        mask = np.all(~np.isnan(self.data.loc[:, pairs_name()].to_numpy(float)), axis=1)
+        if mask.shape[0] > 0:
+            return self.data.loc[mask, xyz_names() + pairs_name()].to_numpy(float)
+        else:
+            return np.zeros((0, 4))
+        
     def get_orientation_constraints(self):
         """
         Get the orientation constraints