chore: create a design folder for capacity planning, design transmiss…

…ion, scenario info
Breakthrough-Energy · Apr 7, 2020 · ceac4da · ceac4da
1 parent fa3769e
commit ceac4da
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 85 deletions.
diff --git a/powersimdata/design/__init__.py b/powersimdata/design/__init__.py
@@ -0,0 +1 @@
+__all__ = []
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
@@ -1,4 +1,4 @@
-from powersimdata.scenario.scenario_info import ScenarioInfo
+from powersimdata.design.scenario_info import ScenarioInfo
 import pandas as pd
 import jsonpickle
 import json
@@ -555,7 +555,7 @@ def add_resource_manager(self, resource_manager):
         """
         Sets the resources property equal to a resource manager object which
         contains scenario resource information
-        :param (powersimdata.scaling.clean_capacity_scaling
+        :param (powersimdata.scaling.generation
         .auto_capacity_scaling.ResourceManager) resource_manager: resource
         manager object with scenario resource information
         """

diff --git a/..._scaling/demo/Eastern Scenario Take 2.csv → ...a/design/demo/Eastern Scenario Take 2.csv b/..._scaling/demo/Eastern Scenario Take 2.csv → ...a/design/demo/Eastern Scenario Take 2.csv
diff --git a/...scaling/demo/EasternCapacityScaling.ipynb → .../design/demo/EasternCapacityScaling.ipynb b/...scaling/demo/EasternCapacityScaling.ipynb → .../design/demo/EasternCapacityScaling.ipynb
diff --git a/powersimdata/input/design_transmission.py → powersimdata/design/design_transmission.py b/powersimdata/input/design_transmission.py → powersimdata/design/design_transmission.py
diff --git a/...n_capacity_scaling/save_files/__init__.py → powersimdata/design/save_files/__init__.py b/...n_capacity_scaling/save_files/__init__.py → powersimdata/design/save_files/__init__.py
diff --git a/powersimdata/scenario/scenario_info.py → powersimdata/design/scenario_info.py b/powersimdata/scenario/scenario_info.py → powersimdata/design/scenario_info.py
diff --git a/.../clean_capacity_scaling/tests/__init__.py → powersimdata/design/tests/__init__.py b/.../clean_capacity_scaling/tests/__init__.py → powersimdata/design/tests/__init__.py
diff --git a/..._scaling/tests/test_case_input_output.csv → ...a/design/tests/test_case_input_output.csv b/..._scaling/tests/test_case_input_output.csv → ...a/design/tests/test_case_input_output.csv
diff --git a/...a/input/tests/test_design_transmission.py → .../design/tests/test_design_transmission.py b/...a/input/tests/test_design_transmission.py → .../design/tests/test_design_transmission.py
@@ -6,7 +6,7 @@
 from powersimdata.tests.mock_grid import MockGrid
 from postreise.tests.mock_scenario import MockScenario
 from powersimdata.tests.mock_change_table import MockChangeTable
