geolysis 0.21.0__py3-none-any.whl → 0.21.1__py3-none-any.whl

geolysis/__init__.py

@@ -1,5 +1,5 @@
 from . import bearing_capacity, foundation, soil_classifier, spt
 
-__version__ = "0.21.0"
+__version__ = "0.21.1"
 
 __all__ = ["foundation", "soil_classifier", "spt", "bearing_capacity"]

geolysis/soil_classifier.py

@@ -6,6 +6,8 @@ from func_validator import (
     validate_params,
     MustBeNonNegative,
     MustBePositive,
+    DependsOn,
+    MustBeLessThanOrEqual,
 )
 
 from .utils import isclose, round_
@@ -261,8 +263,7 @@ class AtterbergLimits:
 
     @liquid_limit.setter
     @validate_params
-    def liquid_limit(self,
-                     liquid_limit: Annotated[float, MustBeNonNegative()]):
+    def liquid_limit(self, liquid_limit: Annotated[float, MustBeNonNegative()]):
         self._liquid_limit = liquid_limit
 
     @property
@@ -274,15 +275,14 @@ class AtterbergLimits:
 
     @plastic_limit.setter
     @validate_params
-    def plastic_limit(self,
-                      plastic_limit: Annotated[float, MustBeNonNegative()]):
-        if self.liquid_limit < plastic_limit:
-            msg = (
-                f"plastic_limit: {plastic_limit} cannot be greater than "
-                f"liquid_limit: {self.liquid_limit}"
-            )
-            raise ValueError(msg)
-
+    def plastic_limit(
+        self,
+        plastic_limit: Annotated[
+            float,
+            MustBeNonNegative(),
+            DependsOn("liquid_limit", args_strategy=MustBeLessThanOrEqual),
+        ],
+    ):
         self._plastic_limit = plastic_limit
 
     @property
@@ -369,7 +369,7 @@ class _SizeDistribution:
 
     @property
     def coeff_of_curvature(self) -> float:
-        return (self.d_30 ** 2.0) / (self.d_60 * self.d_10)
+        return (self.d_30**2.0) / (self.d_60 * self.d_10)
 
     @property
     def coeff_of_uniformity(self) -> float:
@@ -406,12 +406,12 @@ class PSD:
     """
 
     def __init__(
-            self,
-            fines: float,
-            sand: float,
-            d_10: float | None = None,
-            d_30: float | None = None,
-            d_60: float | None = None,
+        self,
+        fines: float,
+        sand: float,
+        d_10: float | None = None,
+        d_30: float | None = None,
+        d_60: float | None = None,
     ):
         """
         :param fines: Percentage of fines in soil sample (%) i.e. The
@@ -658,10 +658,10 @@ class USCS:
     """
 
     def __init__(
-            self,
-            atterberg_limits: AtterbergLimits,
-            psd: PSD,
-            organic=False,
+        self,
+        atterberg_limits: AtterbergLimits,
+        psd: PSD,
+        organic=False,
     ):
         """
         :param atterberg_limits: Atterberg limits of the soil.
@@ -789,9 +789,9 @@ class USCS:
 
 
 def create_aashto_classifier(
-        liquid_limit: float,
-        plastic_limit: float,
-        fines: float,
+    liquid_limit: float,
+    plastic_limit: float,
+    fines: float,
 ) -> AASHTO:
     """A helper function that encapsulates the creation of a AASHTO
     classifier.
@@ -815,14 +815,14 @@ def create_aashto_classifier(
 
 @validate_params
 def create_uscs_classifier(
-        liquid_limit: float,
-        plastic_limit: float,
-        fines: float,
-        sand: float,
-        d_10: Annotated[Optional[float], MustBePositive()] = None,
-        d_30: Annotated[Optional[float], MustBePositive()] = None,
-        d_60: Annotated[Optional[float], MustBePositive()] = None,
-        organic: bool = False,
+    liquid_limit: float,
+    plastic_limit: float,
+    fines: float,
+    sand: float,
+    d_10: Annotated[Optional[float], MustBePositive()] = None,
+    d_30: Annotated[Optional[float], MustBePositive()] = None,
+    d_60: Annotated[Optional[float], MustBePositive()] = None,
+    organic: bool = False,
 ):
     """A helper function that encapsulates the creation of a USCS
     classifier.

