Merge pull request #124 from intvenlab/folder_reorganization

Create a design folder for capacity planning, design transmission and scenario info (#138)
Breakthrough-Energy · Apr 8, 2020 · 0470133 · 0470133
2 parents 03880c0 + 7673b05
commit 0470133
Show file tree

Hide file tree

Showing 28 changed files with 1,029 additions and 1,079 deletions.
diff --git a/README.md b/README.md
@@ -264,7 +264,7 @@ The capacity planning framework replaces an earlier spreadsheet method with
 Importing the framework:
 
 ``` python
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling \
+from powersimdata.design.clean_capacity_scaling \
     import CollaborativeStrategyManager, IndependentStrategyManager, \
         TargetManager, ResourceManager, Resource
 ```

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
@@ -0,0 +1 @@
+__all__ = ['demo','tests']
diff --git a/...capacity_scaling/auto_capacity_scaling.py → ...rsimdata/design/clean_capacity_scaling.py b/...capacity_scaling/auto_capacity_scaling.py → ...rsimdata/design/clean_capacity_scaling.py
diff --git a/..._scaling/demo/Eastern Scenario Take 2.csv → ...ata/eastern_2030_clean_energy_targets.csv b/..._scaling/demo/Eastern Scenario Take 2.csv → ...ata/eastern_2030_clean_energy_targets.csv
diff --git a/..._capacity_scaling/save_files/Pacific.json → .../design/demo/data/save_files/Pacific.json b/..._capacity_scaling/save_files/Pacific.json → .../design/demo/data/save_files/Pacific.json
@@ -8,7 +8,7 @@
     "ce_target": 50000.0,
     "ce_target_fraction": 0.25,
     "external_ce_historical_amount": 0,
-    "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.TargetManager",
+    "py/object": "powersimdata.design.clean_capacity_scaling.TargetManager",
     "region_name": "Pacific",
     "resources": {
         "geo": {
@@ -20,7 +20,7 @@
             "prev_curtailment": 0,
             "prev_generation": 8000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "hydro": {
             "addl_curtailment": 0,
@@ -31,7 +31,7 @@
             "prev_curtailment": 0,
             "prev_generation": 7000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "nuclear": {
             "addl_curtailment": 0,
@@ -42,7 +42,7 @@
             "prev_curtailment": 0,
             "prev_generation": 6500,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "solar": {
             "addl_curtailment": 0,
@@ -53,7 +53,7 @@
             "prev_curtailment": 0.138483,
             "prev_generation": 7000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         },
         "wind": {
             "addl_curtailment": 0,
@@ -64,7 +64,7 @@
             "prev_curtailment": 0.130363,
             "prev_generation": 11000,
             "prev_scenario_num": 3,
-            "py/object": "powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling.Resource"
+            "py/object": "powersimdata.design.clean_capacity_scaling.Resource"
         }
     },
     "solar_percentage": null,

diff --git a/...n_capacity_scaling/save_files/Pacific.pkl → ...a/design/demo/data/save_files/Pacific.pkl b/...n_capacity_scaling/save_files/Pacific.pkl → ...a/design/demo/data/save_files/Pacific.pkl
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__all__ = ['input', 'output', 'scenario','scaling']
		__all__ = ['design','input', 'output', 'scenario']