Rename integrated desalination demo input file and move it next to th…

…e other CM module input files
Sakshi21299 · Jun 3, 2024 · 713258e · 713258e
1 parent e4bb9b3
commit 713258e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/...tegrated_desalination_jupyter_notebooks/integrated_optimization_md_jupyter_notebook.ipynb b/...tegrated_desalination_jupyter_notebooks/integrated_optimization_md_jupyter_notebook.ipynb
@@ -56,8 +56,8 @@
    "outputs": [],
    "source": [
     "with resources.path(\n",
-    "    \"pareto.case_studies\",\n",
-    "    \"integrated_desalination_demo.xlsx\",\n",
+    "    \"pareto.models_extra.CM_module.case_studies\",\n",
+    "    \"CM_integrated_desalination_demo.xlsx\",\n",
     ") as fpath:\n",
     "    [df_sets, df_parameters] = get_data(fpath, model_type=\"critical_mineral\")\n",
     "\n",

diff --git a/...egrated_desalination_jupyter_notebooks/integrated_optimization_mvr_jupyter_notebook.ipynb b/...egrated_desalination_jupyter_notebooks/integrated_optimization_mvr_jupyter_notebook.ipynb
@@ -56,8 +56,8 @@
    "outputs": [],
    "source": [
     "with resources.path(\n",
-    "    \"pareto.case_studies\",\n",
-    "    \"integrated_desalination_demo.xlsx\",\n",
+    "    \"pareto.models_extra.CM_module.case_studies\",\n",
+    "    \"CM_integrated_desalination_demo.xlsx\",\n",
     ") as fpath:\n",
     "    [df_sets, df_parameters] = get_data(fpath, model_type=\"critical_mineral\")\n",
     "\n",

diff --git a/...studies/integrated_desalination_demo.xlsx → ...dies/CM_integrated_desalination_demo.xlsx b/...studies/integrated_desalination_demo.xlsx → ...dies/CM_integrated_desalination_demo.xlsx
diff --git a/pareto/tests/test_integrated_optimization_mvr.py b/pareto/tests/test_integrated_optimization_mvr.py
@@ -26,8 +26,8 @@
 class TestIntegratedOptimizationMvr:
     def test_single_stage_mvr(self):
         with resources.path(
-            "pareto.case_studies",
-            "integrated_desalination_demo.xlsx",
+            "pareto.models_extra.CM_module.case_studies",
+            "CM_integrated_desalination_demo.xlsx",
         ) as fpath:
             [df_sets, df_parameters] = get_data(fpath, model_type="critical_mineral")
 
@@ -40,8 +40,8 @@ def test_single_stage_mvr(self):
 
     def test_two_stage_mvr(self):
         with resources.path(
-            "pareto.case_studies",
-            "integrated_desalination_demo.xlsx",
+            "pareto.models_extra.CM_module.case_studies",
+            "CM_integrated_desalination_demo.xlsx",
         ) as fpath:
             [df_sets, df_parameters] = get_data(fpath, model_type="critical_mineral")