chore: add data folder within demo and adjust paths accordingly

Breakthrough-Energy · Apr 8, 2020 · 0b6a794 · 0b6a794
1 parent 635870e
commit 0b6a794
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/powersimdata/__init__.py b/powersimdata/__init__.py
@@ -1 +1 @@
-__all__ = ['input', 'output', 'scenario','scaling']
+__all__ = ['design','input', 'output', 'scenario']
diff --git a/powersimdata/design/__init__.py b/powersimdata/design/__init__.py
@@ -1 +1 @@
-__all__ = []
+__all__ = ['demo','tests']
diff --git a/powersimdata/design/clean_capacity_scaling.py b/powersimdata/design/clean_capacity_scaling.py
@@ -91,7 +91,7 @@ def load_target_from_json(target_name):
         """
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files",
+            "demo", "data", "save_files",
             target_name+".json"), "r")
         target_obj = jsonpickle.decode(json_file.read())
         json_file.close()
@@ -106,7 +106,7 @@ def load_target_from_pickle(target_name):
         """
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files", target_name+".pkl"),
+            "demo", "data", "save_files", target_name+".pkl"),
             "rb")
         target_obj = pickle.load(json_file)
         json_file.close()
@@ -620,7 +620,7 @@ def save_target_as_json(self):
         print(os.getcwd())
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files",
+            "demo", "data", "save_files",
             self.region_name+".json"), "w")
         obj_json = json.dumps(json.loads(jsonpickle.encode(self)), indent=4,
                               sort_keys=True)
@@ -634,7 +634,7 @@ def save_target_as_pickle(self):
         print(os.getcwd())
         json_file = open(os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
-            "save_files",
+            "demo", "data", "save_files",
             self.region_name+".pkl"), "wb")
         pickle.dump(self, json_file)
         json_file.close()

diff --git a/powersimdata/design/demo/__init__.py b/powersimdata/design/demo/__init__.py
@@ -0,0 +1 @@
+__all__ = ['data']
diff --git a/...a/design/demo/Eastern Scenario Take 2.csv → ...ign/demo/data/Eastern Scenario Take 2.csv b/...a/design/demo/Eastern Scenario Take 2.csv → ...ign/demo/data/Eastern Scenario Take 2.csv
diff --git a/powersimdata/design/demo/data/__init__.py b/powersimdata/design/demo/data/__init__.py
diff --git a/powersimdata/design/save_files/__init__.py → ...a/design/demo/data/save_files/__init__.py b/powersimdata/design/save_files/__init__.py → ...a/design/demo/data/save_files/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__all__ = ['input', 'output', 'scenario','scaling']
		__all__ = ['design','input', 'output', 'scenario']