Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified dist/pv_tool_logic-1.1.0-py3-none-any.whl
Binary file not shown.
Binary file modified dist/pv_tool_logic-1.1.0.tar.gz
Binary file not shown.
Binary file added dist/pv_tool_logic-1.1.2-py3-none-any.whl
Binary file not shown.
Binary file added dist/pv_tool_logic-1.1.2.tar.gz
Binary file not shown.
21 changes: 20 additions & 1 deletion pv_tool_logic/imports/import_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
if TYPE_CHECKING:
from pv_tool_logic.imports.import_data import Dbase

def _normaliseer_bool_kolommen(df: pd.DataFrame, kolommen: list[str]) -> pd.DataFrame:
"""Normaliseert opgegeven kolommen naar booleans.

Waarden zoals 1, 1.0 en True worden als True geïnterpreteerd.
Waarden zoals 0, 0.0, lege cellen en NaN worden False.
"""
for kolom in kolommen:
if kolom in df.columns:
df[kolom] = df[kolom].fillna(0).astype(bool)
return df

def import_dbase(self: Dbase, dbase_dir: Path):
"""Importeert de Dbase-df (template)."""
Expand All @@ -17,7 +27,6 @@ def import_dbase(self: Dbase, dbase_dir: Path):
header_row: int | None = None
for idx, row in temp_df.iterrows():
if "ALG__BORING_MONSTERNR_ID" in row.values:
# Cast pandas index to int - pandas ensures this is numeric for default RangeIndex
header_row = int(str(idx))
break

Expand All @@ -36,6 +45,16 @@ def import_dbase(self: Dbase, dbase_dir: Path):
errors="coerce"
)

# Normaliseer True/False kolommen
dbase = _normaliseer_bool_kolommen(
dbase,
[
"ALG__CLASSIFICATIE",
"ALG__CRS",
"ALG__SAMENDRUKKING",
"ALG__DSS",
"ALG__TRIAXIAAL"])

dbase = dbase.set_index("ALG__BORING_MONSTERNR_ID", drop=False)
self.dbase_df = dbase
return self.dbase_df
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ show_missing = true

[tool.poetry]
name = "pv_tool_logic"
version = "1.1.0"
version = "1.1.2"
description = "Proevenverzamelingtool voor het opstellen van lokale of regionale proevenverzamelingen voor het bepalen van geotechnische parameters."
authors = [
"Tjalda Deenekamp <tjalda.deenekamp@arcadis.nl>",
Expand Down
Loading