LoopStructural 1.6.20__tar.gz → 1.6.22__tar.gz

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural/modelling/core/stratigraphic_column.py

@@ -222,8 +222,8 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
         if basement:
             self.add_basement()
             
-        else:
-            self.order = []
+        
+        self.order = []
         self.group_mapping = {}
         self.notify('column_cleared')
     def add_unit(self, name,*, colour=None, thickness=None, where='top',id=None):

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural/modelling/features/_feature_converters.py

@@ -1,6 +1,9 @@
-from LoopStructural.modelling.features.fold import FoldEvent
+from LoopStructural.modelling.features.fold import FoldEvent, FoldFrame
 from LoopStructural.modelling.features.builders import FoldedFeatureBuilder, StructuralFrameBuilder
 def add_fold_to_feature(feature, fold_frame,**kwargs):
+    if not isinstance(fold_frame, FoldFrame):
+        raise ValueError("fold_frame must be a FoldFrame instance")
+        
     fold = FoldEvent(fold_frame, name=f"Fold_{feature.name}", invert_norm=kwargs.get('invert_fold_norm', False))
 
     builder = FoldedFeatureBuilder.from_feature_builder(

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural/modelling/features/_geological_feature.py

@@ -283,6 +283,8 @@ class GeologicalFeature(BaseFeature):
         value_constraints = self.builder.get_value_constraints()
         gradient_constraints = self.builder.get_gradient_constraints()
         norm_constraints = self.builder.get_norm_constraints()
+        # inequality_pair_constraints = self.builder.get_inequality_pair_constraints()
+        # inequality_constraints = self.builder.get_inequality_constraints()
         data = []
         if gradient_constraints.shape[0] > 0:
 
@@ -321,4 +323,17 @@ class GeologicalFeature(BaseFeature):
                         name=f"{self.name}_value",
                     )
                 )
+        # if inequality_constraints.shape[0] > 0:
+
+        #     data.append(
+        #         ValuePoints(
+        #             locations=self.model.rescale(
+        #                 inequality_constraints[:, :3]
+        #             ),
+        #             values=value_constraints[:, 3],
+        #             name=f"{name}_inequality",
+        #             properties = {'l':inequality_constraints[:,3],'u':inequality_constraints[:,4]}
+
+        #         )
+        #     )
         return data

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural/modelling/features/builders/_fault_builder.py

@@ -226,7 +226,7 @@ class FaultBuilder(StructuralFrameBuilder):
                 self.maximum = self.model.bounding_box.maximum
                 return
             major_axis = np.max(distance)
-            logger.warning(f"Fault major axis using map length: {major_axis}")
+            logger.info(f"Fault major axis using map length: {major_axis}")
 
         if minor_axis is None:
             logger.info(f"Fault minor axis not set, using half major axis: {major_axis/2}")

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural/modelling/features/builders/_geological_feature_builder.py

@@ -419,7 +419,14 @@ class GeologicalFeatureBuilder(BaseBuilder):
             )
         else:
             return np.zeros((0, 5))
-
+    # def get_inequality_pair_constraints(self):
+    #     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()+weight_name()].to_numpy(float)
+    # def get_inequality_constraints(self):
+    #     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()+weight_name()].to_numpy(float)
     def get_data_locations(self):
         """
         Get only the location for all data points

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural/modelling/features/builders/_structural_frame_builder.py

@@ -148,6 +148,7 @@ class StructuralFrameBuilder:
             bounding_box=feature_builder.model.bounding_box,
             nelements=[feature_builder.interpolator.n_elements]*3,
             name=feature_builder.name,
+            model=feature_builder.model,
             **kwargs
         )
         builder.add_data_from_data_frame(feature_builder.data)

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural/modelling/features/fold/_foldframe.py

@@ -19,7 +19,24 @@ class FoldFrame(StructuralFrame):
         features
         """
         super().__init__(name, features, fold, model)
+    @classmethod
+    def from_structural_frame(cls, frame, fold=None):
+        """
+        Create a FoldFrame from an existing StructuralFrame
+
+        Parameters
+        ----------
+        frame - StructuralFrame
+            the structural frame to convert to a fold frame
+        fold - FoldEvent, optional
+            the fold event to associate with the fold frame
 
+        Returns
+        -------
+        FoldFrame
+            the new fold frame
+        """
+        return cls(frame.name, frame.features, fold, frame.model)
     def calculate_fold_axis_rotation(self, feature_builder, fold_axis=None):
         """
         Calculate the fold axis rotation angle by finding the angle between the

loopstructural-1.6.22/LoopStructural/version.py

@@ -0,0 +1 @@
+__version__ = "1.6.22"

{loopstructural-1.6.20 → loopstructural-1.6.22}/LoopStructural.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LoopStructural
-Version: 1.6.20
+Version: 1.6.22
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT

{loopstructural-1.6.20 → loopstructural-1.6.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: LoopStructural
-Version: 1.6.20
+Version: 1.6.22
 Summary: 3D geological modelling
 Author-email: Lachlan Grose <lachlan.grose@monash.edu>
 License: MIT

loopstructural-1.6.20/LoopStructural/version.py

@@ -1 +0,0 @@
-__version__ = "1.6.20"