LoopStructural 1.6.21__tar.gz → 1.6.22__tar.gz

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

@@ -460,7 +460,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
         with self.freeze_notifications():
             self.clear(basement=False)
             elements_data = data.get("elements", [])
-            for element_data in reversed(elements_data):
+            for element_data in elements_data:
                 if "unconformity_type" in element_data:
                     element = StratigraphicUnconformity.from_dict(element_data)
                 else:

{loopstructural-1.6.21 → 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.21 → 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.22/LoopStructural/version.py

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

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

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

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

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

loopstructural-1.6.21/LoopStructural/version.py

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