-from powersimdata.input.design_transmission import (
+from powersimdata.design.design_transmission import (
     _find_branches_connected_to_bus, _find_first_degree_branches,
     _find_stub_degree, _find_capacity_at_bus, scale_renewable_stubs,
     _identify_mesh_branch_upgrades, _increment_branch_scaling)

diff --git a/..._scaling/tests/test_object_persistence.py → ...a/design/tests/test_object_persistence.py b/..._scaling/tests/test_object_persistence.py → ...a/design/tests/test_object_persistence.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling \
+from powersimdata.design.clean_capacity_scaling \
     import TargetManager, AbstractStrategyManager, Resource
 import jsonpickle
 import json

diff --git a/...ing/tests/test_resource_target_manager.py → ...ign/tests/test_resource_target_manager.py b/...ing/tests/test_resource_target_manager.py → ...ign/tests/test_resource_target_manager.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling\
+from powersimdata.design.clean_capacity_scaling\
     import Resource, TargetManager
 from pytest import approx
 from unittest.mock import patch

diff --git a/...data/scenario/tests/test_scenario_info.py → ...imdata/design/tests/test_scenario_info.py b/...data/scenario/tests/test_scenario_info.py → ...imdata/design/tests/test_scenario_info.py
@@ -1,7 +1,7 @@
 import unittest
 import pandas as pd
 
-from powersimdata.scenario.scenario_info import ScenarioInfo
+from powersimdata.design.scenario_info import ScenarioInfo
 from postreise.tests.mock_scenario import MockScenario
 
 mock_plant = {

diff --git a/...capacity_scaling/tests/test_strategies.py → powersimdata/design/tests/test_strategies.py b/...capacity_scaling/tests/test_strategies.py → powersimdata/design/tests/test_strategies.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling\
+from powersimdata.design.clean_capacity_scaling\
     import Resource, TargetManager, AbstractStrategyManager, \
     IndependentStrategyManager, CollaborativeStrategyManager
 from pytest import approx, raises

diff --git a/...caling/tests/test_target_manager_input.py → ...design/tests/test_target_manager_input.py b/...caling/tests/test_target_manager_input.py → ...design/tests/test_target_manager_input.py
@@ -1,4 +1,4 @@
-from powersimdata.scaling.clean_capacity_scaling.auto_capacity_scaling \
+from powersimdata.design.clean_capacity_scaling \
     import AbstractStrategyManager, TargetManager
 import pandas as pd
 

diff --git a/powersimdata/input/change_table.py b/powersimdata/input/change_table.py
@@ -1,7 +1,7 @@
 import os
 import pickle
 
-from powersimdata.input.design_transmission import (
+from powersimdata.design.design_transmission import (
     scale_congested_mesh_branches, scale_renewable_stubs)
 from powersimdata.input.grid import Grid
 from powersimdata.utility import const
@@ -296,15 +296,15 @@ def scale_demand(self, zone_name=None, zone_id=None):
 
     def scale_renewable_stubs(self, **kwargs):
         """Scales undersized stub branches connected to renewable generators.
-        Optional kwargs as documented in powersimdata.input.design_transmission
+        Optional kwargs as documented in powersimdata.design.design_transmission
         """
         scale_renewable_stubs(self, **kwargs)
 
     def scale_congested_mesh_branches(self, ref_scenario, **kwargs):
         """Scales congested branches based on previous scenario results.
         :param powersimdata.scenario.scenario.Scenario ref_scenario: the
             reference scenario to be used in determining branch scaling.
-        Optional kwargs as documented in powersimdata.input.design_transmission
+        Optional kwargs as documented in powersimdata.design.design_transmission
         """
         scale_congested_mesh_branches(self, ref_scenario, **kwargs)
 

diff --git a/powersimdata/scaling/__init__.py b/powersimdata/scaling/__init__.py
diff --git a/powersimdata/scaling/clean_capacity_scaling/__init__.py b/powersimdata/scaling/clean_capacity_scaling/__init__.py
diff --git a/powersimdata/scaling/clean_capacity_scaling/data/Capacity_Scaling_Western_Test_Case.xlsx b/powersimdata/scaling/clean_capacity_scaling/data/Capacity_Scaling_Western_Test_Case.xlsx
diff --git a/powersimdata/scaling/clean_capacity_scaling/data/Clean_Capacity_Scaling_TestCase_Data.xlsx b/powersimdata/scaling/clean_capacity_scaling/data/Clean_Capacity_Scaling_TestCase_Data.xlsx
diff --git a/...simdata/scaling/clean_capacity_scaling/data/Coding Requirements for RenGen Scenarios.docx b/...simdata/scaling/clean_capacity_scaling/data/Coding Requirements for RenGen Scenarios.docx
diff --git a/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.json b/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.json
diff --git a/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.pkl b/powersimdata/scaling/clean_capacity_scaling/save_files/Pacific.pkl
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_bulk_input.xlsx b/powersimdata/scaling/clean_capacity_scaling/tests/test_bulk_input.xlsx
diff --git a/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.xlsx b/powersimdata/scaling/clean_capacity_scaling/tests/test_case_input_output.xlsx