LoopStructural 1.6.17__py3-none-any.whl → 1.6.18__py3-none-any.whl

LoopStructural/modelling/core/geological_model.py

@@ -560,14 +560,14 @@ class GeologicalModel:
         DeprecationWarning(
             "set_stratigraphic_column is deprecated, use model.stratigraphic_column.add_units instead"
         )
-        for g in stratigraphic_column.keys():
+        for i, g in enumerate(stratigraphic_column.keys()):
             for u in stratigraphic_column[g].keys():
                 thickness = 0
                 if "min" in stratigraphic_column[g][u] and "max" in stratigraphic_column[g][u]:
                     min_val = stratigraphic_column[g][u]["min"]
                     max_val = stratigraphic_column[g][u].get("max", None)
                     thickness = max_val - min_val if max_val is not None else None
-                logger.warning(
+                logger.info(
                     f"""
                                model.stratigraphic_column.add_unit({u},
                                colour={stratigraphic_column[g][u].get("colour", None)},
@@ -578,9 +578,11 @@ class GeologicalModel:
                     colour=stratigraphic_column[g][u].get("colour", None),
                     thickness=thickness,
                 )
+
             self.stratigraphic_column.add_unconformity(
                 name=''.join([g, 'unconformity']),
             )
+            self.stratigraphic_column.group_mapping[f'Group_{i+1}'] = g
 
     def create_and_add_foliation(
         self,
@@ -1520,7 +1522,7 @@ class GeologicalModel:
             if feature_id >= 0:
                 vals = self.features[feature_id].evaluate_value(xyz)
                 for u in g.units:
-                    strat_id[np.logical_and(vals < u.max, vals > u.min)] = s_id 
+                    strat_id[np.logical_and(vals < u.max(), vals > u.min())] = s_id
                     s_id += 1
             if feature_id == -1:
                 logger.error(f"Model does not contain {g.name}")
@@ -1725,16 +1727,8 @@ class GeologicalModel:
         ids : list
             list of unique stratigraphic ids, featurename, unit name and min and max scalar values
         """
-        ids = []
-        if self.stratigraphic_column is None:
-            logger.warning('No stratigraphic column defined')
-            return ids
-        for group in self.stratigraphic_column.keys():
-            if group == "faults":
-                continue
-            for name, series in self.stratigraphic_column[group].items():
-                ids.append([series["id"], group, name, series['min'], series['max']])
-        return ids
+        return self.stratigraphic_column.get_stratigraphic_ids()
+        
 
     def get_fault_surfaces(self, faults: List[str] = []):
         surfaces = []

LoopStructural/modelling/core/stratigraphic_column.py

@@ -39,24 +39,59 @@ class StratigraphicColumnElement:
         self.uuid = uuid
 
 
-class StratigraphicUnit(StratigraphicColumnElement):
+class StratigraphicUnit(StratigraphicColumnElement, Observable['StratigraphicUnit']):
     """
     A class to represent a stratigraphic unit.
     """
 
-    def __init__(self, *, uuid=None, name=None, colour=None, thickness=None, data=None):
+    def __init__(self, *, uuid=None, name=None, colour=None, thickness=None, data=None, id=None):
         """
         Initializes the StratigraphicUnit with a name and an optional description.
         """
-        super().__init__(uuid)
+        StratigraphicColumnElement.__init__(self, uuid)
+        Observable.__init__(self)
         self.name = name
         if colour is None:
             colour = rng.random(3)
         self.colour = colour
-        self.thickness = thickness
+        self._thickness = thickness
         self.data = data
         self.element_type = StratigraphicColumnElementType.UNIT
-
+        self._id = id
+        self.min_value = None  # Minimum scalar field value for the unit
+        self.max_value = None  # Maximum scalar field value for the unit
+    @property
+    def id(self):
+        return self._id
+    @property
+    def thickness(self):
+        return self._thickness
+    @thickness.setter
+    def thickness(self, value):
+        """
+        Sets the thickness of the unit.
+        """
+        self._thickness = value
+        self.notify('unit/thickness_updated', unit=self)
+    @id.setter
+    def id(self, value):
+        """
+        Sets the ID of the unit.
+        """
+        if not isinstance(value, int):
+            raise TypeError("ID must be an integer")
+        self._id = value
+        self.notify('unit/id_updated', unit=self)
+    def min(self):
+        """
+        Returns the minimum value of the unit.
+        """
+        return self.min_value if self.min_value is not None else 0
+    def max(self):
+        """
+        Returns the maximum value of the unit.
+        """
+        return self.max_value if self.max_value is not None else np.inf
     def to_dict(self):
         """
         Converts the stratigraphic unit to a dictionary representation.
@@ -164,20 +199,37 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
         Initializes the StratigraphicColumn with a name and a list of layers.
         """
         super().__init__()
-        self.order = [StratigraphicUnit(name='Basement', colour='grey', thickness=np.inf),StratigraphicUnconformity(name='Base Unconformity', unconformity_type=UnconformityType.ERODE)]
+        self.order = []
+        self.add_basement()
         self.group_mapping = {}
-    def clear(self,basement=True):
+
+    def get_new_id(self):
+        """
+        Generates a new unique ID for a stratigraphic unit.
+        """
+        if not self.order:
+            return 0
+        return max([u.id for u in self.order if isinstance(u, StratigraphicUnit)], default=0) + 1
+    def add_basement(self):
+        self.add_unit(name='Basement', colour='grey', thickness=np.inf)
+        self.add_unconformity(
+            name='Base Unconformity', unconformity_type=UnconformityType.ERODE
+        )
+    def clear(self, basement=True):
         """
         Clears the stratigraphic column, removing all elements.
         """
         if basement:
-            self.order = [StratigraphicUnit(name='Basement', colour='grey', thickness=np.inf),StratigraphicUnconformity(name='Base Unconformity', unconformity_type=UnconformityType.ERODE)]
+            self.add_basement()
+            
         else:
             self.order = []
         self.group_mapping = {}
         self.notify('column_cleared')
-    def add_unit(self, name,*, colour=None, thickness=None, where='top'):
-        unit = StratigraphicUnit(name=name, colour=colour, thickness=thickness)
+    def add_unit(self, name,*, colour=None, thickness=None, where='top',id=None):
+        if id is None:
+            id = self.get_new_id()
+        unit = StratigraphicUnit(name=name, colour=colour, thickness=thickness, id=id)
 
         if where == 'top':
             self.order.append(unit)
@@ -185,7 +237,9 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             self.order.insert(0, unit)
         else:
             raise ValueError("Invalid 'where' argument. Use 'top' or 'bottom'.")
+        unit.attach(self.update_unit_values,'unit/*')
         self.notify('unit_added', unit=unit)
+        self.update_unit_values()  # Update min and max values after adding a unit
         return unit
 
     def remove_unit(self, uuid):
@@ -197,7 +251,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
                 del self.order[i]
                 self.notify('unit_removed', uuid=uuid)
                 return True
-        
+
         return False
 
     def add_unconformity(self, name, *, unconformity_type=UnconformityType.ERODE, where='top' ):
@@ -249,7 +303,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             if element.uuid == uuid:
                 return element
         raise KeyError(f"No element found with uuid: {uuid}")
-    
+
     def get_group_for_unit_name(self, unit_name:str) -> Optional[StratigraphicGroup]:
         """
         Retrieves the group for a given unit name.
@@ -300,7 +354,15 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
         if group:
             groups.append(group)
         return groups
+    def get_stratigraphic_ids(self) -> List[List[str]]:
+        ids = []
+        for group in self.get_groups():
+            if group == "faults":
+                continue
 
+            for unit in group.units:
+                ids.append([unit.id, group, unit.name, unit.min(), unit.max()])
+        return ids
     def get_unitname_groups(self):
         groups = self.get_groups()
         groups_list = []
@@ -309,7 +371,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             group = [u.name for u in g.units if isinstance(u, StratigraphicUnit)]
             groups_list.append(group)
         return groups_list
-    
+
     def get_group_unit_pairs(self) -> List[Tuple[str,str]]:
         """
         Returns a list of tuples containing group names and unit names.
@@ -341,6 +403,20 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
             self.__getitem__(uuid) for uuid in new_order if self.__getitem__(uuid) is not None
         ]
         self.notify('order_updated', new_order=self.order)
+        self.update_unit_values()  # Update min and max values after updating the order
+    def update_unit_values(self, *, observable: Optional["Observable"] = None, event: Optional[str]= None):
+        """
+        Updates the min and max values for each unit based on their position in the column.
+        """
+        # If the event is not 'unit/*', skip the update
+        if event is not None and event != 'unit/*':
+            return
+        cumulative_thickness = 0
+        for element in self.order:
+            if isinstance(element, StratigraphicUnit):
+                element.min_value = cumulative_thickness
+                element.max_value = cumulative_thickness + (element.thickness or 0)
+                cumulative_thickness = element.max_value
 
     def update_element(self, unit_data: Dict):
         """
@@ -360,6 +436,7 @@ class StratigraphicColumn(Observable['StratigraphicColumn']):
                 unit_data.get('unconformity_type', element.unconformity_type.value)
             )
         self.notify('element_updated', element=element)
+        self.update_unit_values()  # Update min and max values after updating an element
 
     def __str__(self):
         """

LoopStructural/modelling/features/fold/_svariogram.py

@@ -189,6 +189,9 @@ class SVariogram:
         # find the extrema of the average curve
         res = find_peaks_and_troughs(np.array(averagex), np.array(averagey))
         px2, py2 = res
+        logger.info(f"Found {len(px2)} peaks and troughs in the s-variogram")
+        for i in range(len(px2)):
+            logger.info(f"Peak {i}: {px2[i]} {py2[i]}")
         wl1 = 0.0
         wl1py = 0.0
         for i in range(len(px)):

LoopStructural/utils/observer.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from contextlib import contextmanager
-from typing import Any, Generic, Protocol, TypeAlias, TypeVar, runtime_checkable
+from typing import Any, Generic, Protocol, TypeVar, runtime_checkable
 import threading
 import weakref
 
@@ -17,7 +17,7 @@ class Observer(Protocol):
         """Receive a notification."""
 
 
-Callback: TypeAlias = Callable[["Observable", str, Any], None]
+Callback = Callable[["Observable", str, Any], None]
 T = TypeVar("T", bound="Observable")
 
 

LoopStructural/version.py

@@ -1 +1 @@
-__version__ = "1.6.17"
+__version__ = "1.6.18"

{loopstructural-1.6.17.dist-info → loopstructural-1.6.18.dist-info}/METADATA

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

{loopstructural-1.6.17.dist-info → loopstructural-1.6.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 LoopStructural/__init__.py,sha256=ZS5J2TI2OuhRE0o3EXmPbbjrvh1-Vy9RFwL7Hc1YBow,2079
-LoopStructural/version.py,sha256=RFX1x9AQ2Z9aP2gCXAUVtaLq0UOmist-rpJN8M8jz9I,23
+LoopStructural/version.py,sha256=4Zzb1p1N54zNXVm2h5jVUlkFjge9TszzpDGANK9ZNPM,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
@@ -72,8 +72,8 @@ LoopStructural/interpolators/supports/_support_factory.py,sha256=XNAxnr-JS3KEhds
 LoopStructural/modelling/__init__.py,sha256=a-bq2gDhyUlcky5l9kl_IP3ExMdohkgYjQz2V8madQE,902
 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=23ZQF2Xvs-PeRdrxt-IqrkVaMDWud_JjW00ok2tKs2k,65850
-LoopStructural/modelling/core/stratigraphic_column.py,sha256=GB93W607LY3d_NE75lzwBWrV34YhHN_troCXWuUMBk8,18070
+LoopStructural/modelling/core/geological_model.py,sha256=f6bkpXdKxr72OozUb1vdoosLcjzMIht8VNgNlONluVA,65570
+LoopStructural/modelling/core/stratigraphic_column.py,sha256=fmT51wInY3kei7Ya01cd5P5hcnhY5TkLBLJJwkUd_lE,20807
 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=kGyrbb8nNzfi-M8WSrVMEQYKtxThdcBxaji5HKXtAqw,13483
@@ -98,7 +98,7 @@ LoopStructural/modelling/features/fold/__init__.py,sha256=pOv20yQvshZozvmO_YFw2E
 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/_svariogram.py,sha256=uzGaKZ5HGh8xZcsGGg68GUKVjkd5udLy7-4lh0NQc2Y,7765
+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
 LoopStructural/modelling/features/fold/fold_function/_fourier_series_fold_rotation_angle.py,sha256=Cjb6Pt6cdRoH3WGqFyJ2rHxnMe6SKvzRayA6hTuwZA8,4069
@@ -129,13 +129,13 @@ LoopStructural/utils/json_encoder.py,sha256=5YNouf1TlhjEqOYgthd07MRXc0JLgxern-ny
 LoopStructural/utils/linalg.py,sha256=tBXyu6NXcG2AcPuzUMnkVI4ncZWtE_MPHGj2PLXRwfY,123
 LoopStructural/utils/logging.py,sha256=dIUWEsS2lT4G1dsf4ZYXknTR7eQkrgvGA4b_E0vMIRU,2402
 LoopStructural/utils/maths.py,sha256=KaLj9RHsxdaSkEHm4t0JEzykhiuETAV14KpjL6lknWY,10374
-LoopStructural/utils/observer.py,sha256=BjoL2-DydNWF1QDfFNd7TQIlRbKus_JNBfqX2ZFDAek,5327
+LoopStructural/utils/observer.py,sha256=etHF2zhDWbrKAaIKAktdVLosD696o_B0P9rH3G5IzV0,5305
 LoopStructural/utils/regions.py,sha256=SjCC40GI7_n03G4mlcmvyrBgJFbxnvB3leBzXWco37o,3891
 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.17.dist-info/licenses/LICENSE,sha256=ZqGeNFOgmYevj7Ld7Q-kR4lAxWXuBRUdUmPC6XM_py8,1071
-loopstructural-1.6.17.dist-info/METADATA,sha256=Io5NikqqA3SupAKqkEtWRytgor6JPn9c5nV8L0FzQLw,6453
-loopstructural-1.6.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-loopstructural-1.6.17.dist-info/top_level.txt,sha256=QtQErKzYHfg6ddxTQ1NyaTxXBVM6qAqrM_vxEPyXZLg,15
-loopstructural-1.6.17.dist-info/RECORD,,
+loopstructural-1.6.18.dist-info/licenses/LICENSE,sha256=ZqGeNFOgmYevj7Ld7Q-kR4lAxWXuBRUdUmPC6XM_py8,1071
+loopstructural-1.6.18.dist-info/METADATA,sha256=Ps1KAvAFlPgR11P0nbTfYrMlcPS6bX3OewD1UKRXEnU,6453
+loopstructural-1.6.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+loopstructural-1.6.18.dist-info/top_level.txt,sha256=QtQErKzYHfg6ddxTQ1NyaTxXBVM6qAqrM_vxEPyXZLg,15
+loopstructural-1.6.18.dist-info/RECORD,,