Db table update

docs/rekenmethodiek/geohydrologische_modellen.rst

@@ -34,7 +34,7 @@ verschilt.
 De grondwaterstroming vormt de drijvende kracht achter het proces van terugschrijdende erosie.
 Door het analytische grondwatermodel 4A van :cite:`trw_2004` toe te passen,
 kan de respons :math:`r_{exit}` in het uittredepunt worden beschreven als functie van de locatie in het
-dwarspofiel :math:`x_{exit}` [m] en de geohydrologische parameters van model 4A.
+dwarsprofiel :math:`x_{exit}` [m] en de geohydrologische parameters van model 4A.
 Een uitgebreide toelichting op de onderliggende theorie van dit model is te vinden in :ref:`stationair-model`.
 
 De respons in het uittredepunt wordt bepaald met:

geoprob_pipe/app_object.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import os
+import sqlite3
 from datetime import datetime
 from typing import TYPE_CHECKING, Optional, List
 import pandas as pd
@@ -22,6 +23,8 @@
 from geoprob_pipe.visualizations import Visualizations
 from geoprob_pipe.calculations.systems.build_and_run import build_and_run_system_calculations
 from geoprob_pipe.utils.update_metadata import update_metadata
+from geoprob_pipe.utils.sql_contents import write_dfs_to_gpkg
+
 import logging
 if TYPE_CHECKING:
     from geoprob_pipe.calculations.systems.build_and_run import CalcResult
@@ -51,6 +54,14 @@ def __init__(self, app_settings: ApplicationSettings) -> None:
         self.time_start = datetime.now()
 
         self.input_data = InputData(app_settings=app_settings)  # TODO: Alter with new option
+
+        self.df_expanded = run_expand_input_tables(geopackage_filepath=self.input_data.app_settings.geopackage_filepath)
+        # TODO VJ: vind een betere plaats hiervoor
+        conn = sqlite3.connect(app_settings.geopackage_filepath)
+        df_add = self.df_expanded.copy()
+        df_add["parameter_input"] = df_add["parameter_input"].apply(str)
+        write_dfs_to_gpkg(conn, {"data__expanded_parameters": df_add})
+        conn.close()
 
         # Read calculation settings
         # self._read_calculation_settings()  # TODO: Not part of new version
@@ -98,10 +109,10 @@ def export_archive(self):
         self.spatial.export_geopackage()
 
         # Parameter invoer als expanded
-        df_expanded = run_expand_input_tables(geopackage_filepath=self.input_data.app_settings.geopackage_filepath)
+
         input_dir = os.path.join(export_dir, "input")
         os.makedirs(input_dir, exist_ok=True)
-        df_expanded.to_excel(excel_writer=os.path.join(input_dir, "df_parameter_invoer_expanded.xlsx"), index=False)
+        self.df_expanded.to_excel(excel_writer=os.path.join(input_dir, "df_parameter_invoer_expanded.xlsx"), index=False)
 
         # Input parameter figures
         obj = InputParameterFigures.populate(

geoprob_pipe/calculations/systems/base_objects/base_system_build.py

@@ -23,7 +23,7 @@ def _gather_variable_correlations(geopackage_filepath: str
         conn = sqlite3.connect(geopackage_filepath)
         cursor = conn.cursor()
         cursor.execute("""
-SELECT parameter_a, parameter_b, correlation FROM correlatie_invoer
+SELECT parameter_a, parameter_b, correlation FROM data__correlatie_invoer
 WHERE correlation <> 0.0;
 """)
         rows = cursor.fetchall()  # This will be a list of tuples

geoprob_pipe/calculations/systems/base_objects/system_calculation.py

@@ -148,7 +148,7 @@ def _validate_distributions_are_provided():
     def _apply_distributions_on_variables():
         for item in system_calculation.setup.distributions:
             name = item['name']
-
+            # TODO FIXME a_vak en delta_length geven een validation msg, deze worden niet in dit gebruikt.
             # Check if variable exists
             if system_calculation.results.reliability_project.variables[name] is None:
                 system_calculation.validation_messages.add_warning(

geoprob_pipe/calculations/systems/model4a/initial_input.py

@@ -293,4 +293,22 @@
         "mean": 0.3,
         "source": "excel",
     },
+    {
+      "name": "a_vak",
+      "description": "De mechanisme gevoelige fractie van het element.",
+      "remark": "",
+      "unit": "-",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 1.0,
+      "source": "excel" 
+    },
+    {
+      "name": "delta_length",
+      "description": "De equivalente onafhankelijke lengte voor STPH.",
+      "remark": "",
+      "unit": "m",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 300.0,
+      "source": "excel" 
+    },
 ]

geoprob_pipe/calculations/systems/moria/initial_input.py

@@ -276,7 +276,7 @@
         "remark": "",
         "unit": "kN/m³",
         "distribution_type": DistributionType.deterministic,
-        "mean": 16.5,
+        "mean": 26.0,
         "source": "excel",
     },
     {
@@ -288,4 +288,22 @@
         "mean": 0.3,
         "source": "excel",
     },
