Skip to content

Commit 3b50542

Browse files
Julien76Julien Hericher
and
Julien Hericher
authored
Fix interpolation for u0 (#3)
* ensure u0 is linearly interpolated * fix pandas future deprecation * bump version --------- Co-authored-by: Julien Hericher <[email protected]>
1 parent 5700556 commit 3b50542

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

CHANGES.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changes
22

3+
## Version 0.1.6:
4+
5+
**date: 2024-09-26**
6+
7+
- missing data interpolation: ensure that u0 is always linearly interpolated
8+
- fix interpolation warning from pandas future deprecation
9+
310
## Version 0.1.5:
411

512
**date: 2024-09-24**

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "ngi-calculations"
3-
version = "0.1.5"
3+
version = "0.1.6"
44
description = "CPT correlations including commonly used empirical correlations"
55
authors = [
66
"Julien Hericher <[email protected]>",

src/ngi_calculations/cpt_correlations/methods/cpt_process/calculations.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,12 @@ def _integrate_lab_profile(self):
170170
_df.set_index(depth, drop=False, inplace=True)
171171

172172
# Interpolate the missing values.
173-
_df = interpolate_missing_values(_df, key_col=depth, col_list=lab_cols, mode=self.options.interpolation_mode)
173+
_df = interpolate_missing_values(
174+
_df, key_col=depth, col_list=[c for c in lab_cols if c != "u0"], mode=self.options.interpolation_mode
175+
)
176+
177+
# Handle u0 differently as it should always be interpolated linearly
178+
_df = interpolate_missing_values(_df, key_col=depth, col_list=["u0"], mode=self.options.interpolation_mode)
174179

175180
# # Prevent values for certain lab profiles to go below zero
176181
# _df[GEO.u0.key] = _df[GEO.u0.key].clip(lower=0.0)

src/ngi_calculations/cpt_correlations/utils/interpolation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def interpolate_missing_values__padding_method(df: pd.DataFrame, inplace: bool =
1818
_cols = set_replace_columns(_df, col_list)
1919

2020
for col in _cols:
21-
_df[col] = _df[col].interpolate(method="pad")
21+
_df[col] = _df[col].ffill()
2222

2323
return _df
2424

0 commit comments

Comments
 (0)