LoopStructural 1.6.20__py3-none-any.whl → 1.6.22__py3-none-any.whl

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/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/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/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/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/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/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/version.py

@@ -1 +1 @@
-__version__ = "1.6.20"
+__version__ = "1.6.22"

{loopstructural-1.6.20.dist-info → loopstructural-1.6.22.dist-info}/METADATA

@@ -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.dist-info → loopstructural-1.6.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 LoopStructural/__init__.py,sha256=9tewNqv_9i7vUYMb1srpOWpf65W-moA2HvrQa9gyafA,2241
-LoopStructural/version.py,sha256=d5oU8Ps6zEkGrR04CFBTRON1Yn4q4FgfElf4dVF75XY,23
+LoopStructural/version.py,sha256=qxWPNp-fYi9fYiQ95Ac8I6lS8h5LhN7ajZKcbEdyUcg,23
 LoopStructural/datasets/__init__.py,sha256=ylb7fzJU_DyQ73LlwQos7VamqkDSGITbbnoKg7KAOmE,677
 LoopStructural/datasets/_base.py,sha256=FB_D5ybBYHoaNbycdkpZcRffzjrrL1xp9X0k-pyob9Y,7618
 LoopStructural/datasets/_example_models.py,sha256=Zg33IeUyh4C-lC0DRMLqCDP2IrX8L-gNV1WxJwBGjzM,113
@@ -73,13 +73,13 @@ LoopStructural/modelling/__init__.py,sha256=a-bq2gDhyUlcky5l9kl_IP3ExMdohkgYjQz2
 LoopStructural/modelling/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 LoopStructural/modelling/core/fault_topology.py,sha256=bChp5dnfc-4GJRENWxB14mEW_13uBMh5ZYRKbLdjweE,11195
 LoopStructural/modelling/core/geological_model.py,sha256=65iLvmBH4YzRkaa2IUX1nrJ5Ebp_RWrgSMwY0CI63No,67171
-LoopStructural/modelling/core/stratigraphic_column.py,sha256=lOQb3zWS6EEqSzCMZsy9Q9ncFFkIku_lNjgpHtD7zCs,21860
+LoopStructural/modelling/core/stratigraphic_column.py,sha256=XDvi1KV9Jvw-bufRCtbZnVle_kYQuz_OqyzAps6y-WQ,21851
 LoopStructural/modelling/features/__init__.py,sha256=Vf-qd5EDBtJ1DpuXXyCcw2-wf6LWPRW5wzxDEO3vOc8,939
 LoopStructural/modelling/features/_analytical_feature.py,sha256=U_g86LgQhYY2359rdsDqpvziYwqrWkc5EdvhJARiUWo,3597
 LoopStructural/modelling/features/_base_geological_feature.py,sha256=otphU5IrJ5ES3b_r0m2bszj7urOvzaIoVPwKjNqJAI0,13509
 LoopStructural/modelling/features/_cross_product_geological_feature.py,sha256=GIyCHUdE6F-bse2e4puG9V2f7qRtDVfby5PRe2BboD4,3021
-LoopStructural/modelling/features/_feature_converters.py,sha256=UPpmElg8K4CY4_9t72aXpLNK0Qt2nY5ABvTdWYcsX5o,1071
-LoopStructural/modelling/features/_geological_feature.py,sha256=V5Ars8utx-AsEPVgMsoMzHFREeIByodzPPdEwblPGbo,11283
+LoopStructural/modelling/features/_feature_converters.py,sha256=gxcCEuUlWmkxXeiBSFMUVRZN6zg94AC1gEZ3YHE95qo,1205
+LoopStructural/modelling/features/_geological_feature.py,sha256=TxcaiiaJqayl8wH7UbcqAxaYvSwph_ACVAjAHkY3uOE,11930
 LoopStructural/modelling/features/_lambda_geological_feature.py,sha256=GiB19l6v5WvvR8CitATZvCwaOfRyLuzchoXzpNupsfM,5743
 LoopStructural/modelling/features/_projected_vector_feature.py,sha256=aifVLgn2spmK7GGlO0iHDewf1pFL-QoRzZEePTZwX1s,3017
 LoopStructural/modelling/features/_region.py,sha256=TB4qnoTDQM2VgRjgyODN839fKe3kuRYLllJj0xnDKXo,478
@@ -87,10 +87,10 @@ LoopStructural/modelling/features/_structural_frame.py,sha256=0FA_HxOFnxmEuU9fwv
 LoopStructural/modelling/features/_unconformity_feature.py,sha256=2Bx0BI38YLdcNvDWuP9E1pKFN4orEUq9aC8b5xG1UVk,2362
 LoopStructural/modelling/features/builders/__init__.py,sha256=Gqld1C-PcaXfJ8vpkWMDCmehmd3hZNYQk1knPtl59Bk,266
 LoopStructural/modelling/features/builders/_base_builder.py,sha256=N3txGC98V08A8-k2TLdoIWgWLfblZ91kaTvciPq_QVM,3750
-LoopStructural/modelling/features/builders/_fault_builder.py,sha256=_DZ0Hy_-jjm2fFU-5lY60zGisixdUWbAjsOQzMFKigY,25359
+LoopStructural/modelling/features/builders/_fault_builder.py,sha256=aygkXjyeZEBNl8EjRtXbB3fqelo8A5cIIQmVS30gsDQ,25356
 LoopStructural/modelling/features/builders/_folded_feature_builder.py,sha256=sbyTI3McT1UBgTc1TPOrU4ggwcGYBGlCEzVk4stlGbs,7536
