test: 🐛 fixed bugs in tests so all tests pass

Author: lachlangrose

LoopStructural/interpolators/supports/_3d_structured_tetra.py

@@ -14,7 +14,7 @@
 class TetMesh(BaseStructuredSupport):
     """ """
 
-    def __init__(self, origin, nsteps, step_vector):
+    def __init__(self, origin=np.zeros(3), nsteps=np.ones(3)*10, step_vector=np.ones(3)):
         BaseStructuredSupport.__init__(self, origin, nsteps, step_vector)
 
         self.tetra_mask_even = np.array(

LoopStructural/modelling/intrusions/intrusion_frame_builder.py

@@ -181,7 +181,7 @@ def add_contact_anisotropies(self, series_list=None, **kwargs):
                     == series_list[i].name
                 ].copy()
                 data_array_temp = data_temp.loc[:, ["X", "Y", "Z"]].to_numpy()
-                series_i_vals = series_list[i]["feature"].evaluate_value(
+                series_i_vals = series_list[i].evaluate_value(
                     data_array_temp
                 )
                 series_array = np.zeros([len(data_array_temp), 4])
@@ -360,7 +360,7 @@ def indicator_function_contacts(self, delta=None):
             series_id = self.anisotropies_series_parameters[contact_id][0]
             seriesi_mean = self.anisotropies_series_parameters[contact_id][1]
             seriesi_std = self.anisotropies_series_parameters[contact_id][2]
-            seriesi_values = series_id["feature"].evaluate_value(grid_points)
+            seriesi_values = series_id .evaluate_value(grid_points)
 
             # apend associated scalar field values to each anisotropy
             self.anisotropies_series_parameters[contact_id].append(seriesi_values)
@@ -543,7 +543,7 @@ def create_intrusion_network(self, **kwargs):
             if (
                 inlet_anisotropy in self.anisotropies_series_list
             ):  # if inlet anisotropy type is series
-                sf_inlet_anisotropy = inlet_anisotropy["feature"].evaluate_value(
+                sf_inlet_anisotropy = inlet_anisotropy .evaluate_value(
                     grid_points
                 )
 
@@ -554,7 +554,7 @@ def create_intrusion_network(self, **kwargs):
                 len(self.anisotropies_sequence) - 1
             ]
             if outlet_anisotropy in self.anisotropies_series_list:
-                sf_outlet_anisotropy = outlet_anisotropy["feature"].evaluate_value(
+                sf_outlet_anisotropy = outlet_anisotropy .evaluate_value(
                     grid_points
                 )
 

tests/unit_tests/interpolator/test_solvers.py

@@ -50,6 +50,11 @@ def test_FDI():
     interpolator.solve_system()
     assert np.sum(interpolator.evaluate_value(data[['X','Y','Z']].to_numpy())-data[['val']].to_numpy())/len(data) < 0.5
 def test_inequality_FDI():
+    try:
+        import osqp
+    except ImportError:
+        print('osqp not installed')
+        return
     xy = np.array(np.meshgrid(np.linspace(0,1,50),np.linspace(0,1,50))).T.reshape(-1,2)
     xyz = np.hstack([xy,np.zeros((xy.shape[0],1))])
     data = pd.DataFrame(xyz,columns=['X','Y','Z'])
@@ -84,6 +89,11 @@ def test_inequality_FDI():
     # print(np.sum(interpolator.evaluate_value(data[['X','Y','Z']].to_numpy())-data[['val']].to_numpy())/len(data))
     # assert np.sum(interpolator.evaluate_value(data[['X','Y','Z']].to_numpy())-data[['val']].to_numpy())/len(data) < 0.5
 def test_inequality_FDI_nodes():
+    try:
+        import osqp
+    except ImportError:
+        print('osqp not installed')
+        return
     xy = np.array(np.meshgrid(np.linspace(0,1,50),np.linspace(0,1,50))).T.reshape(-1,2)
     xyz = np.hstack([xy,np.zeros((xy.shape[0],1))])
     data = pd.DataFrame(xyz,columns=['X','Y','Z'])
@@ -126,7 +136,7 @@ def test_equality_FDI_nodes():
     interpolator.solve_system(solver='cg')
 
 if __name__ == '__main__':
-    # test_inequality_FDI()
-    # test_inequality_FDI_nodes()
-    # test_FDI()
+    test_inequality_FDI()
+    test_inequality_FDI_nodes()
+    test_FDI()
     test_equality_FDI_nodes()

tests/unit_tests/modelling/test_intrusions.py

@@ -47,7 +47,7 @@ def test_intrusion_freame_builder():
     mean = intrusion_frame_builder.anisotropies_series_parameters[keys[0]][1]
     # mean = -10
     stdv = intrusion_frame_builder.anisotropies_series_parameters[keys[0]][2]
-    evaluated_inet_points =  conformable_feature['feature'].evaluate_value(model.scale(intrusion_network_geometry[:,:3]))
+    evaluated_inet_points =  conformable_feature.evaluate_value(model.scale(intrusion_network_geometry[:,:3]))
 
     assert np.all(np.logical_and((mean - stdv*delta_c)<= evaluated_inet_points,(mean + stdv*delta_c)>= evaluated_inet_points))
 
@@ -114,4 +114,7 @@ def test_intrusion_builder():
 
     assert len(intrusion_feature._lateral_simulated_thresholds) > 0
     assert len(intrusion_feature._growth_simulated_thresholds) > 0
-    
+    
+if __name__ == "__main__":
+    test_intrusion_freame_builder()
+    test_intrusion_builder()

tests/unit_tests/modelling/test_structural_frame.py

@@ -1,8 +1,9 @@
 from LoopStructural.modelling.features import (
     StructuralFrame,
-    StructuralFrameBuilder,
     GeologicalFeature,
 )
+from LoopStructural.modelling.features.builders import StructuralFrameBuilder
+
 from LoopStructural import GeologicalModel
 import numpy as np