fix: updating fault getters and tests

Author: lachlangrose

LoopStructural/modelling/features/_analytical_feature.py

@@ -33,12 +33,11 @@ def __init__(
         name: str,
         vector: np.ndarray,
         origin: np.ndarray,
-        regions=[],
-        faults=[],
+        *,
         model=None,
         builder=None,
     ):
-        BaseFeature.__init__(self, name, model, faults, regions, builder)
+        BaseFeature.__init__(self, name=name, model=model,  builder=builder)
         try:
             self.vector = np.array(vector, dtype=float).reshape(3)
         except ValueError:

LoopStructural/modelling/features/_base_geological_feature.py

@@ -48,6 +48,9 @@ def __init__(self, name: str,*, model=None, builder=None):
 
     @property
     def faults(self):
+        if self.builder is None:
+            logger.warning(f"Builder is None for feature {self.name}, cannot get faults")
+            return []
         return self.builder.faults
 
     @faults.setter

LoopStructural/modelling/features/_geological_feature.py

@@ -38,8 +38,11 @@ class GeologicalFeature(BaseFeature):
 
     def __init__(
         self,
+        
         name: str,
+    
         builder,
+        *,
         interpolator=None,
         model=None,
     ):

LoopStructural/modelling/features/builders/_base_builder.py

@@ -30,6 +30,9 @@ def __init__(self, model, name: str = "Feature"):
 
     @property
     def faults(self):
+        if self.model is None:
+            logger.warning(f"Model is None for builder {self.name}, cannot get faults")
+            return []
         fnames = self.model.get_faults_for_feature(self.name)
         return [self.model[fname] for fname in fnames]
     def set_not_up_to_date(self, caller):

LoopStructural/modelling/intrusions/intrusion_frame_builder.py

@@ -48,7 +48,7 @@ def __init__(
         self.model = model
         self.minimum_origin = self.model.bounding_box[0, :]
         self.maximum_maximum = self.model.bounding_box[1, :]
-        self.faults = []
+        # self.faults = []
 
         # -- intrusion frame parameters
         self.intrusion_network_contact = (

tests/unit/modelling/test_geological_feature.py

@@ -11,10 +11,10 @@ def test_constructors():
     # base_feature = GeologicalFeature("test", None, [], [], None)
     # assert base_feature.type == FeatureType.BASE
     # assert base_feature.name == "test"
-    feature = GeologicalFeature("test", None, [], [], None)
+    feature = GeologicalFeature(name="test", builder=None, interpolator=None, model=None)
     assert feature.type == FeatureType.INTERPOLATED
     assert feature.name == "test"
-    feature = AnalyticalGeologicalFeature("test", [0, 0, 1], [0, 0, 0], [], [], None, None)
+    feature = AnalyticalGeologicalFeature("test", [0, 0, 1], [0, 0, 0], builder=None,model=None)
     # for analytical feature check that the evaluated value is correct.
     # this should be the distance from origin to the point in the direction
     # of the direction vector
@@ -28,7 +28,7 @@ def test_constructors():
 
 
 def test_toggle_faults():
-    base_feature = GeologicalFeature("test", None, [], [], None)
+    base_feature = GeologicalFeature("test", builder=None, interpolator=None, model=None)
     assert base_feature.faults_enabled is True
     base_feature.toggle_faults()
     assert base_feature.faults_enabled is False
@@ -37,7 +37,7 @@ def test_toggle_faults():
 
 
 def test_tojson():
-    base_feature = GeologicalFeature("test", None, [], [], None)
+    base_feature = GeologicalFeature("test", builder=None, interpolator=None, model=None)
     import json
     from LoopStructural.utils import LoopJSONEncoder