diff --git a/.github/workflows/main_tests.yml b/.github/workflows/main_tests.yml index 620f1e5d..f6ba5dc4 100644 --- a/.github/workflows/main_tests.yml +++ b/.github/workflows/main_tests.yml @@ -69,4 +69,4 @@ jobs: - name: Run Prescient Simulator Tests run: | - python tests/simulator_tests/test_sim_rts_mod.py + pytest -v prescient/simulator/tests/test_simulator.py diff --git a/prescient/__init__.py b/prescient/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/data/__init__.py b/prescient/data/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/data/providers/__init__.py b/prescient/data/providers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/downloaders/__init__.py b/prescient/downloaders/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/downloaders/rts_gmlc_prescient/__init__.py b/prescient/downloaders/rts_gmlc_prescient/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/engine/__init__.py b/prescient/engine/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/reporting/__init__.py b/prescient/reporting/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/scripts/__init__.py b/prescient/scripts/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/prescient/simulator/tests/__init__.py b/prescient/simulator/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/simulator_tests/custom_data_provider.py b/prescient/simulator/tests/custom_data_provider.py similarity index 100% rename from tests/simulator_tests/custom_data_provider.py rename to prescient/simulator/tests/custom_data_provider.py diff --git a/tests/simulator_tests/test_cases/custom_data.json b/prescient/simulator/tests/regression_tests_data/custom_data.json similarity index 100% rename from tests/simulator_tests/test_cases/custom_data.json rename to prescient/simulator/tests/regression_tests_data/custom_data.json diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/actuals_load.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/actuals_load.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/actuals_load.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/actuals_load.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/actuals_renewables_max_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/actuals_renewables_max_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/actuals_renewables_max_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/actuals_renewables_max_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/actuals_renewables_min_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/actuals_renewables_min_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/actuals_renewables_min_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/actuals_renewables_min_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/branch.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/branch.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/branch.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/branch.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/bus.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/bus.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/bus.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/bus.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/forecasts_load.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/forecasts_load.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/forecasts_load.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/forecasts_load.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/forecasts_renewables_max_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/forecasts_renewables_max_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/forecasts_renewables_max_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/forecasts_renewables_max_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/forecasts_renewables_min_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/forecasts_renewables_min_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/forecasts_renewables_min_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/forecasts_renewables_min_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/gen.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/gen.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/gen.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/gen.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/initial_status.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/initial_status.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/initial_status.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/initial_status.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/reserves.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/reserves.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/reserves.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/reserves.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/simulation_objects.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/simulation_objects.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/simulation_objects.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/simulation_objects.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/storage.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/storage.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/storage.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/storage.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenario_csv/timeseries_pointers.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/timeseries_pointers.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenario_csv/timeseries_pointers.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenario_csv/timeseries_pointers.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/bus_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/bus_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/bus_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/bus_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/contingency_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/contingency_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/contingency_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/contingency_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/daily_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/daily_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/daily_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/daily_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/hourly_gen_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/hourly_gen_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/hourly_gen_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/hourly_gen_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/hourly_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/hourly_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/hourly_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/hourly_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/line_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/line_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/line_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/line_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/overall_simulation_output.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/overall_simulation_output.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/overall_simulation_output.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/overall_simulation_output.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/renewables_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/renewables_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/renewables_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/renewables_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/runtimes.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/runtimes.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/runtimes.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/runtimes.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/thermal_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/thermal_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/thermal_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/thermal_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/virtual_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/virtual_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_shortcut_output_baseline/virtual_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_shortcut_output_baseline/virtual_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/bus_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/bus_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/bus_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/bus_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/contingency_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/contingency_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/contingency_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/contingency_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/daily_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/daily_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/daily_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/daily_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/hourly_gen_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/hourly_gen_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/hourly_gen_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/hourly_gen_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/hourly_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/hourly_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/hourly_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/hourly_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/line_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/line_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/line_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/line_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/overall_simulation_output.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/overall_simulation_output.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/overall_simulation_output.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/overall_simulation_output.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/daily_costs.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/daily_costs.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/daily_costs.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/daily_costs.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-10.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-10.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-10.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-10.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-11.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-11.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-11.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-11.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-12.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-12.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-12.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-12.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-13.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-13.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-13.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-13.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-14.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-14.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-14.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-14.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-15.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-15.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-15.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-15.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-16.png b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-16.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-16.png rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/plots/stackgraph_2020-07-16.png diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/renewables_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/renewables_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/renewables_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/renewables_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/runtimes.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/runtimes.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/runtimes.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/runtimes.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/thermal_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/thermal_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/thermal_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/thermal_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/virtual_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/virtual_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_simulation_output_baseline/virtual_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_simulation_output_baseline/virtual_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-10/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-11/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-12/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-13/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-14/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-15/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/ScenarioStructure.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_1.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_actuals.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/Scenario_forecasts.dat diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios/pyspdir_twostage/2020-07-16/scenarios.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/actuals_load.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/actuals_load.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/actuals_load.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/actuals_load.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/actuals_renewables_max_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/actuals_renewables_max_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/actuals_renewables_max_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/actuals_renewables_max_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/actuals_renewables_min_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/actuals_renewables_min_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/actuals_renewables_min_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/actuals_renewables_min_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/branch.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/branch.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/branch.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/branch.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/bus.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/bus.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/bus.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/bus.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/forecasts_load.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/forecasts_load.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/forecasts_load.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/forecasts_load.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/forecasts_renewables_max_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/forecasts_renewables_max_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/forecasts_renewables_max_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/forecasts_renewables_max_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/forecasts_renewables_min_p.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/forecasts_renewables_min_p.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/forecasts_renewables_min_p.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/forecasts_renewables_min_p.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/gen.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/gen.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/gen.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/gen.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/initial_status.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/initial_status.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/initial_status.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/initial_status.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/reserves.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/reserves.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/reserves.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/reserves.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/simulation_objects.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/simulation_objects.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/simulation_objects.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/simulation_objects.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/storage.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/storage.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/storage.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/storage.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/timeseries_pointers.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/timeseries_pointers.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_scenarios_csv/timeseries_pointers.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_scenarios_csv/timeseries_pointers.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/bus_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/bus_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/bus_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/bus_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/contingency_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/contingency_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/contingency_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/contingency_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/daily_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/daily_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/daily_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/daily_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/hourly_gen_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/hourly_gen_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/hourly_gen_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/hourly_gen_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/hourly_summary.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/hourly_summary.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/hourly_summary.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/hourly_summary.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/line_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/line_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/line_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/line_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/overall_simulation_output.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/overall_simulation_output.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/overall_simulation_output.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/overall_simulation_output.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/daily_costs.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/daily_costs.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/daily_costs.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/daily_costs.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-10.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-10.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-10.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-10.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-11.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-11.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-11.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-11.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-12.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-12.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-12.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-12.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-13.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-13.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-13.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-13.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-14.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-14.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-14.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-14.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-15.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-15.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-15.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-15.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-16.png b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-16.png similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-16.png rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/plots/stackgraph_2020-07-16.png diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/renewables_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/renewables_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/renewables_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/renewables_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/runtimes.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/runtimes.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/runtimes.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/runtimes.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/thermal_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/thermal_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/thermal_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/thermal_detail.csv diff --git a/tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/virtual_detail.csv b/prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/virtual_detail.csv similarity index 100% rename from tests/simulator_tests/test_cases/deterministic_with_network_simulation_output_baseline/virtual_detail.csv rename to prescient/simulator/tests/regression_tests_data/deterministic_with_network_simulation_output_baseline/virtual_detail.csv diff --git a/tests/simulator_tests/test_cases/shortcut_scenario/day_ahead_prices.csv b/prescient/simulator/tests/regression_tests_data/shortcut_scenario/day_ahead_prices.csv similarity index 100% rename from tests/simulator_tests/test_cases/shortcut_scenario/day_ahead_prices.csv rename to prescient/simulator/tests/regression_tests_data/shortcut_scenario/day_ahead_prices.csv diff --git a/tests/simulator_tests/test_cases/shortcut_scenario/gen.csv b/prescient/simulator/tests/regression_tests_data/shortcut_scenario/gen.csv similarity index 100% rename from tests/simulator_tests/test_cases/shortcut_scenario/gen.csv rename to prescient/simulator/tests/regression_tests_data/shortcut_scenario/gen.csv diff --git a/tests/simulator_tests/test_cases/shortcut_scenario/real_time_prices.csv b/prescient/simulator/tests/regression_tests_data/shortcut_scenario/real_time_prices.csv similarity index 100% rename from tests/simulator_tests/test_cases/shortcut_scenario/real_time_prices.csv rename to prescient/simulator/tests/regression_tests_data/shortcut_scenario/real_time_prices.csv diff --git a/tests/simulator_tests/test_cases/shortcut_scenario/shortcut_gens.csv b/prescient/simulator/tests/regression_tests_data/shortcut_scenario/shortcut_gens.csv similarity index 100% rename from tests/simulator_tests/test_cases/shortcut_scenario/shortcut_gens.csv rename to prescient/simulator/tests/regression_tests_data/shortcut_scenario/shortcut_gens.csv diff --git a/tests/simulator_tests/test_cases/simulate_deterministic.txt b/prescient/simulator/tests/regression_tests_data/simulate_deterministic.txt similarity index 100% rename from tests/simulator_tests/test_cases/simulate_deterministic.txt rename to prescient/simulator/tests/regression_tests_data/simulate_deterministic.txt diff --git a/tests/simulator_tests/test_cases/simulate_deterministic_csv.txt b/prescient/simulator/tests/regression_tests_data/simulate_deterministic_csv.txt similarity index 100% rename from tests/simulator_tests/test_cases/simulate_deterministic_csv.txt rename to prescient/simulator/tests/regression_tests_data/simulate_deterministic_csv.txt diff --git a/tests/simulator_tests/test_cases/simulate_shortcut.txt b/prescient/simulator/tests/regression_tests_data/simulate_shortcut.txt similarity index 100% rename from tests/simulator_tests/test_cases/simulate_shortcut.txt rename to prescient/simulator/tests/regression_tests_data/simulate_shortcut.txt diff --git a/tests/simulator_tests/test_cases/simulate_with_network_deterministic.txt b/prescient/simulator/tests/regression_tests_data/simulate_with_network_deterministic.txt similarity index 100% rename from tests/simulator_tests/test_cases/simulate_with_network_deterministic.txt rename to prescient/simulator/tests/regression_tests_data/simulate_with_network_deterministic.txt diff --git a/tests/simulator_tests/test_cases/simulate_with_network_deterministic_csv.txt b/prescient/simulator/tests/regression_tests_data/simulate_with_network_deterministic_csv.txt similarity index 100% rename from tests/simulator_tests/test_cases/simulate_with_network_deterministic_csv.txt rename to prescient/simulator/tests/regression_tests_data/simulate_with_network_deterministic_csv.txt diff --git a/tests/simulator_tests/test_cases/test_plugin.py b/prescient/simulator/tests/regression_tests_data/test_plugin.py similarity index 100% rename from tests/simulator_tests/test_cases/test_plugin.py rename to prescient/simulator/tests/regression_tests_data/test_plugin.py diff --git a/tests/simulator_tests/test_sim_rts_mod.py b/prescient/simulator/tests/test_simulator.py similarity index 83% rename from tests/simulator_tests/test_sim_rts_mod.py rename to prescient/simulator/tests/test_simulator.py index 758e960b..07d6874f 100644 --- a/tests/simulator_tests/test_sim_rts_mod.py +++ b/prescient/simulator/tests/test_simulator.py @@ -14,28 +14,24 @@ import pandas as pd import numpy as np -from prescient.downloaders import rts_gmlc from prescient.scripts import runner -from tests.simulator_tests import simulator_diff - from prescient.simulator import Prescient this_file_path = os.path.dirname(os.path.realpath(__file__)) -class _SimulatorModRTSGMLC: +class SimulatorRegressionBase: """Test class for running the simulator.""" # arbitrary comparison threshold COMPARISON_THRESHOLD = .01 def setUp(self): self.this_file_path = this_file_path - self.test_cases_path = os.path.join(self.this_file_path, 'test_cases') self._set_names() self._run_simulator() - test_results_dir = os.path.join(self.test_cases_path, self.results_dir_name) - control_results_dir = os.path.join(self.test_cases_path, self.baseline_dir_name) + test_results_dir = os.path.join(self.test_case_path, self.results_dir_name) + control_results_dir = os.path.join(self.test_case_path, self.baseline_dir_name) output_files = ["bus_detail", "daily_summary", @@ -55,7 +51,7 @@ def setUp(self): def _run_simulator(self): """Runs the simulator for the test data set.""" - os.chdir(self.test_cases_path) + os.chdir(self.test_case_path) simulator_config_filename = self.simulator_config_filename script, options = runner.parse_commands(simulator_config_filename) @@ -129,8 +125,10 @@ def _assert_column_equality(self, filename, column_name): assert diff, f"Column: '{column_name}' of File: '{filename}.csv' diverges." # test runner.py with plugin -class TestSimulatorModRtsGmlcCopperSheet(_SimulatorModRTSGMLC, unittest.TestCase): +class TestSimulatorModRtsGmlcCopperSheet(SimulatorRegressionBase, unittest.TestCase): def _set_names(self): + self.test_case_path = os.path.join(self.this_file_path, 'regression_tests_data') + # in self.test_case_path self.simulator_config_filename = 'simulate_deterministic.txt' self.results_dir_name = 'deterministic_simulation_output' self.baseline_dir_name = 'deterministic_simulation_output_baseline' @@ -155,26 +153,30 @@ def _set_names(self): } # test csv / text file configuration -class TestSimulatorModRtsGmlcCopperSheet_csv_python_config_file(_SimulatorModRTSGMLC, unittest.TestCase): +class TestSimulatorModRtsGmlcCopperSheet_csv_python_config_file(SimulatorRegressionBase, unittest.TestCase): def _set_names(self): + self.test_case_path = os.path.join(self.this_file_path, 'regression_tests_data') + # in self.test_case_path self.simulator_config_filename = 'simulate_deterministic_csv.txt' self.results_dir_name = 'deterministic_simulation_csv_output' self.baseline_dir_name = 'deterministic_simulation_output_baseline' def _run_simulator(self): - os.chdir(self.test_cases_path) + os.chdir(self.test_case_path) options = {'config_file' : self.simulator_config_filename} Prescient().simulate(**options) # test plugin with Python and *.dat files -class TestSimulatorModRtsGmlcNetwork_python(_SimulatorModRTSGMLC, unittest.TestCase): +class TestSimulatorModRtsGmlcNetwork_python(SimulatorRegressionBase, unittest.TestCase): def _set_names(self): + self.test_case_path = os.path.join(self.this_file_path, 'regression_tests_data') + # in self.test_case_path self.results_dir_name = 'deterministic_with_network_simulation_output_python' self.baseline_dir_name = 'deterministic_with_network_simulation_output_baseline' def _run_simulator(self): - os.chdir(self.test_cases_path) + os.chdir(self.test_case_path) options = {**base_options} options['data_path'] = 'deterministic_with_network_scenarios' options['output_directory'] = 'deterministic_with_network_simulation_output_python' @@ -183,14 +185,16 @@ def _run_simulator(self): Prescient().simulate(**options) # test options are correctly re-freshed, Python, and network -class TestSimulatorModRtsGmlcNetwork_python_csv(_SimulatorModRTSGMLC, unittest.TestCase): +class TestSimulatorModRtsGmlcNetwork_python_csv(SimulatorRegressionBase, unittest.TestCase): def _set_names(self): + self.test_case_path = os.path.join(self.this_file_path, 'regression_tests_data') + # in self.test_case_path self.results_dir_name = 'deterministic_with_network_simulation_output_python_csv' self.baseline_dir_name = 'deterministic_with_network_simulation_output_baseline' def _run_simulator(self): - os.chdir(self.test_cases_path) + os.chdir(self.test_case_path) options = {**base_options} options['data_path'] = 'deterministic_with_network_scenarios_csv' options['output_directory'] = 'deterministic_with_network_simulation_output_python_csv' @@ -198,30 +202,33 @@ def _run_simulator(self): Prescient().simulate(**options) # test shortcut / text file configuration -class TestShortcutSimulator_python_config_file(_SimulatorModRTSGMLC, unittest.TestCase): +class TestShortcutSimulator_python_config_file(SimulatorRegressionBase, unittest.TestCase): def _set_names(self): + self.test_case_path = os.path.join(self.this_file_path, 'regression_tests_data') + # in self.test_case_path self.simulator_config_filename = 'simulate_shortcut.txt' self.results_dir_name = 'deterministic_shortcut_output' self.baseline_dir_name = 'deterministic_shortcut_output_baseline' def _run_simulator(self): - os.chdir(self.test_cases_path) + os.chdir(self.test_case_path) options = {'config_file' : self.simulator_config_filename} Prescient().simulate(**options) -class TestCustomDataSource(_SimulatorModRTSGMLC, unittest.TestCase): +class TestCustomDataSource(SimulatorRegressionBase, unittest.TestCase): def _set_names(self): + self.test_case_path = os.path.join(self.this_file_path, 'regression_tests_data') + # in self.test_case_path self.results_dir_name = 'custom_data_provider_output' self.baseline_dir_name = 'deterministic_simulation_output_baseline' def _run_simulator(self): - import custom_data_provider options = {**base_options} options['output_directory'] = 'custom_data_provider_output' - options['data_provider'] = custom_data_provider + options['data_provider'] = os.path.join(self.this_file_path, 'custom_data_provider.py') options['data_path'] = 'custom_data.json' - os.chdir(self.test_cases_path) + os.chdir(self.test_case_path) Prescient().simulate(**options) diff --git a/setup.py b/setup.py index 36d39597..8a750e03 100755 --- a/setup.py +++ b/setup.py @@ -8,9 +8,7 @@ # ___________________________________________________________________________ #!/bin/usr/env python -import glob import sys -import os # We raise an error if trying to install with less than python 3.7 if sys.version_info < (3,7): @@ -36,10 +34,11 @@ 'populator.py = prescient.scripts.populator:main', 'scenario_creator.py = prescient.scripts.scenario_creator:main', 'simulator.py = prescient.scripts.simulator:main', - #'prescient.py = prescient.simulator.prescient:main' ] }, - package_data={'prescient.downloaders.rts_gmlc_prescient':['runners/*.txt','runners/templates/*']}, + package_data={'prescient.downloaders.rts_gmlc_prescient':['runners/*.txt','runners/templates/*'], + 'prescient.simulator.tests':['regression_tests_data/**/*'], + }, install_requires=['numpy','matplotlib','pandas','scipy','pyomo>=6.1.2', 'python-dateutil','networkx','jupyter', 'gridx-egret>=0.5.2.dev0', ],