Code clean-up DGEOSUITE-482

Deltares · Dec 3, 2024 · 8dbc5b4 · 8dbc5b4
1 parent 66587df
commit 8dbc5b4
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/geolib/models/dsheetpiling/calculation_options.py b/geolib/models/dsheetpiling/calculation_options.py
@@ -7,16 +7,16 @@
 from geolib.models import BaseDataClass
 
 from .settings import (
+    AssessmentTypeEC7NL,
     CalculationType,
     DesignType,
     PartialFactorCalculationType,
     PartialFactorSetCUR,
     PartialFactorSetEC,
     PartialFactorSetEC7NADBE,
-    RiskClassEC7BE,
     PartialFactorSetEC7NADNL,
-    AssessmentTypeEC7NL,
     PartialFactorSetVerifyEC,
+    RiskClassEC7BE,
     VerifyType,
 )
 

diff --git a/geolib/models/dsheetpiling/internal.py b/geolib/models/dsheetpiling/internal.py
@@ -53,6 +53,7 @@
     PartialFactorsEurocodeDa3,
 )
 from .settings import (
+    AssessmentTypeEC7NL,
     CalculationType,
     CurveSettings,
     DesignType,
@@ -73,11 +74,10 @@
     PartialFactorSetCUR,
     PartialFactorSetEC,
     PartialFactorSetEC7NADBE,
-    RiskClassEC7BE,
     PartialFactorSetEC7NADNL,
-    AssessmentTypeEC7NL,
     PartialFactorSetVerifyEC,
     PassiveSide,
+    RiskClassEC7BE,
     SheetPilingElementMaterialType,
     Side,
     SoilTypeModulusSubgradeReaction,
@@ -396,7 +396,8 @@ def update_arguments_if_invalid_input(self) -> None:
             5: self.sheetpilingelementkmod,
         }
         if (
-            self.sheetpilingelementkmod != result_dict_k_mod_value[self.sheetpilingelementmaterialtype.value]
+            self.sheetpilingelementkmod
+            != result_dict_k_mod_value[self.sheetpilingelementmaterialtype.value]
         ):
             self.sheetpilingelementkmod = result_dict_k_mod_value[
                 self.sheetpilingelementmaterialtype.value
@@ -416,8 +417,8 @@ def update_arguments_if_invalid_input(self) -> None:
             5: self.sheetpilingelementmaterialfactor,
         }
         if (
-            self.sheetpilingelementmaterialfactor !=
-                result_dict_gamma_m_value[self.sheetpilingelementmaterialtype.value]
+            self.sheetpilingelementmaterialfactor
+            != result_dict_gamma_m_value[self.sheetpilingelementmaterialtype.value]
         ):
             self.sheetpilingelementmaterialfactor = result_dict_gamma_m_value[
                 self.sheetpilingelementmaterialtype.value

diff --git a/geolib/models/dsheetpiling/settings.py b/geolib/models/dsheetpiling/settings.py
@@ -122,6 +122,7 @@ class PartialFactorSetEC7NADNL(IntEnum):
     RC3 = 3
     SLS = 4
 
+
 class AssessmentTypeEC7NL(IntEnum):
     NewConstruction = 0
     Reconstruction = 1

diff --git a/tests/models/dsettlement/test_internal_soil.py b/tests/models/dsettlement/test_internal_soil.py
@@ -7,7 +7,6 @@
 from geolib.models.dsettlement.internal import DSettlementStructure
 from geolib.models.dsettlement.internal_soil import PreconType
 from geolib.soils import Soil, SoilClassificationParameters, StateType
-
 from tests.utils import TestUtils
 
 

diff --git a/tests/models/dstability/test_loads.py b/tests/models/dstability/test_loads.py
@@ -12,12 +12,7 @@
     PersistableTree,
     PersistableUniformLoad,
 )
-from geolib.models.dstability.loads import (
-    Consolidation,
-    LineLoad,
-    TreeLoad,
-    UniformLoad,
-)
+from geolib.models.dstability.loads import Consolidation, LineLoad, TreeLoad, UniformLoad
 
 
 @pytest.fixture
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,6 +122,7 @@ class PartialFactorSetEC7NADNL(IntEnum): @@
         RC3 = 3
         SLS = 4
     class AssessmentTypeEC7NL(IntEnum):
         NewConstruction = 0
         Reconstruction = 1
@@ Expand Down @@