Skip to content

Commit

Permalink
fix: feature type enums renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
Lachlan Grose committed Jun 8, 2022
1 parent ec1b84e commit 616b554
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion LoopStructural/modelling/features/_analytical_feature.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def __init__(
BaseFeature.__init__(self, name, model, faults, regions, builder)
self.vector = np.array(vector, dtype=float)
self.origin = np.array(origin, dtype=float)
self.type = FeatureType.ANALYTICALFEATURE
self.type = FeatureType.ANALYTICAL

def evaluate_value(self, xyz):
xyz2 = np.zeros(xyz.shape)
Expand Down
2 changes: 2 additions & 0 deletions LoopStructural/modelling/features/_structural_frame.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from LoopStructural.modelling.features import BaseFeature
import numpy as np
from LoopStructural.utils import getLogger
from LoopStructural.modelling.features import FeatureType

logger = getLogger(__name__)

Expand All @@ -23,6 +24,7 @@ def __init__(self, name, features, fold=None):
BaseFeature.__init__(self, name, None, [], [], None)
self.features = features
self.fold = fold
self.type = FeatureType.STRUCTURALFRAME

def __getitem__(self, key):
"""
Expand Down
4 changes: 3 additions & 1 deletion LoopStructural/modelling/features/_unconformity_feature.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from LoopStructural.modelling.features import BaseFeature
from LoopStructural.modelling.features import FeatureType


class UnconformityFeature(BaseFeature):
""" """

def __init__(self, feature, value):
def __init__(self, feature: BaseFeature, value: float):
"""
Parameters
Expand All @@ -22,6 +23,7 @@ def __init__(self, feature, value):
)
self.feature = feature
self.value = value
self.type = FeatureType.UNCONFORMITY

def evaluate(self, pos):
"""
Expand Down
1 change: 1 addition & 0 deletions LoopStructural/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
LoopTypeError,
LoopValueError,
)
from .json_encoder import LoopJSONEncoder

0 comments on commit 616b554

Please sign in to comment.