diff --git a/dist/pv_tool_logic-1.1.0-py3-none-any.whl b/dist/pv_tool_logic-1.1.0-py3-none-any.whl index 73f85ab..c1976d1 100644 Binary files a/dist/pv_tool_logic-1.1.0-py3-none-any.whl and b/dist/pv_tool_logic-1.1.0-py3-none-any.whl differ diff --git a/dist/pv_tool_logic-1.1.0.tar.gz b/dist/pv_tool_logic-1.1.0.tar.gz index 68b12af..5ad89c8 100644 Binary files a/dist/pv_tool_logic-1.1.0.tar.gz and b/dist/pv_tool_logic-1.1.0.tar.gz differ diff --git a/dist/pv_tool_logic-1.1.2-py3-none-any.whl b/dist/pv_tool_logic-1.1.2-py3-none-any.whl new file mode 100644 index 0000000..455627d Binary files /dev/null and b/dist/pv_tool_logic-1.1.2-py3-none-any.whl differ diff --git a/dist/pv_tool_logic-1.1.2.tar.gz b/dist/pv_tool_logic-1.1.2.tar.gz new file mode 100644 index 0000000..17372e9 Binary files /dev/null and b/dist/pv_tool_logic-1.1.2.tar.gz differ diff --git a/pv_tool_logic/imports/import_options.py b/pv_tool_logic/imports/import_options.py index 5e539e4..ac819d3 100644 --- a/pv_tool_logic/imports/import_options.py +++ b/pv_tool_logic/imports/import_options.py @@ -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).""" @@ -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 @@ -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 diff --git a/pyproject.toml b/pyproject.toml index e49e46f..e5a3100 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 ",