LoopStructural 1.0.3__zip → 1.0.71.dev0__zip

Miniconda/envs/loop/Lib/site-packages/LoopStructural/visualisation/rotation_angle_plotter.py

@@ -3,19 +3,21 @@ import logging
 import matplotlib.pyplot as plt
 import numpy as np
 
-logger = logging.getLogger(__name__)
+from LoopStructural.utils import getLogger
+logger = getLogger(__name__)
 
 
 class RotationAnglePlotter:
-    def __init__(self, feature):
+    def __init__(self, feature, axis=True):
         """
 
         """
-        self.fig, self.ax = plt.subplots(2, 2, figsize=(15, 15))
+        self.fig, self.ax = plt.subplots(2, 2, figsize=(30, 15))
         self.ax[0][0].set_ylim(-90, 90)
         self.ax[1][0].set_ylim(-90, 90)
         self.feature = feature
-    def plot(self, x, y, ix, iy, symb):
+
+    def plot(self, x, y, ix, iy, symb,**kwargs):
         """
 
         Parameters
@@ -31,36 +33,51 @@ class RotationAnglePlotter:
         -------
 
         """
-        self.ax[iy][ix].plot(x, y, symb)
-
+        return self.ax[iy][ix].plot(x, y, symb,**kwargs)
+    def default_titles(self):
+        self.ax[0][0].set_title('Fold Axis S-Plot')
+        self.ax[0][1].set_title('Fold Axis S-Variogram')
+        self.ax[1][0].set_title('Fold Limb S-Plot')
+        self.ax[1][1].set_title('Fold Limb S-Variogram')
+
+        self.ax[1][1].set_xlabel('Variogram Steps')
+        self.ax[1][1].set_ylabel('Fold Limb S-Variogram')
+        self.ax[1][0].set_ylabel('Fold Limb Rotation Angle')
+        self.ax[1][0].set_xlabel('Fold Frame Axial Surface Field')
+
+        self.ax[0][1].set_xlabel('Variogram Steps')
+        self.ax[0][1].set_ylabel('Fold Axis S-Variogram')
+        self.ax[0][0].set_ylabel('Fold Axis Rotation Angle')
+        self.ax[0][0].set_xlabel('Fold Frame Axis Direction Field')
     def add_fold_limb_data(self, symb="bo",**kwargs):
         fold_frame = self.feature.fold.fold_limb_rotation.fold_frame_coordinate
         rotation = self.feature.fold.fold_limb_rotation.rotation_angle
-        self.plot(fold_frame, rotation, 0, 1, symb,**kwargs)
+        return self.plot(fold_frame, rotation, 0, 1, symb,**kwargs)
+        
 
     def add_fold_limb_curve(self, symb='r-',**kwargs):
         x = np.linspace(self.feature.fold.foldframe[0].min(),self.feature.fold.foldframe[0].max(),100)
-        self.plot(x,self.feature.fold.fold_limb_rotation(x), 0, 1, symb,**kwargs)
+        return self.plot(x,self.feature.fold.fold_limb_rotation(x), 0, 1, symb,**kwargs)
 
     def add_axis_svariogram(self, symb='bo',**kwargs):
         svariogram = self.feature.fold.fold_axis_rotation.svario
         if svariogram:
             svariogram.calc_semivariogram()
-            self.plot(svariogram.lags, svariogram.variogram, 1, 1, symb,**kwargs)
+            return self.plot(svariogram.lags, svariogram.variogram, 1, 0, symb,**kwargs)
 
     def add_limb_svariogram(self, symb='bo', **kwargs):
         svariogram = self.feature.fold.fold_limb_rotation.svario
         if svariogram:
             svariogram.calc_semivariogram()
-            self.plot(svariogram.lags, svariogram.variogram, 1, 1, symb,**kwargs)
+            return self.plot(svariogram.lags, svariogram.variogram, 1, 1, symb,**kwargs)
 
     def add_fold_axis_data(self, symb='bo',**kwargs):
         fold_frame = self.feature.fold.fold_axis_rotation.fold_frame_coordinate
         rotation = self.feature.fold.fold_axis_rotation.rotation_angle
-        self.plot(fold_frame, rotation, 0, 1, symb,**kwargs)
+        return self.plot(fold_frame, rotation, 0, 0, symb,**kwargs)
 
     def add_fold_axis_curve(self, symb='r-',**kwargs):
         x = np.linspace(self.feature.fold.foldframe[1].min(),self.feature.fold.foldframe[1].max(),100)