-LoopStructural/modelling/features/builders/_geological_feature_builder.py,sha256=7XhgwPXQZkky4Gnr4Q3t95YlDdtJ6mjBk7dsjzXB2QI,22236
-LoopStructural/modelling/features/builders/_structural_frame_builder.py,sha256=xWlCybV3Av2JBEk6Y-HRKbSggxUKlUsmfiULaUEBICo,9153
+LoopStructural/modelling/features/builders/_geological_feature_builder.py,sha256=NMdtXXOR_mCBU_9LinmW76au_JBD98IWQo7Z6vBGHBI,22782
+LoopStructural/modelling/features/builders/_structural_frame_builder.py,sha256=nPZWrN7D5hpVYWZpxpqe5F9Qzxj7zuLjefyU8pzrcb8,9194
 LoopStructural/modelling/features/fault/__init__.py,sha256=4u0KfYzmoO-ddFGo9qd9ov0gBoLqBiPAUsaw5zhEOAQ,189
 LoopStructural/modelling/features/fault/_fault_function.py,sha256=QEPh2jIvgD68hEJc5SM5xuMzZw-93V1me1ZbK9G2TB0,12655
 LoopStructural/modelling/features/fault/_fault_function_feature.py,sha256=4m0jVNx7ewrVI0pECI1wNciv8Cy8FzhZrYDjKJ_e2GU,2558
@@ -98,7 +98,7 @@ LoopStructural/modelling/features/fault/_fault_segment.py,sha256=BEIVAY_-iQYYuoy
 LoopStructural/modelling/features/fold/__init__.py,sha256=hQNj267TyFTJD1_Pu6XyjogSTrcJ-TSPQdWnMCDbSLo,175
 LoopStructural/modelling/features/fold/_fold.py,sha256=bPnnLUSiF4uoMRg8aHoOSTPRgaM0JyLoRQPu5_A-J3w,5448
 LoopStructural/modelling/features/fold/_fold_rotation_angle_feature.py,sha256=CXLbFRQ3CrTMAcHmfdbKcmSvvLs9_6TLe0Wqi1pK2tg,892
-LoopStructural/modelling/features/fold/_foldframe.py,sha256=Rgf5aofN0OVDTZ2pzqLzAGlJUO2rnNm3aFvLSnH77yo,7669
+LoopStructural/modelling/features/fold/_foldframe.py,sha256=-Z9wowx3-7MqbIwxgIr8u1QdgV465FShKIen089lJfY,8197
 LoopStructural/modelling/features/fold/_svariogram.py,sha256=uLeBWZahEmystf8mpPJH_zKxp7hPyPJh0H5ROZO0pZs,7933
 LoopStructural/modelling/features/fold/fold_function/__init__.py,sha256=VqMjabsBd5GnPnDMXeKwXqtd0te2iXnvHxpf6jCC9YU,830
 LoopStructural/modelling/features/fold/fold_function/_base_fold_rotation_angle.py,sha256=5Bu_5xjyu4KL7thZ4fsh938Ep3Oyh5TL7_rfz_13Qng,8047
@@ -135,8 +135,8 @@ LoopStructural/utils/regions.py,sha256=SjCC40GI7_n03G4mlcmvyrBgJFbxnvB3leBzXWco3
 LoopStructural/utils/typing.py,sha256=29uVSTZdzXXH-jdlaYyBWZ1gQ2-nlZ2-XoVgG_PXNFY,157
 LoopStructural/utils/utils.py,sha256=2Z4zVE6G752-SPmM29zebk82bROJxEwi_YiiJjcVED4,2438
 LoopStructural/visualisation/__init__.py,sha256=5BDgKor8-ae6DrS7IZybJ3Wq_pTnCchxuY4EgzA7v1M,318
-loopstructural-1.6.20.dist-info/licenses/LICENSE,sha256=ZqGeNFOgmYevj7Ld7Q-kR4lAxWXuBRUdUmPC6XM_py8,1071
-loopstructural-1.6.20.dist-info/METADATA,sha256=WsPEAJMDXd0FITuc_laYIGCvPmBR6vZVvPT2X6pLhRA,6453
-loopstructural-1.6.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-loopstructural-1.6.20.dist-info/top_level.txt,sha256=QtQErKzYHfg6ddxTQ1NyaTxXBVM6qAqrM_vxEPyXZLg,15
-loopstructural-1.6.20.dist-info/RECORD,,
+loopstructural-1.6.22.dist-info/licenses/LICENSE,sha256=ZqGeNFOgmYevj7Ld7Q-kR4lAxWXuBRUdUmPC6XM_py8,1071
+loopstructural-1.6.22.dist-info/METADATA,sha256=RVKWR8sMhpXPGFTwq_Yejm5W63T6wwICgVkwzLTlW2w,6453
+loopstructural-1.6.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+loopstructural-1.6.22.dist-info/top_level.txt,sha256=QtQErKzYHfg6ddxTQ1NyaTxXBVM6qAqrM_vxEPyXZLg,15
+loopstructural-1.6.22.dist-info/RECORD,,