{geolysis-0.21.0.dist-info → geolysis-0.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geolysis
-Version: 0.21.0
+Version: 0.21.1
 Summary: geolysis is an opensource software for geotechnical engineering analysis and modeling.
 Author-email: Patrick Boateng <boatengpato.pb@gmail.com>
 License: MIT License

{geolysis-0.21.0.dist-info → geolysis-0.21.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-geolysis/__init__.py,sha256=81CAE0nRbBTykYl_PCtilSI0Em3D_LX4r8kgsFzW6xk,161
+geolysis/__init__.py,sha256=JhZrstNwzGNTObDDlHFmrzpf5YwY6d6F9cp4KRZ16z4,161
 geolysis/exceptions.py,sha256=NocUF7-vaFsBJyi0QmH2EBFCpO2RT90RLEB66BCW_X0,74
 geolysis/foundation.py,sha256=bJ3TtJXSJ7ckjhhZhDE4KS8XAmh4NacFa3y4YHwo-G4,13258
-geolysis/soil_classifier.py,sha256=bZl8f7mMiRWHqdftzLbBok8RoP13W1AgQiRUeqrbef0,27941
+geolysis/soil_classifier.py,sha256=sxAxqo3achFYuhwykaK4VCzGBbiuzzgZbpK7hncOKjg,27746
 geolysis/spt.py,sha256=DEYdOjIg2JcfcR-UqL8sSW_Sj6GsrzjaioITol2tFQE,17513
 geolysis/bearing_capacity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 geolysis/bearing_capacity/abc/__init__.py,sha256=nycD68gdA116n2VX5fT_hq7ZZz3CF4OVuU3DIgnlnZw,518
@@ -16,8 +16,8 @@ geolysis/bearing_capacity/ubc/_terzaghi_ubc.py,sha256=3xroPeHvDgb7h6HytUHbtkK5f8
 geolysis/bearing_capacity/ubc/_vesic_ubc.py,sha256=FvtLBUvR0t9O4N6WYuM6VqWuj55O7sZBZ2_RT1RkijM,6934
 geolysis/utils/__init__.py,sha256=_KUctxGCiI9I-faB1iXMy-H1BQeU2LW9TmSpdDNy0Yw,1331
 geolysis/utils/math.py,sha256=Nqg6SFIy3peSC-n-rq0KjryOdWTqh9jCF2L_qvx5Yg8,1231
-geolysis-0.21.0.dist-info/licenses/LICENSE.txt,sha256=ap6sMs3lT7ICbEXBhgihwH1BTCVcjmCQkIkwVnil1Ak,1065
-geolysis-0.21.0.dist-info/METADATA,sha256=1zxt9da8ZSZqkPvwLCcs8SM0vyMBNc1Vwz_uyPZwy1Y,6833
-geolysis-0.21.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-geolysis-0.21.0.dist-info/top_level.txt,sha256=9mnQgOaCRr11dtXff8X-q3FfXjRONd6kHseSy5q2y8g,9
-geolysis-0.21.0.dist-info/RECORD,,
+geolysis-0.21.1.dist-info/licenses/LICENSE.txt,sha256=ap6sMs3lT7ICbEXBhgihwH1BTCVcjmCQkIkwVnil1Ak,1065
+geolysis-0.21.1.dist-info/METADATA,sha256=vWGj_fxjfZcUZMUTqnjnklLiOiAP9yCbY5Y8qm5GX9w,6833
+geolysis-0.21.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+geolysis-0.21.1.dist-info/top_level.txt,sha256=9mnQgOaCRr11dtXff8X-q3FfXjRONd6kHseSy5q2y8g,9
+geolysis-0.21.1.dist-info/RECORD,,