move calibration to the upper level directory

Serapieum-of-alex · Feb 21, 2024 · b2cf023 · b2cf023
1 parent 367d9ba
commit b2cf023
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/docs/Hydrological model/DistributedModel_calib.rst b/docs/Hydrological model/DistributedModel_calib.rst
@@ -8,7 +8,7 @@ After preparing all the meteorological, GIS inputs required for the model, and E
     import numpy as np
     import datetime as dt
     import gdal
-    from Hapi.rrm.calibration import Calibration
+    from Hapi.calibration import Calibration
     import Hapi.rrm.hbv_bergestrom92 as HBV
 
     import statista.metrics as metrics

diff --git a/docs/Hydrological model/Lumped_calib.rst b/docs/Hydrological model/Lumped_calib.rst
@@ -11,7 +11,7 @@ To calibrate the HBV lumped model inside Hapi you need to follow the same steps
 	import pandas as pd
 	import datetime as dt
 	import Hapi.rrm.hbv_bergestrom92 as HBVLumped
-	from Hapi.rrm.calibration import Calibration
+	from Hapi.calibration import Calibration
 	from Hapi.rrm.routing import Routing
 	from Hapi.run import Run
 	import statista.metrics as metrics

diff --git a/examples/hydrological-model/Note books/Lumped_Model_Calib.ipynb b/examples/hydrological-model/Note books/Lumped_Model_Calib.ipynb
@@ -47,7 +47,7 @@
                 "\n",
                 "import Hapi.rrm.hbv_bergestrom92 as HBVLumped\n",
                 "import Hapi.sm.performancecriteria as PC\n",
-                "from Hapi.rrm.calibration import Calibration\n",
+                "from Hapi.calibration import Calibration\n",
                 "from Hapi.rrm.routing import Routing\n",
                 "from Hapi.run import Run"
             ]

diff --git a/examples/hydrological-model/Note books/coello-distributed-model-calibratation-.ipynb b/examples/hydrological-model/Note books/coello-distributed-model-calibratation-.ipynb
@@ -49,7 +49,7 @@
                 "import numpy as np\n",
                 "import datetime as dt\n",
                 "from osgeo import gdal\n",
-                "from Hapi.rrm.calibration import Calibration\n",
+                "from Hapi.calibration import Calibration\n",
                 "import Hapi.rrm.hbv_bergestrom92 as HBV\n",
                 "\n",
                 "from Hapi.rrm.distparameters import DistParameters as DP\n",

diff --git a/examples/hydrological-model/coello-hrus-distributed-model-calibratation-muskingum.py b/examples/hydrological-model/coello-hrus-distributed-model-calibratation-muskingum.py
@@ -16,7 +16,7 @@
 import Hapi.rrm.hbv_bergestrom92 as HBV
 
 # functions
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 
 # import Hapi.HBV as HBV
 from Hapi.rrm.parameters import Parameters as DP

diff --git a/examples/hydrological-model/coello-lumped-model-calibration-deap-multiobjective-NSE-NSEHF.py b/examples/hydrological-model/coello-lumped-model-calibration-deap-multiobjective-NSE-NSEHF.py
@@ -14,7 +14,7 @@
 from deap import algorithms, base, creator, tools
 
 import Hapi.rrm.hbv_bergestrom92 as HBVLumped
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.rrm.routing import Routing
 from Hapi.run import Run
 

diff --git a/examples/hydrological-model/coello-lumped-model-calibration-deap-multiobjective-NSE-RMSE.py b/examples/hydrological-model/coello-lumped-model-calibration-deap-multiobjective-NSE-RMSE.py
@@ -17,7 +17,7 @@
 from deap import algorithms, base, creator, tools
 
 import Hapi.rrm.hbv_bergestrom92 as HBVLumped
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.rrm.routing import Routing
 from Hapi.run import Run
 

diff --git a/examples/hydrological-model/coello-lumped-model-calibration-deap.py b/examples/hydrological-model/coello-lumped-model-calibration-deap.py
@@ -15,7 +15,7 @@
 from deap import algorithms, base, creator, tools
 
 import Hapi.rrm.hbv_bergestrom92 as HBVLumped
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.rrm.routing import Routing
 from Hapi.run import Run
 

diff --git a/examples/hydrological-model/coello-lumped-model-calibration.py b/examples/hydrological-model/coello-lumped-model-calibration.py
@@ -8,7 +8,7 @@
 import statista.metrics as metrics
 
 import Hapi.rrm.hbv_bergestrom92 as HBVLumped
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.rrm.routing import Routing
 from Hapi.run import Run
 

diff --git a/examples/hydrological-model/coello-totally-distributed-model-calibratation-muskingum.py b/examples/hydrological-model/coello-totally-distributed-model-calibratation-muskingum.py
@@ -5,7 +5,7 @@
 from statista.metrics import rmse
 
 import Hapi.rrm.hbv_bergestrom92 as HBV
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.rrm.parameters import Parameters as DP
 
 # %% Paths

diff --git a/examples/hydrological-model/old examples Hapi 0.3.0/02calib_model_HRU.py b/examples/hydrological-model/old examples Hapi 0.3.0/02calib_model_HRU.py
@@ -32,7 +32,7 @@
 import Hapi.sm.performancecriteria as PC
 
 # functions
-from Hapi.rrm.calibration import RunCalibration
+from Hapi.calibration import RunCalibration
 
 # from pyOpt import Optimization, ALHSO,Optimizer
 

diff --git a/tests/Distributed_mode_calib.py b/tests/Distributed_mode_calib.py
@@ -11,7 +11,7 @@
 
 import Hapi.rrm.hbv_bergestrom92 as HBV
 import statista.metrics as metrics
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.rrm.parameters import Parameters as DP
 
 # %% Paths

diff --git a/tests/Lumped_Calibration.py b/tests/Lumped_Calibration.py
@@ -5,7 +5,7 @@
 
 import Hapi.rrm.hbv_bergestrom92 as HBVLumped
 import statista.metrics as metrics
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.rrm.routing import Routing
 from Hapi.run import Run
 

diff --git a/tests/rrm/calibration/test_rrm_calibration.py b/tests/rrm/calibration/test_rrm_calibration.py
@@ -2,7 +2,7 @@
 import numpy as np
 import statista.metrics as metrics
 import Hapi.rrm.hbv_bergestrom92 as HBVLumped
-from Hapi.rrm.calibration import Calibration
+from Hapi.calibration import Calibration
 from Hapi.routing import Routing