+    {
+      "name": "a_vak",
+      "description": "De mechanisme gevoelige fractie van het element.",
+      "remark": "",
+      "unit": "-",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 1.0,
+      "source": "excel" 
+    },
+    {
+      "name": "delta_length",
+      "description": "De equivalente onafhankelijke lengte voor STPH.",
+      "remark": "",
+      "unit": "m",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 300.0,
+      "source": "excel" 
+    },
 ]

geoprob_pipe/calculations/systems/single_calc.py

@@ -42,7 +42,7 @@ def reproduce_single_calculation(
     conn = sqlite3.connect(geopackage_filepath)
     cursor = conn.cursor()
     cursor.execute(
-        'SELECT "values" FROM geoprob_pipe_metadata WHERE metadata_type = ?',
+        'SELECT metadata_value FROM geoprob_pipe_metadata WHERE metadata_type = ?',
         ("geohydrologisch_model",))
     geohydrologisch_model: str = cursor.fetchone()[0]
 

geoprob_pipe/calculations/systems/validation.py

@@ -66,8 +66,8 @@
 GAMMA_KORREL = ColumnValidation(column_name="mean", requirements=[
     ValidationRequirement(
         requirement=requirements.is_in_range(left=23.0, right=29.0, inclusive="both"),
-        failure_msg=f"De parameter 'gamma_korrel' hoort 26.0 te zijn. "
-                    f"De applicatie vereist dat deze tussen 23.0 en 29.0 is. ",
+        failure_msg="De parameter 'gamma_korrel' hoort 26.0 te zijn. "
+                    "De applicatie vereist dat deze tussen 23.0 en 29.0 is. ",
         filters=filters.combine(filters.is_in(column="parameter", values=["gamma_korrel"]),
                                 FILTER_IS_NOT_CDF_CURVE))])
 

geoprob_pipe/calculations/systems/wbi/initial_input.py

@@ -251,4 +251,22 @@
         "mean": 0.3,
         "source": "excel",
     },
+    {
+      "name": "a_vak",
+      "description": "De mechanisme gevoelige fractie van het element.",
+      "remark": "",
+      "unit": "-",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 1.0,
+      "source": "excel" 
+    },
+    {
+      "name": "delta_length",
+      "description": "De equivalente onafhankelijke lengte voor STPH.",
+      "remark": "",
+      "unit": "m",
+      "distribution_type": DistributionType.deterministic,
+      "mean": 300.0,
+      "source": "excel" 
+    },
 ]

geoprob_pipe/cmd_app/cmd.py

@@ -1,33 +1,49 @@
-import typer
-from rich.console import Console
 import os
 import sqlite3
-from geoprob_pipe.utils import clear_terminal
+from pathlib import Path
+from configparser import ConfigParser
 from datetime import datetime
+from importlib.metadata import distributions
+from typing import Dict, List, Optional
+
+import typer
+from rich.console import Console
 from rich.panel import Panel
+
 from geoprob_pipe.cmd_app.questionnaire import start_questionnaire
-from typing import Optional, List, Dict
 from geoprob_pipe.cmd_app.utils.misc import get_geoprob_pipe_version_number
+from geoprob_pipe.utils import clear_terminal
 from geoprob_pipe.utils.loggers import setup_base_logging
-from importlib.metadata import distributions
 
 app = typer.Typer(help="GeoProb-Pipe - CLI applicatie voor probabilistische piping berekeningen.", add_completion=False)
 
 
 class ApplicationSettings:
-
+    
     def __init__(self):
-        self.workspace_dir: Optional[str] = None
-        self.geopackage_filename: Optional[str] = None
+        self.workspace_dir: Path = Path()
+        self.geopackage_filename: Path = Path()
         self.datetime_stamp: str = datetime.now().strftime("%Y-%m-%d_%H%M%S")
         self.to_run = "all"
         # -> or vakken:1,2,3,4,5
         self.debug: bool = os.getenv("GEOPROB_DEBUG") == "1"
