Improve import situation in peilbeheerst

Deltares · Jul 30, 2024 · 66cfbd3 · 66cfbd3
1 parent 67338e8
commit 66cfbd3
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 123 deletions.
diff --git a/src/peilbeheerst_model/Parametrize/AmstelGooienVecht_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/AmstelGooienVecht_parametrize.ipynb
@@ -449,15 +449,6 @@
     "        logging.error(f\"Could not read the log file: {log_exception}\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "stop"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/src/peilbeheerst_model/Parametrize/Delfland_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/Delfland_parametrize.ipynb
@@ -374,15 +374,6 @@
     "        logging.error(f\"Could not read the log file: {log_exception}\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "stop"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/src/peilbeheerst_model/Parametrize/HollandsNoorderkwartier_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/HollandsNoorderkwartier_parametrize.ipynb
@@ -362,15 +362,6 @@
     "        logging.error(f\"Could not read the log file: {log_exception}\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "stop"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/src/peilbeheerst_model/Parametrize/HollandseDelta_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/HollandseDelta_parametrize.ipynb
@@ -419,15 +419,6 @@
     "        logging.error(f\"Could not read the log file: {log_exception}\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "stop"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/src/peilbeheerst_model/Parametrize/Rijnland_nieuw.ipynb b/src/peilbeheerst_model/Parametrize/Rijnland_nieuw.ipynb
@@ -371,15 +371,6 @@
     "        logging.error(f\"Could not read the log file: {log_exception}\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "stop"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/src/peilbeheerst_model/Parametrize/Rijnland_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/Rijnland_parametrize.ipynb
@@ -11,6 +11,7 @@
     "import pathlib\n",
     "import warnings\n",
     "\n",
+    "import matplotlib.pyplot as plt\n",
     "import pandas as pd\n",
     "import peilbeheerst_model.ribasim_parametrization as ribasim_param\n",
     "import ribasim\n",

diff --git a/src/peilbeheerst_model/Parametrize/SchielandendeKrimpenerwaard_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/SchielandendeKrimpenerwaard_parametrize.ipynb
@@ -394,15 +394,6 @@
     "        logging.error(f\"Could not read the log file: {log_exception}\")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "stop"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/src/peilbeheerst_model/Parametrize/WetterskipFryslan_parametrize.ipynb b/src/peilbeheerst_model/Parametrize/WetterskipFryslan_parametrize.ipynb
@@ -16,6 +16,7 @@
     "import peilbeheerst_model.ribasim_parametrization as ribasim_param\n",
     "import ribasim\n",
     "import ribasim.nodes\n",
+    "from peilbeheerst_model.add_storage_basins import AddStorageBasin\n",
     "from ribasim import Node\n",
     "from ribasim.nodes import (\n",
     "    pump,\n",

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_WSRL.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_WSRL.ipynb
@@ -28,11 +28,7 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_agv.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_agv.ipynb
@@ -28,11 +28,8 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_delfland.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_delfland.ipynb
@@ -28,11 +28,7 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_rijnland.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_rijnland.ipynb
@@ -28,11 +28,8 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_wetterskip.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_wetterskip.ipynb
@@ -28,11 +28,9 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "import shapely\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {
@@ -353,7 +351,6 @@
     "from itertools import combinations\n",
     "\n",
     "gdf = Wetterskip[\"peilgebied\"]\n",
-    "gdf = test\n",
     "gdf = gdf[6:]\n",
     "# Initialize a list to store index pairs with more than 90% overlap\n",
     "overlapping_pairs = []\n",

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_zuiderzeeland.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-process_zuiderzeeland.ipynb
@@ -30,11 +30,9 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "import shapely\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {
@@ -54,6 +52,7 @@
    "source": [
     "# define relative paths\n",
     "waterschap = \"Zuiderzeeland\"\n",
+    "waterschap2 = \"Zuiderzeeland\"\n",
     "\n",
     "data_path = f\"../projects/4750_20/Data_postprocessed/Waterschappen/{waterschap}/{waterschap}.gpkg\"\n",
     "\n",

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_HD.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_HD.ipynb
@@ -28,11 +28,8 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_HHNK.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_HHNK.ipynb
@@ -28,11 +28,8 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_HHSK.ipynb b/src/peilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_HHSK.ipynb
@@ -28,11 +28,9 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "import shapely\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/...ilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_scheldestromen.ipynb b/...ilbeheerst_model/peilbeheerst_model/postprocess_data/post-processing_scheldestromen.ipynb
@@ -28,11 +28,8 @@
    "source": [
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "import pandas as pd\n",
+    "from general_functions import read_gpkg_layers"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/AmstelGooienVecht.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/AmstelGooienVecht.ipynb
@@ -7,7 +7,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# import packages and functions\n",
     "import os\n",
     "\n",
     "import geopandas as gpd\n",
@@ -24,10 +23,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from general_functions import *\n",
+    "from general_functions import show_layers_and_columns, store_data\n",
     "\n",
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
     "pd.set_option(\"display.max_columns\", None)"
    ]
   },

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Delfland.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Delfland.ipynb
@@ -7,7 +7,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# import packages and functions\n",
     "import os\n",
     "\n",
     "import geopandas as gpd\n",
@@ -21,7 +20,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHNK.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHNK.ipynb
@@ -21,10 +21,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%load_ext autoreload\n",
-    "%autoreload 2\n",
-    "\n",
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHSK.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/HHSK.ipynb
@@ -26,7 +26,7 @@
    },
    "outputs": [],
    "source": [
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Hollandse_Delta.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Hollandse_Delta.ipynb
@@ -22,7 +22,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Rijnland.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Rijnland.ipynb
@@ -23,7 +23,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from general_functions import *"
+    "from general_functions import burn_in_peilgebieden, read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Rivierenland.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Rivierenland.ipynb
@@ -23,7 +23,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Scheldestromen.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Scheldestromen.ipynb
@@ -12,7 +12,8 @@
     "\n",
     "import geopandas as gpd\n",
     "import numpy as np\n",
-    "import pandas as pd"
+    "import pandas as pd\n",
+    "from shapely.geometry import Polygon"
    ]
   },
   {
@@ -22,7 +23,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from general_functions import *"
+    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data"
    ]
   },
   {

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Wetterskip.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Wetterskip.ipynb
@@ -11,7 +11,7 @@
     "\n",
     "import geopandas as gpd\n",
     "import pandas as pd\n",
-    "from general_functions import *\n",
+    "from general_functions import read_gpkg_layers, show_layers_and_columns, store_data\n",
     "\n",
     "pd.set_option(\"display.max_columns\", None)"
    ]

diff --git a/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Zuiderzeeland.ipynb b/src/peilbeheerst_model/peilbeheerst_model/preprocess_data/Zuiderzeeland.ipynb
@@ -23,7 +23,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from general_functions import *"
+    "from general_functions import show_layers_and_columns, store_data"
    ]
   },
   {