py-pilecore 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

{py_pilecore-0.2.3.dist-info → py_pilecore-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-pilecore
-Version: 0.2.3
+Version: 0.2.5
 Summary: Public python SDK for the CEMS PileCore web-API.
 License: MIT License
         
@@ -32,10 +32,11 @@ License-File: LICENSE
 Requires-Dist: pygef <1,>0.8
 Requires-Dist: numpy <2,>1
 Requires-Dist: pandas <3,>2
-Requires-Dist: cems-nuclei[client] <1,>0.3
+Requires-Dist: cems-nuclei[client] <1,>=0.5
 Requires-Dist: matplotlib <4,>=3.8
 Requires-Dist: tqdm[notebook] <5,>4
 Requires-Dist: natsort <9,>8
+Requires-Dist: shapely <3,>=2
 Provides-Extra: docs
 Requires-Dist: Sphinx ==6.1.3 ; extra == 'docs'
 Requires-Dist: sphinx-autodoc-typehints ==1.22 ; extra == 'docs'

{py_pilecore-0.2.3.dist-info → py_pilecore-0.2.5.dist-info}/RECORD

@@ -1,23 +1,23 @@
 pypilecore/__init__.py,sha256=T2Uuao6fboVhrzKI_Sa7jXbcNAUl_PKk9BFdsozOG98,78
-pypilecore/_version.py,sha256=ouf8HFn-1JQFt9Fy5U9stS_sDtgokWW7hHtaIPyQYeA,175
+pypilecore/_version.py,sha256=32GW00vMKy-dZ6YEGZU761DjY4UfQ3SE86XtIj3yyhs,175
 pypilecore/api.py,sha256=Bq7FRSQQGOENY7HTI8bW41-WBNPpqXZvyN1A71VUam4,5141
 pypilecore/exceptions.py,sha256=-MZOfsxyHLCI0k1-wZFfVsMxc1lya5buuhLks5rxlCo,89
 pypilecore/plot_utils.py,sha256=rK5_067-4-x7LzZgt_t6ahcGrZInxNrqHqsy0RzCnq8,954
 pypilecore/utils.py,sha256=ib9LgJBIgWukL7zd_Zk1LP27UTMIZTRJ4RBB6ubn97o,1186
 pypilecore/input/__init__.py,sha256=tlmThdPtO8e6L6pqxuRQ7EOHRxYwuIcaNNGlZyAnzig,606
-pypilecore/input/grouper_properties.py,sha256=Dw17aQUyEflPOz3QEOZLx_3A4L0ctmaMtKJgBMWY14Q,10881
-pypilecore/input/multi_cpt.py,sha256=ODrFHakObVBF0nx3-YaY7ZeQwM1wcydvJBjQxjyH7No,19036
+pypilecore/input/grouper_properties.py,sha256=AqZHvg-CXcoTW7u9wgyqSm1oZLBc7sSoTawxGK69144,10895
+pypilecore/input/multi_cpt.py,sha256=ksXwMzY1KeSyWeeyiCkJVMilIWxAS45XwKXaS_uEQAE,19086
 pypilecore/input/pile_properties.py,sha256=mK8_VRy-tHZCKFHcv8ftMlCEs8KEsZpG9eGLq13hYPA,8400
-pypilecore/input/soil_properties.py,sha256=ydYW9p3SWurOR-SndocPoyCCb6yWIN9aRjf5ZdpXU0c,6927
+pypilecore/input/soil_properties.py,sha256=6JIy5CHXReKZNrsB0m-ehJKUM97t-GBO04MG9QyHXMM,6962
 pypilecore/results/__init__.py,sha256=ggTI2QzILhX_oNx1YMOih6IVCkBFg8I5-Jyn9Sw3_h0,389
-pypilecore/results/grouper_result.py,sha256=C_6zOeuxhhemzssvQZ-JO3ZNzR0A9BTPduzYVUqkYY8,19596
+pypilecore/results/grouper_result.py,sha256=9UV_fyUttqYuFgmdBCAvm6OXRTohF7oU4btxzQh1Fzk,19482
 pypilecore/results/load_settlement.py,sha256=EbfTrSvH_g96KE-x8ZjmO8D0mt5KFaQ_-AR8u4blLsU,9752
 pypilecore/results/multi_cpt_results.py,sha256=vZLy7CRUHnShVzuiixfzGWZEdxeMMLWv57Xm_x8rDu4,22466
 pypilecore/results/pile_properties.py,sha256=z1R5UNoYjBem2rS8LMJ_ye2J5ejDoSilU5fCjUrNdUg,28592
 pypilecore/results/single_cpt_results.py,sha256=-fmlgBPyCSyID7d-u-pPUdu5PLExtyKQc2kXQFNhQvs,17564
 pypilecore/results/soil_properties.py,sha256=oZYTKSXP5UgxY2vwX-bu_X447KLptuYPpsgFi_E00IQ,20704
-py_pilecore-0.2.3.dist-info/LICENSE,sha256=3OCAZXffN0Bettjeya8uF_ZYegyvvCfH1WUt6CrHb_0,1061
-py_pilecore-0.2.3.dist-info/METADATA,sha256=4TMsODAnmNxtbyz4hhDcVNXT8WIuFA9fGz-0ICJuddQ,5775
-py_pilecore-0.2.3.dist-info/WHEEL,sha256=Xo9-1PvkuimrydujYJAjF7pCkriuXBpUPEjma1nZyJ0,92
-py_pilecore-0.2.3.dist-info/top_level.txt,sha256=7BKIWZuSkbQtJ0ho5P1JvcaEbHzqADCcBuOduZmIaiI,11
-py_pilecore-0.2.3.dist-info/RECORD,,
+py_pilecore-0.2.5.dist-info/LICENSE,sha256=3OCAZXffN0Bettjeya8uF_ZYegyvvCfH1WUt6CrHb_0,1061
+py_pilecore-0.2.5.dist-info/METADATA,sha256=G5wi-AfRRynjXYGF-G72Me0isAoT_4O4QbRGOtPCpJg,5806
+py_pilecore-0.2.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+py_pilecore-0.2.5.dist-info/top_level.txt,sha256=7BKIWZuSkbQtJ0ho5P1JvcaEbHzqADCcBuOduZmIaiI,11
+py_pilecore-0.2.5.dist-info/RECORD,,

{py_pilecore-0.2.3.dist-info → py_pilecore-0.2.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.3)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pypilecore/_version.py

@@ -4,4 +4,4 @@ try:
     __version__ = version("py-pilecore")
 # during CI
 except PackageNotFoundError:
-    __version__ = "0.2.3"
+    __version__ = "0.2.5"

pypilecore/input/grouper_properties.py

@@ -121,11 +121,11 @@ def create_grouper_payload(
     overrule_nan:
         Default is 0.0
         The default behavior is to replace NaN with zero, for one of the following
-        attributes ["R_b_cal", "F_nk_cal", "R_s_cal"].
+        attributes ["R_b_cal", "F_nk_d", "R_s_cal"].
     skip_nan:
         Default is False
         If True the CPTs are skipped that have NaN values in one of the following
-        attributes ["R_b_cal", "F_nk_cal", "R_s_cal"], this means that they are not used in the grouper method.
+        attributes ["R_b_cal", "F_nk_d", "R_s_cal"], this means that they are not used in the grouper method.
 
     Raises
     ------
@@ -172,7 +172,7 @@ def create_grouper_payload(
                 f" CPT {name} does not have a x-coordinate or y-coordinate"
             )
 
-        for item in ["R_b_cal", "F_nk_cal", "R_s_cal"]:
+        for item in ["R_b_cal", "F_nk_d", "R_s_cal"]:
             if np.isnan(cpt_result.table.__getattribute__(item)).any():
                 if skip_nan:
                     has_nan = True
@@ -201,7 +201,7 @@ def create_grouper_payload(
                     cpt_result.table.R_b_cal, nan=overrule_nan
                 ).tolist(),
                 "negative_friction": np.nan_to_num(
-                    cpt_result.table.F_nk_cal, nan=overrule_nan
+                    cpt_result.table.F_nk_d, nan=overrule_nan
                 ).tolist(),
                 "shaft_bearing_capacity": np.nan_to_num(
                     cpt_result.table.R_s_cal, nan=overrule_nan
@@ -227,7 +227,7 @@ def create_grouper_payload(
                 f"upper boundary: {max(pile_tip_level)}, lower boundary: {min(pile_tip_level)}. \n"
             )
         raise ValueError(msg)
-    payload["pile_tip_level"] = list(raw_lengths[0])
+    payload["pile_tip_level"] = sorted(list(raw_lengths[0]), reverse=True)
 
     return payload
 

pypilecore/input/multi_cpt.py

@@ -15,9 +15,9 @@ def create_multi_cpt_payload(
     cptdata_objects: List[CPTData],
     classify_tables: Dict[str, dict],
     groundwater_level_nap: float,
-    pile_type: Literal["A", "B", "C", "D", "E", "F", "G"],
-    specification: Literal["concrete", "steel", "micro", "wood"],
-    installation: Literal["1", "2", "3", "4", "5", "6", "7"],
+    pile_type: Literal["concrete", "steel", "micro", "wood"],
+    specification: Literal["1", "2", "3", "4", "5", "6", "7"],
+    installation: Literal["A", "B", "C", "D", "E", "F", "G"],
     pile_shape: Literal["round", "rect"],
     friction_range_strategy: Literal[
         "manual", "lower_bound", "settlement_driven"
@@ -25,7 +25,8 @@ def create_multi_cpt_payload(
     stiff_construction: bool = False,
     cpts_group: List[str] | None = None,
     fixed_negative_friction_range_nap: Tuple[float, float] | None = None,
-    fixed_positive_friction_range_nap: Tuple[float, str | float] | None = None,
+    fixed_positive_friction_range_nap: Tuple[float, Literal["ptl"] | float]
+    | None = None,
     negative_shaft_friction: float | None = None,
     apply_qc3_reduction: bool | None = None,
     relative_pile_load: float | None = 0.7,
@@ -34,9 +35,11 @@ def create_multi_cpt_payload(
     pile_head_level_nap: float | Literal["surface"] = "surface",
     excavation_depth_nap: float | None = None,
     excavation_param_t: float = 1.0,
-    individual_negative_friction_range_nap: Mapping[str, Tuple[float, str]]
+    individual_negative_friction_range_nap: Mapping[str, Tuple[float, float]]
     | None = None,
-    individual_positive_friction_range_nap: Mapping[str, Tuple[float, str]]
+    individual_positive_friction_range_nap: Mapping[
+        str, Tuple[float, Literal["ptl"] | float]
+    ]
     | None = None,
     diameter_base: float | None = None,
     diameter_shaft: float | None = None,

pypilecore/input/soil_properties.py

@@ -26,9 +26,11 @@ def create_soil_properties_payload(
     groundwater_level_nap: float,
     friction_range_strategy: Literal["manual", "lower_bound", "settlement_driven"],
     excavation_depth_nap: float | None = None,
-    individual_negative_friction_range_nap: Mapping[Any, Tuple[float, str]]
+    individual_negative_friction_range_nap: Mapping[Any, Tuple[float, float]]
     | None = None,
-    individual_positive_friction_range_nap: Mapping[Any, Tuple[float, str]]
+    individual_positive_friction_range_nap: Mapping[
+        Any, Tuple[float, Literal["ptl"] | float]
+    ]
     | None = None,
 ) -> Tuple[List[dict], Dict[str, dict]]:
     """

pypilecore/results/grouper_result.py

@@ -528,14 +528,15 @@ class GrouperResults:
 
             - cpts within a subgroup
                 - green:
-                    Subgroups is spatially coherent, which means there are no other CPTs in between the members
-                    of the subgroup and follows the NEN9997-1 3.2.3 centre to centre validation
+                    There are no other CPTs in between the members of the subgroup. The
+                    group is also compliant with the NEN9997-1 3.2.3 centre to centre
+                    validation.
                 - orange:
-                    Subgroups is spatially coherent, which means there are no other CPTs in between the members
-                    of the subgroup and does not follow the NEN9997-1 3.2.3 centre to centre validation
+                    There are no other CPTs in between the members of the subgroup. The
+                    centre-to-centre check failed and so the group does not follow the
+                    NEN9997-1 3.2.3 centre to centre validation.
                 - red:
-                    Subgroups is not spatially coherent, which means there are other CPTs in between the
-                    members of the subgroup and does not follow the NEN9997-1 3.2.3 centre to centre validation
+                    There are other CPTs in between the members of the subgroup.
             - valid depth of the subgroup
 
         Parameters