Modifying structure to support multiple clusters

Sunishchal · Sep 26, 2020 · 45a20eb · 45a20eb
1 parent 395ed46
commit 45a20eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/solution/health_and_education/clusters/__init__.py b/solution/health_and_education/clusters/__init__.py
@@ -0,0 +1,8 @@
+"""Health & Education solution model for Electricity Cluster
+   Excel filename: CORE_PopulationChange_29Jan2020 (version 1.4).xlsx
+   Excel sheet name: Electricity_cluster
+"""
+import pathlib
+
+import numpy as np
+import pandas as pd
diff --git a/...alth_and_education/electricity_cluster.py → ...education/clusters/electricity_cluster.py b/...alth_and_education/electricity_cluster.py → ...education/clusters/electricity_cluster.py
@@ -12,7 +12,7 @@
 
 # import solarpvutil
 
-DATADIR = pathlib.Path(__file__).parents[0].joinpath('data')
+DATADIR = pathlib.Path(__file__).parents[1].joinpath('data')
 THISDIR = pathlib.Path(__file__).parents[0]
 
 name = 'Health and Education - Electricity Cluster'

diff --git a/solution/health_and_education/tests/test_electricity.py b/solution/health_and_education/tests/test_electricity.py
@@ -4,7 +4,7 @@
 import pandas as pd
 import numpy as np
 
-import electricity_cluster
+import clusters.electricity_cluster as electricity_cluster
 
 test_elec = electricity_cluster.Scenario()
 exp_elec = pd.read_csv('expected_elec_cluster.csv', header=None)