+        # Flags
+        self.batch_input: bool = False # Flag for batch input
 
     @property
     def geopackage_filepath(self) -> str:
         return os.path.join(self.workspace_dir, self.geopackage_filename)
+
+    @property
+    def batch_input_filepath(self) -> str:
+        return os.path.join(self.workspace_dir, "batch_input.ini")
 
+    @property
+    def input_config(self):
+        config = ConfigParser()
+        config.read(self.batch_input_filepath)
+        return config
+
     @property
     def hrd_dir(self):
         path_to_hrd_dir = os.path.join(self.workspace_dir, "hrd_files")
@@ -61,7 +77,7 @@ def geohydrologisch_model(self) -> str:
         conn = sqlite3.connect(self.geopackage_filepath)
         cursor = conn.cursor()
         cursor.execute("""
-            SELECT geoprob_pipe_metadata."values"
+            SELECT geoprob_pipe_metadata.metadata_value
             FROM geoprob_pipe_metadata
             WHERE metadata_type='geohydrologisch_model';
         """)
@@ -103,7 +119,7 @@ def startup_geoprob_pipe():
 
     debug_label: str = ""
     if app_settings.debug:
-        debug_label = f", DEBUG=TRUE"
+        debug_label = ", DEBUG=TRUE"
 
     clear_terminal()
     console = Console()

geoprob_pipe/cmd_app/comparisons/__init__.py

@@ -54,41 +54,41 @@ def _load_result_data_from_geopackage(self):
         """Method om de data te verzamelen uit de opgegeven pakketten.
 
         Raises:
-            ValueError: Als de `beta_limit_states` tabellen niet hetzelfde
+            ValueError: Als de `result__limit_states` tabellen niet hetzelfde
                 formaat hebben.
-            ValueError: Als de `beta_scenario` tabellen niet hetzelfde
+            ValueError: Als de `result__scenario` tabellen niet hetzelfde
                 formaat hebben.
-            ValueError: Als de `beta_uitredepunten` tabellen niet hetzelfde
+            ValueError: Als de `result__uitredepunten` tabellen niet hetzelfde
                 formaat hebben.
         """
         conn_1 = sqlite3.connect(self.geopackage_filepath_1)
         conn_2 = sqlite3.connect(self.geopackage_filepath_2)
 
         self.df1_beta_limit_states = pd.read_sql(
-            "SELECT * FROM beta_limit_states;", conn_1
+            "SELECT * FROM result__limit_states;", conn_1
             )
         self.df2_beta_limit_states = pd.read_sql(
-            "SELECT * FROM beta_limit_states;", conn_2
+            "SELECT * FROM result__limit_states;", conn_2
             )
         if len(self.df1_beta_limit_states) != len(self.df2_beta_limit_states):
             raise ValueError("De beta_limit_states tables hebben niet "
                              "hetzelfde formaat")
 
         self.df1_beta_scenarios = pd.read_sql(
-            "SELECT * FROM beta_scenarios_final;", conn_1
+            "SELECT * FROM result__scenarios_final;", conn_1
             )
         self.df2_beta_scenarios = pd.read_sql(
-            "SELECT * FROM beta_scenarios_final;", conn_2
+            "SELECT * FROM result__scenarios_final;", conn_2
             )
         if len(self.df1_beta_scenarios) != len(self.df2_beta_scenarios):
             raise ValueError("De beta_scenario tables hebben niet hetzelfde "
                              "formaat")
 
         self.df1_beta_uittredepunten = pd.read_sql(
-            "SELECT * FROM beta_uittredepunten;", conn_1
+            "SELECT * FROM result__uittredepunten;", conn_1
             )
         self.df2_beta_uittredepunten = pd.read_sql(
-            "SELECT * FROM beta_uittredepunten;", conn_2
+            "SELECT * FROM result__uittredepunten;", conn_2
             )
         if len(self.df1_beta_uittredepunten) != len(self.df2_beta_uittredepunten):
             raise ValueError("De beta_uittredepunten tables hebben niet "
@@ -108,11 +108,11 @@ def _load_uittredepunten_gdf(self):
         """
         self.gdf1_uittredepunten = gpd.read_file(
             self.geopackage_filepath_1,
-            layer="beta_uittredepunten"
+            layer="result__uittredepunten"
             )
         self.gdf2_uittredepunten = gpd.read_file(
             self.geopackage_filepath_2,
-            layer="beta_uittredepunten"
+            layer="result__uittredepunten"
             )
         if len(self.gdf1_uittredepunten) != len(self.gdf2_uittredepunten):
             raise ValueError("De beta_uittredepunten tables hebben niet "