-        self.plot(x,self.feature.fold.fold_axis_rotation(x), 0, 1, symb,**kwargs)
+        return self.plot(x,self.feature.fold.fold_axis_rotation(x), 0, 0, symb,**kwargs)
 
 

Miniconda/envs/loop/Lib/site-packages/LoopStructural/visualisation/stratigraphic_column.py

@@ -0,0 +1,60 @@
+import numpy as np
+import matplotlib.pyplot as plt
+from matplotlib import cm
+from matplotlib.patches import Polygon
+from matplotlib.collections import PatchCollection
+
+class StratigraphicColumnView:
+    def __init__(self,model,ax=None,cmap=None, labels = None):
+        n_units = 0 #count how many discrete colours
+        xmin = 0
+        ymin = 0
+        ymax = 1
+        xmax = 1
+        if ax is None:
+            fig, ax = plt.subplots(figsize=(2,10))
+        patches = []
+        for g in model.stratigraphic_column.keys():
+            if g == 'faults':
+                continue
+            for u in model.stratigraphic_column[g].keys():
+                n_units+=1
+                ymin = -model.stratigraphic_column[g][u]['min']
+                if np.isinf(model.stratigraphic_column[g][u]['min']):
+                    ymin = 0
+                ymax = -model.stratigraphic_column[g][u]['max']
+                if np.isinf(ymax):
+                    ymin = ymax + (ymax-ymin)*(1+np.random.rand())
+                polygon_points = np.array([[xmin,ymin],[xmax,ymin],[xmax,ymax],[xmin,ymax]])
+                patches.append(Polygon(polygon_points))
+                xy = (0,ymin+(ymax-ymin)/2)
+                if labels:
+                    ax.annotate(labels[u],xy)
+                else:
+                    ax.annotate(u,xy)
+        if cmap is None:
+            import matplotlib.colors as colors
+            colours = []
+            boundaries = []
+            data = []
+            for g in model.stratigraphic_column.keys():
+                if g == 'faults':
+                    continue
+                for u, v  in model.stratigraphic_column[g].items():
+                    data.append((v['id'],v['colour']))
+                    colours.append(v['colour'])
+                    boundaries.append(v['id'])#print(u,v)
+            cmap = colors.ListedColormap(colours)
+        else:
+            cmap = cm.get_cmap(cmap,n_units-1)
+        ci = 0
+        p = PatchCollection(patches, cmap=cmap)
+
+        colors = np.arange(len(patches))
+        p.set_array(np.array(colors))
+
+        ax.add_collection(p)
+
+        ax.set_ylim(ymax+(ymax-ymin)*-2,0)#ax.set_ylim(0,ymax)
+        ax.axis('off')
+        

