Merge branch 'master' of github.com:Loop3D/LoopStructural

Author: lachlangrose

LoopStructural/__init__.py

@@ -29,7 +29,7 @@
 ch.setFormatter(formatter)
 ch.setLevel(logging.WARNING)
 loggers = {}
-__version__ = '1.0.73dev'
+__version__ = '1.0.75dev'
 from .modelling.core.geological_model import GeologicalModel
 from .visualisation.model_visualisation import LavaVuModelViewer
 from .visualisation.map_viewer import MapView

LoopStructural/modelling/features/lambda_geological_feature.py

@@ -9,10 +9,11 @@
 
 
 class LambdaGeologicalFeature:
-    def __init__(self,function = None,name = 'unnamed_lambda', gradient_function = None):
+    def __init__(self,function = None,name = 'unnamed_lambda', gradient_function = None, model = None):
         self.function = function
         self.name = name
         self.gradient_function = gradient_function
+        self.model = model
     def evaluate_value(self, xyz):
         v = np.zeros((xyz.shape[0]))
         if self.function is None:
@@ -27,5 +28,9 @@ def evaluate_gradient(self,xyz):
         else:
             v[:,:] = self.gradient_function(xyz)
         return v
+    def min(self):
+        return 0
+    def max(self):
+        return 0
 
 

setup.py

@@ -38,15 +38,15 @@ def get_version(rel_path):
 setup(
 	name="LoopStructural",
 	install_requires=[
-	'Cython',
-	'numpy',
-	'pandas',
-	'scipy',
-	'matplotlib',
-	# 'lavavu',
-	'scikit-image',
-	'scikit-learn',
-	'tqdm'
+# 	'Cython',
+# 	'numpy',
+# 	'pandas',
+# 	'scipy',
+# 	'matplotlib',
+# 	# 'lavavu',
+# 	'scikit-image',
+# 	'scikit-learn',
+# 	'tqdm'
 
 	],
 	version=get_version("LoopStructural/__init__.py"),