Miniconda/envs/loop/Lib/site-packages/{LoopStructural-1.0.3-py3.6.egg-info → LoopStructural-1.0.71.dev0-py3.6.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: LoopStructural
-Version: 1.0.3
+Version: 1.0.71.dev0
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

Miniconda/envs/loop/Lib/site-packages/{LoopStructural-1.0.3-py3.6.egg-info → LoopStructural-1.0.71.dev0-py3.6.egg-info}/SOURCES.txt

@@ -10,6 +10,7 @@ LoopStructural/interpolators/cython/dsi_helper.c
 LoopStructural/datasets/__init__.py
 LoopStructural/datasets/_base.py
 LoopStructural/interpolators/__init__.py
+LoopStructural/interpolators/base_structured_3d_support.py
 LoopStructural/interpolators/discrete_fold_interpolator.py
 LoopStructural/interpolators/discrete_interpolator.py
 LoopStructural/interpolators/finite_difference_interpolator.py
@@ -24,7 +25,10 @@ LoopStructural/interpolators/cython/dsi_helper.c
 LoopStructural/modelling/__init__.py
 LoopStructural/modelling/core/__init__.py
 LoopStructural/modelling/core/geological_model.py
+LoopStructural/modelling/core/geological_model_graph.py
+LoopStructural/modelling/core/stratigraphic_column.py
 LoopStructural/modelling/fault/__init__.py
+LoopStructural/modelling/fault/fault_builder.py
 LoopStructural/modelling/fault/fault_function.py
 LoopStructural/modelling/fault/fault_function_feature.py
 LoopStructural/modelling/fault/fault_segment.py
@@ -32,6 +36,7 @@ LoopStructural/modelling/features/__init__.py
 LoopStructural/modelling/features/cross_product_geological_feature.py
 LoopStructural/modelling/features/geological_feature.py
 LoopStructural/modelling/features/geological_feature_builder.py
+LoopStructural/modelling/features/lambda_geological_feature.py
 LoopStructural/modelling/features/region_feature.py
 LoopStructural/modelling/features/structural_frame.py
 LoopStructural/modelling/features/structural_frame_builder.py
@@ -43,9 +48,12 @@ LoopStructural/modelling/fold/fold_rotation_angle_feature.py
 LoopStructural/modelling/fold/foldframe.py
 LoopStructural/modelling/fold/svariogram.py
 LoopStructural/utils/__init__.py
+LoopStructural/utils/bounding_box.py
 LoopStructural/utils/exceptions.py
 LoopStructural/utils/helper.py
+LoopStructural/utils/logging.py
 LoopStructural/utils/map2loop.py
+LoopStructural/utils/regions.py
 LoopStructural/utils/utils.py
 LoopStructural/visualisation/__init__.py
 LoopStructural/visualisation/map_viewer.py
@@ -53,8 +61,5 @@ LoopStructural/visualisation/model_plotter.py
 LoopStructural/visualisation/model_visualisation.py
 LoopStructural/visualisation/rotation_angle_plotter.py
 LoopStructural/visualisation/sphinx_scraper.py
-tests/__init__.py
-tests/test_faults.py
-tests/test_fold.py
-tests/test_interpolator.py
-tests/test_refolded.py
+LoopStructural/visualisation/stratigraphic_column.py
+tests/__init__.py

Miniconda/envs/loop/Lib/site-packages/LoopStructural-1.0.71.dev0-py3.6.egg-info/requires.txt

@@ -0,0 +1,8 @@
+Cython
+numpy
+pandas
+scipy
+matplotlib
+scikit-image
+scikit-learn
+tqdm

Miniconda/envs/loop/Lib/site-packages/LoopStructural-1.0.3-py3.6.egg-info/requires.txt

@@ -1,3 +0,0 @@
-Cython
-numpy
-pandas

Miniconda/envs/loop/Lib/site-packages/tests/test_faults.py

@@ -1,17 +0,0 @@
-from LoopStructural import GeologicalModel
-from LoopStructural.datasets import load_intrusion
-data, bb = load_intrusion()
-model = GeologicalModel(bb[0,:],bb[1,:])
-model.set_model_data(data)
-fault = model.create_and_add_fault('fault',
-                                   500,
-                                   nelements=2000,
-                                   steps=4,
-                                   interpolatortype='PLI',
-                                   buffer=0.2)
-strati = model.create_and_add_foliation('strati',
-                                        nelements=30000,
-                                        interpolatortype='PLI',
-                                        cgw=0.1,
-                                        buffer=0.1
-                                        )

Miniconda/envs/loop/Lib/site-packages/tests/test_fold.py

@@ -1,57 +0,0 @@
-from LoopStructural import GeologicalModel
-from LoopStructural.datasets import load_noddy_single_fold
-
-import pandas as pd
-
-data, boundary_points = load_noddy_single_fold()
-data.head()
-def test_average_fold_axis():
-    mdata = pd.concat([data[:100],data[data['feature_name']=='s1']])
-    model = GeologicalModel(boundary_points[0,:],boundary_points[1,:])
-    model.set_model_data(mdata)
-    fold_frame = model.create_and_add_fold_frame('s1',nelements=10000)
-    stratigraphy = model.create_and_add_folded_foliation('s0',
-                                                   fold_frame,
-                                                    nelements=10000,
-                                                    av_fold_axis=True
-                                                   # fold_axis=[-6.51626577e-06, -5.00013645e-01, -8.66017526e-01],
-                                                   # limb_wl=1
-                                                         )
-def test_fixed_fold_axis():
-    mdata = pd.concat([data[:100],data[data['feature_name']=='s1']])
-    model = GeologicalModel(boundary_points[0,:],boundary_points[1,:])
-    model.set_model_data(mdata)
-    fold_frame = model.create_and_add_fold_frame('s1',nelements=10000)
-    stratigraphy = model.create_and_add_folded_foliation('s0',
-                                                   fold_frame,
-                                                    nelements=10000,
-                                                    # av_fold_axis=True
-                                                   fold_axis=[-6.51626577e-06, -5.00013645e-01, -8.66017526e-01],
-                                                   # limb_wl=1
-                                                         )
-
-def test_fixed_wavelength():
-    mdata = pd.concat([data[:100],data[data['feature_name']=='s1']])
-    model = GeologicalModel(boundary_points[0,:],boundary_points[1,:])
-    model.set_model_data(mdata)
-    fold_frame = model.create_and_add_fold_frame('s1',nelements=10000)
-    stratigraphy = model.create_and_add_folded_foliation('s0',
-                                                   fold_frame,
-                                                    nelements=10000,
-                                                    # av_fold_axis=True
-                                                   fold_axis=[-6.51626577e-06, -5.00013645e-01, -8.66017526e-01],
-                                                   limb_wl=1
-                                                         )
-
-def test_no_fold_frame():
-    mdata = pd.concat([data[:100],data[data['feature_name']=='s1']])
-    model = GeologicalModel(boundary_points[0,:],boundary_points[1,:])
-    model.set_model_data(mdata)
-    fold_frame = model.create_and_add_fold_frame('s1',nelements=10000)
-    stratigraphy = model.create_and_add_folded_foliation('s0',
-                                                   # fold_frame,
-                                                    nelements=10000,
-                                                    # av_fold_axis=True
-                                                   fold_axis=[-6.51626577e-06, -5.00013645e-01, -8.66017526e-01],
-                                                   limb_wl=1
-                                                         )

Miniconda/envs/loop/Lib/site-packages/tests/test_interpolator.py

@@ -1,88 +0,0 @@
-from LoopStructural import GeologicalModel
-from LoopStructural.datasets import load_claudius
-
-def test_create_model():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0,:],bb[1,:])
-
-def test_add_data():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0,:],bb[1,:])
-    model.set_model_data(data)
-
-def test_create_stratigraphy_FDI_cg():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0, :], bb[1, :])
-    model.set_model_data(data)
-    s0 = model.create_and_add_foliation('s0',
-                                        interpolatortype='FDI',
-                                        nelements=1000,
-                                        solver='cg',
-                                        damp=False)
-
-
-def test_remove_constraints_PLI():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0, :], bb[1, :])
-    model.set_model_data(data)
-    s0 = model.create_and_add_foliation('s0',
-                                        interpolatortype='FDI',
-                                        nelements=1000,
-                                        solver='cg',
-                                        damp=False)
-
-def test_create_stratigraphy_FDI_lu():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0, :], bb[1, :])
-    model.set_model_data(data)
-    s0 = model.create_and_add_foliation('s0',
-                                        interpolatortype='FDI',
-                                        nelements=1000,
-                                        solver='lu',
-                                        damp=True)
-
-
-def test_create_stratigraphy_FDI_pyamg():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0, :], bb[1, :])
-    model.set_model_data(data)
-    s0 = model.create_and_add_foliation('s0',
-                                        interpolatortype='FDI',
-                                        nelements=1000,
-                                        solver='pyamg',
-                                        damp=True)
-
-def test_create_stratigraphy_PLI_cg():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0, :], bb[1, :])
-    model.set_model_data(data)
-    s0 = model.create_and_add_foliation('s0',
-                                        interpolatortype='PLI',
-                                        nelements=1000,
-                                        solver='cg',
-                                        damp=False)
-
-def test_create_stratigraphy_PLI_lu():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0, :], bb[1, :])
-    model.set_model_data(data)
-    s0 = model.create_and_add_foliation('s0',
-                                        interpolatortype='PLI',
-                                        nelements=1000,
-                                        solver='lu',
-                                        damp=True)
-
-
-def test_create_stratigraphy_PLI_pyamg():
-    data, bb = load_claudius()
-    model = GeologicalModel(bb[0, :], bb[1, :])
-    model.set_model_data(data)
-    s0 = model.create_and_add_foliation('s0',
-                                        interpolatortype='PLI',
-                                        nelements=1000,
-                                        solver='pyamg',
-                                        damp=True)
-
-def test_model_with_data_outside_of_bounding_box():
-    pass
-

Miniconda/envs/loop/Lib/site-packages/tests/test_refolded.py

@@ -1,22 +0,0 @@
-from LoopStructural import GeologicalModel
-from LoopStructural.datasets import load_laurent2016
-
-def average_axis():
-    data, bb = load_laurent2016()
-
-    model = GeologicalModel(bb[0,:],bb[1,:])
-    model.set_model_data(data)
-    s2 = model.create_and_add_fold_frame('s2',
-                                         nelements=10000)
-
-    s1 = model.create_and_add_folded_fold_frame('s1',
-                                                limb_wl=.4,
-                                                av_fold_axis=True,
-                                                nelements=50000
-                                               )
-
-    s0 = model.create_and_add_folded_fold_frame('s0',
-                                                limb_wl=1.,
-                                                av_fold_axis=True,
-                                                nelements=50000
-                                               )