Moving simulator tests so they are distributed as part of Prescient (#…

…139) * moving simulator tests so they are distributed as part of Prescient * creating missing __init__ files * using pytest for less verbosity * specifying path for custom_data_provider * including baselines in package_data
grid-parity-exchange · Mar 1, 2022 · d7d92be · d7d92be
1 parent 4d585d3
commit d7d92be
Show file tree

Hide file tree

Showing 171 changed files with 32 additions and 26 deletions.
diff --git 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
diff --git a/prescient/data/__init__.py b/prescient/data/__init__.py
diff --git a/prescient/data/providers/__init__.py b/prescient/data/providers/__init__.py
diff --git a/prescient/downloaders/__init__.py b/prescient/downloaders/__init__.py
diff --git a/prescient/downloaders/rts_gmlc_prescient/__init__.py b/prescient/downloaders/rts_gmlc_prescient/__init__.py
diff --git a/prescient/engine/__init__.py b/prescient/engine/__init__.py
diff --git a/prescient/reporting/__init__.py b/prescient/reporting/__init__.py
diff --git a/prescient/scripts/__init__.py b/prescient/scripts/__init__.py
diff --git a/prescient/simulator/tests/__init__.py b/prescient/simulator/tests/__init__.py
diff --git a/...s/simulator_tests/custom_data_provider.py → ...t/simulator/tests/custom_data_provider.py b/...s/simulator_tests/custom_data_provider.py → ...t/simulator/tests/custom_data_provider.py
diff --git a/...mulator_tests/test_cases/custom_data.json → ...ts/regression_tests_data/custom_data.json b/...mulator_tests/test_cases/custom_data.json → ...ts/regression_tests_data/custom_data.json
diff --git a/...terministic_scenario_csv/actuals_load.csv → ...terministic_scenario_csv/actuals_load.csv b/...terministic_scenario_csv/actuals_load.csv → ...terministic_scenario_csv/actuals_load.csv
diff --git a/...scenario_csv/actuals_renewables_max_p.csv → ...scenario_csv/actuals_renewables_max_p.csv b/...scenario_csv/actuals_renewables_max_p.csv → ...scenario_csv/actuals_renewables_max_p.csv
diff --git a/...scenario_csv/actuals_renewables_min_p.csv → ...scenario_csv/actuals_renewables_min_p.csv b/...scenario_csv/actuals_renewables_min_p.csv → ...scenario_csv/actuals_renewables_min_p.csv
diff --git a/...ses/deterministic_scenario_csv/branch.csv → ...ata/deterministic_scenario_csv/branch.csv b/...ses/deterministic_scenario_csv/branch.csv → ...ata/deterministic_scenario_csv/branch.csv
diff --git a/..._cases/deterministic_scenario_csv/bus.csv → ...s_data/deterministic_scenario_csv/bus.csv b/..._cases/deterministic_scenario_csv/bus.csv → ...s_data/deterministic_scenario_csv/bus.csv
diff --git a/...rministic_scenario_csv/forecasts_load.csv → ...rministic_scenario_csv/forecasts_load.csv b/...rministic_scenario_csv/forecasts_load.csv → ...rministic_scenario_csv/forecasts_load.csv
diff --git a/...enario_csv/forecasts_renewables_max_p.csv → ...enario_csv/forecasts_renewables_max_p.csv b/...enario_csv/forecasts_renewables_max_p.csv → ...enario_csv/forecasts_renewables_max_p.csv
diff --git a/...enario_csv/forecasts_renewables_min_p.csv → ...enario_csv/forecasts_renewables_min_p.csv b/...enario_csv/forecasts_renewables_min_p.csv → ...enario_csv/forecasts_renewables_min_p.csv
diff --git a/..._cases/deterministic_scenario_csv/gen.csv → ...s_data/deterministic_scenario_csv/gen.csv b/..._cases/deterministic_scenario_csv/gen.csv → ...s_data/deterministic_scenario_csv/gen.csv
diff --git a/...rministic_scenario_csv/initial_status.csv → ...rministic_scenario_csv/initial_status.csv b/...rministic_scenario_csv/initial_status.csv → ...rministic_scenario_csv/initial_status.csv
diff --git a/...s/deterministic_scenario_csv/reserves.csv → ...a/deterministic_scenario_csv/reserves.csv b/...s/deterministic_scenario_csv/reserves.csv → ...a/deterministic_scenario_csv/reserves.csv
diff --git a/...istic_scenario_csv/simulation_objects.csv → ...istic_scenario_csv/simulation_objects.csv b/...istic_scenario_csv/simulation_objects.csv → ...istic_scenario_csv/simulation_objects.csv
diff --git a/...es/deterministic_scenario_csv/storage.csv → ...ta/deterministic_scenario_csv/storage.csv b/...es/deterministic_scenario_csv/storage.csv → ...ta/deterministic_scenario_csv/storage.csv
diff --git a/...stic_scenario_csv/timeseries_pointers.csv → ...stic_scenario_csv/timeseries_pointers.csv b/...stic_scenario_csv/timeseries_pointers.csv → ...stic_scenario_csv/timeseries_pointers.csv
diff --git a/...twostage/2020-07-10/ScenarioStructure.dat → ...twostage/2020-07-10/ScenarioStructure.dat b/...twostage/2020-07-10/ScenarioStructure.dat → ...twostage/2020-07-10/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-10/Scenario_1.dat → ...yspdir_twostage/2020-07-10/Scenario_1.dat b/...yspdir_twostage/2020-07-10/Scenario_1.dat → ...yspdir_twostage/2020-07-10/Scenario_1.dat
diff --git a/..._twostage/2020-07-10/Scenario_actuals.dat → ..._twostage/2020-07-10/Scenario_actuals.dat b/..._twostage/2020-07-10/Scenario_actuals.dat → ..._twostage/2020-07-10/Scenario_actuals.dat
diff --git a/...wostage/2020-07-10/Scenario_forecasts.dat → ...wostage/2020-07-10/Scenario_forecasts.dat b/...wostage/2020-07-10/Scenario_forecasts.dat → ...wostage/2020-07-10/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-10/scenarios.csv → ...pyspdir_twostage/2020-07-10/scenarios.csv b/...pyspdir_twostage/2020-07-10/scenarios.csv → ...pyspdir_twostage/2020-07-10/scenarios.csv
diff --git a/...twostage/2020-07-11/ScenarioStructure.dat → ...twostage/2020-07-11/ScenarioStructure.dat b/...twostage/2020-07-11/ScenarioStructure.dat → ...twostage/2020-07-11/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-11/Scenario_1.dat → ...yspdir_twostage/2020-07-11/Scenario_1.dat b/...yspdir_twostage/2020-07-11/Scenario_1.dat → ...yspdir_twostage/2020-07-11/Scenario_1.dat
diff --git a/..._twostage/2020-07-11/Scenario_actuals.dat → ..._twostage/2020-07-11/Scenario_actuals.dat b/..._twostage/2020-07-11/Scenario_actuals.dat → ..._twostage/2020-07-11/Scenario_actuals.dat
diff --git a/...wostage/2020-07-11/Scenario_forecasts.dat → ...wostage/2020-07-11/Scenario_forecasts.dat b/...wostage/2020-07-11/Scenario_forecasts.dat → ...wostage/2020-07-11/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-11/scenarios.csv → ...pyspdir_twostage/2020-07-11/scenarios.csv b/...pyspdir_twostage/2020-07-11/scenarios.csv → ...pyspdir_twostage/2020-07-11/scenarios.csv
diff --git a/...twostage/2020-07-12/ScenarioStructure.dat → ...twostage/2020-07-12/ScenarioStructure.dat b/...twostage/2020-07-12/ScenarioStructure.dat → ...twostage/2020-07-12/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-12/Scenario_1.dat → ...yspdir_twostage/2020-07-12/Scenario_1.dat b/...yspdir_twostage/2020-07-12/Scenario_1.dat → ...yspdir_twostage/2020-07-12/Scenario_1.dat
diff --git a/..._twostage/2020-07-12/Scenario_actuals.dat → ..._twostage/2020-07-12/Scenario_actuals.dat b/..._twostage/2020-07-12/Scenario_actuals.dat → ..._twostage/2020-07-12/Scenario_actuals.dat
diff --git a/...wostage/2020-07-12/Scenario_forecasts.dat → ...wostage/2020-07-12/Scenario_forecasts.dat b/...wostage/2020-07-12/Scenario_forecasts.dat → ...wostage/2020-07-12/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-12/scenarios.csv → ...pyspdir_twostage/2020-07-12/scenarios.csv b/...pyspdir_twostage/2020-07-12/scenarios.csv → ...pyspdir_twostage/2020-07-12/scenarios.csv
diff --git a/...twostage/2020-07-13/ScenarioStructure.dat → ...twostage/2020-07-13/ScenarioStructure.dat b/...twostage/2020-07-13/ScenarioStructure.dat → ...twostage/2020-07-13/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-13/Scenario_1.dat → ...yspdir_twostage/2020-07-13/Scenario_1.dat b/...yspdir_twostage/2020-07-13/Scenario_1.dat → ...yspdir_twostage/2020-07-13/Scenario_1.dat
diff --git a/..._twostage/2020-07-13/Scenario_actuals.dat → ..._twostage/2020-07-13/Scenario_actuals.dat b/..._twostage/2020-07-13/Scenario_actuals.dat → ..._twostage/2020-07-13/Scenario_actuals.dat
diff --git a/...wostage/2020-07-13/Scenario_forecasts.dat → ...wostage/2020-07-13/Scenario_forecasts.dat b/...wostage/2020-07-13/Scenario_forecasts.dat → ...wostage/2020-07-13/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-13/scenarios.csv → ...pyspdir_twostage/2020-07-13/scenarios.csv b/...pyspdir_twostage/2020-07-13/scenarios.csv → ...pyspdir_twostage/2020-07-13/scenarios.csv
diff --git a/...twostage/2020-07-14/ScenarioStructure.dat → ...twostage/2020-07-14/ScenarioStructure.dat b/...twostage/2020-07-14/ScenarioStructure.dat → ...twostage/2020-07-14/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-14/Scenario_1.dat → ...yspdir_twostage/2020-07-14/Scenario_1.dat b/...yspdir_twostage/2020-07-14/Scenario_1.dat → ...yspdir_twostage/2020-07-14/Scenario_1.dat
diff --git a/..._twostage/2020-07-14/Scenario_actuals.dat → ..._twostage/2020-07-14/Scenario_actuals.dat b/..._twostage/2020-07-14/Scenario_actuals.dat → ..._twostage/2020-07-14/Scenario_actuals.dat
diff --git a/...wostage/2020-07-14/Scenario_forecasts.dat → ...wostage/2020-07-14/Scenario_forecasts.dat b/...wostage/2020-07-14/Scenario_forecasts.dat → ...wostage/2020-07-14/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-14/scenarios.csv → ...pyspdir_twostage/2020-07-14/scenarios.csv b/...pyspdir_twostage/2020-07-14/scenarios.csv → ...pyspdir_twostage/2020-07-14/scenarios.csv
diff --git a/...twostage/2020-07-15/ScenarioStructure.dat → ...twostage/2020-07-15/ScenarioStructure.dat b/...twostage/2020-07-15/ScenarioStructure.dat → ...twostage/2020-07-15/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-15/Scenario_1.dat → ...yspdir_twostage/2020-07-15/Scenario_1.dat b/...yspdir_twostage/2020-07-15/Scenario_1.dat → ...yspdir_twostage/2020-07-15/Scenario_1.dat
diff --git a/..._twostage/2020-07-15/Scenario_actuals.dat → ..._twostage/2020-07-15/Scenario_actuals.dat b/..._twostage/2020-07-15/Scenario_actuals.dat → ..._twostage/2020-07-15/Scenario_actuals.dat
diff --git a/...wostage/2020-07-15/Scenario_forecasts.dat → ...wostage/2020-07-15/Scenario_forecasts.dat b/...wostage/2020-07-15/Scenario_forecasts.dat → ...wostage/2020-07-15/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-15/scenarios.csv → ...pyspdir_twostage/2020-07-15/scenarios.csv b/...pyspdir_twostage/2020-07-15/scenarios.csv → ...pyspdir_twostage/2020-07-15/scenarios.csv
diff --git a/...twostage/2020-07-16/ScenarioStructure.dat → ...twostage/2020-07-16/ScenarioStructure.dat b/...twostage/2020-07-16/ScenarioStructure.dat → ...twostage/2020-07-16/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-16/Scenario_1.dat → ...yspdir_twostage/2020-07-16/Scenario_1.dat b/...yspdir_twostage/2020-07-16/Scenario_1.dat → ...yspdir_twostage/2020-07-16/Scenario_1.dat
diff --git a/..._twostage/2020-07-16/Scenario_actuals.dat → ..._twostage/2020-07-16/Scenario_actuals.dat b/..._twostage/2020-07-16/Scenario_actuals.dat → ..._twostage/2020-07-16/Scenario_actuals.dat
diff --git a/...wostage/2020-07-16/Scenario_forecasts.dat → ...wostage/2020-07-16/Scenario_forecasts.dat b/...wostage/2020-07-16/Scenario_forecasts.dat → ...wostage/2020-07-16/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-16/scenarios.csv → ...pyspdir_twostage/2020-07-16/scenarios.csv b/...pyspdir_twostage/2020-07-16/scenarios.csv → ...pyspdir_twostage/2020-07-16/scenarios.csv
diff --git a/...c_shortcut_output_baseline/bus_detail.csv → ...c_shortcut_output_baseline/bus_detail.csv b/...c_shortcut_output_baseline/bus_detail.csv → ...c_shortcut_output_baseline/bus_detail.csv
diff --git a/...ut_output_baseline/contingency_detail.csv → ...ut_output_baseline/contingency_detail.csv b/...ut_output_baseline/contingency_detail.csv → ...ut_output_baseline/contingency_detail.csv
diff --git a/...hortcut_output_baseline/daily_summary.csv → ...hortcut_output_baseline/daily_summary.csv b/...hortcut_output_baseline/daily_summary.csv → ...hortcut_output_baseline/daily_summary.csv
diff --git a/...ut_output_baseline/hourly_gen_summary.csv → ...ut_output_baseline/hourly_gen_summary.csv b/...ut_output_baseline/hourly_gen_summary.csv → ...ut_output_baseline/hourly_gen_summary.csv
diff --git a/...ortcut_output_baseline/hourly_summary.csv → ...ortcut_output_baseline/hourly_summary.csv b/...ortcut_output_baseline/hourly_summary.csv → ...ortcut_output_baseline/hourly_summary.csv
diff --git a/..._shortcut_output_baseline/line_detail.csv → ..._shortcut_output_baseline/line_detail.csv b/..._shortcut_output_baseline/line_detail.csv → ..._shortcut_output_baseline/line_detail.csv
diff --git a/...ut_baseline/overall_simulation_output.csv → ...ut_baseline/overall_simulation_output.csv b/...ut_baseline/overall_simulation_output.csv → ...ut_baseline/overall_simulation_output.csv
diff --git a/...cut_output_baseline/renewables_detail.csv → ...cut_output_baseline/renewables_detail.csv b/...cut_output_baseline/renewables_detail.csv → ...cut_output_baseline/renewables_detail.csv
diff --git a/...tic_shortcut_output_baseline/runtimes.csv → ...tic_shortcut_output_baseline/runtimes.csv b/...tic_shortcut_output_baseline/runtimes.csv → ...tic_shortcut_output_baseline/runtimes.csv
diff --git a/...ortcut_output_baseline/thermal_detail.csv → ...ortcut_output_baseline/thermal_detail.csv b/...ortcut_output_baseline/thermal_detail.csv → ...ortcut_output_baseline/thermal_detail.csv
diff --git a/...ortcut_output_baseline/virtual_detail.csv → ...ortcut_output_baseline/virtual_detail.csv b/...ortcut_output_baseline/virtual_detail.csv → ...ortcut_output_baseline/virtual_detail.csv
diff --git a/...simulation_output_baseline/bus_detail.csv → ...simulation_output_baseline/bus_detail.csv b/...simulation_output_baseline/bus_detail.csv → ...simulation_output_baseline/bus_detail.csv
diff --git a/...on_output_baseline/contingency_detail.csv → ...on_output_baseline/contingency_detail.csv b/...on_output_baseline/contingency_detail.csv → ...on_output_baseline/contingency_detail.csv
diff --git a/...ulation_output_baseline/daily_summary.csv → ...ulation_output_baseline/daily_summary.csv b/...ulation_output_baseline/daily_summary.csv → ...ulation_output_baseline/daily_summary.csv
diff --git a/...on_output_baseline/hourly_gen_summary.csv → ...on_output_baseline/hourly_gen_summary.csv b/...on_output_baseline/hourly_gen_summary.csv → ...on_output_baseline/hourly_gen_summary.csv
diff --git a/...lation_output_baseline/hourly_summary.csv → ...lation_output_baseline/hourly_summary.csv b/...lation_output_baseline/hourly_summary.csv → ...lation_output_baseline/hourly_summary.csv
diff --git a/...imulation_output_baseline/line_detail.csv → ...imulation_output_baseline/line_detail.csv b/...imulation_output_baseline/line_detail.csv → ...imulation_output_baseline/line_detail.csv
diff --git a/...ut_baseline/overall_simulation_output.csv → ...ut_baseline/overall_simulation_output.csv b/...ut_baseline/overall_simulation_output.csv → ...ut_baseline/overall_simulation_output.csv
diff --git a/...ion_output_baseline/plots/daily_costs.png → ...ion_output_baseline/plots/daily_costs.png b/...ion_output_baseline/plots/daily_costs.png → ...ion_output_baseline/plots/daily_costs.png
diff --git a/..._baseline/plots/stackgraph_2020-07-10.png → ..._baseline/plots/stackgraph_2020-07-10.png b/..._baseline/plots/stackgraph_2020-07-10.png → ..._baseline/plots/stackgraph_2020-07-10.png
diff --git a/..._baseline/plots/stackgraph_2020-07-11.png → ..._baseline/plots/stackgraph_2020-07-11.png b/..._baseline/plots/stackgraph_2020-07-11.png → ..._baseline/plots/stackgraph_2020-07-11.png
diff --git a/..._baseline/plots/stackgraph_2020-07-12.png → ..._baseline/plots/stackgraph_2020-07-12.png b/..._baseline/plots/stackgraph_2020-07-12.png → ..._baseline/plots/stackgraph_2020-07-12.png
diff --git a/..._baseline/plots/stackgraph_2020-07-13.png → ..._baseline/plots/stackgraph_2020-07-13.png b/..._baseline/plots/stackgraph_2020-07-13.png → ..._baseline/plots/stackgraph_2020-07-13.png
diff --git a/..._baseline/plots/stackgraph_2020-07-14.png → ..._baseline/plots/stackgraph_2020-07-14.png b/..._baseline/plots/stackgraph_2020-07-14.png → ..._baseline/plots/stackgraph_2020-07-14.png
diff --git a/..._baseline/plots/stackgraph_2020-07-15.png → ..._baseline/plots/stackgraph_2020-07-15.png b/..._baseline/plots/stackgraph_2020-07-15.png → ..._baseline/plots/stackgraph_2020-07-15.png
diff --git a/..._baseline/plots/stackgraph_2020-07-16.png → ..._baseline/plots/stackgraph_2020-07-16.png b/..._baseline/plots/stackgraph_2020-07-16.png → ..._baseline/plots/stackgraph_2020-07-16.png
diff --git a/...ion_output_baseline/renewables_detail.csv → ...ion_output_baseline/renewables_detail.csv b/...ion_output_baseline/renewables_detail.csv → ...ion_output_baseline/renewables_detail.csv
diff --git a/...c_simulation_output_baseline/runtimes.csv → ...c_simulation_output_baseline/runtimes.csv b/...c_simulation_output_baseline/runtimes.csv → ...c_simulation_output_baseline/runtimes.csv
diff --git a/...lation_output_baseline/thermal_detail.csv → ...lation_output_baseline/thermal_detail.csv b/...lation_output_baseline/thermal_detail.csv → ...lation_output_baseline/thermal_detail.csv
diff --git a/...lation_output_baseline/virtual_detail.csv → ...lation_output_baseline/virtual_detail.csv b/...lation_output_baseline/virtual_detail.csv → ...lation_output_baseline/virtual_detail.csv
diff --git a/...twostage/2020-07-10/ScenarioStructure.dat → ...twostage/2020-07-10/ScenarioStructure.dat b/...twostage/2020-07-10/ScenarioStructure.dat → ...twostage/2020-07-10/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-10/Scenario_1.dat → ...yspdir_twostage/2020-07-10/Scenario_1.dat b/...yspdir_twostage/2020-07-10/Scenario_1.dat → ...yspdir_twostage/2020-07-10/Scenario_1.dat
diff --git a/..._twostage/2020-07-10/Scenario_actuals.dat → ..._twostage/2020-07-10/Scenario_actuals.dat b/..._twostage/2020-07-10/Scenario_actuals.dat → ..._twostage/2020-07-10/Scenario_actuals.dat
diff --git a/...wostage/2020-07-10/Scenario_forecasts.dat → ...wostage/2020-07-10/Scenario_forecasts.dat b/...wostage/2020-07-10/Scenario_forecasts.dat → ...wostage/2020-07-10/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-10/scenarios.csv → ...pyspdir_twostage/2020-07-10/scenarios.csv b/...pyspdir_twostage/2020-07-10/scenarios.csv → ...pyspdir_twostage/2020-07-10/scenarios.csv
diff --git a/...twostage/2020-07-11/ScenarioStructure.dat → ...twostage/2020-07-11/ScenarioStructure.dat b/...twostage/2020-07-11/ScenarioStructure.dat → ...twostage/2020-07-11/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-11/Scenario_1.dat → ...yspdir_twostage/2020-07-11/Scenario_1.dat b/...yspdir_twostage/2020-07-11/Scenario_1.dat → ...yspdir_twostage/2020-07-11/Scenario_1.dat
diff --git a/..._twostage/2020-07-11/Scenario_actuals.dat → ..._twostage/2020-07-11/Scenario_actuals.dat b/..._twostage/2020-07-11/Scenario_actuals.dat → ..._twostage/2020-07-11/Scenario_actuals.dat
diff --git a/...wostage/2020-07-11/Scenario_forecasts.dat → ...wostage/2020-07-11/Scenario_forecasts.dat b/...wostage/2020-07-11/Scenario_forecasts.dat → ...wostage/2020-07-11/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-11/scenarios.csv → ...pyspdir_twostage/2020-07-11/scenarios.csv b/...pyspdir_twostage/2020-07-11/scenarios.csv → ...pyspdir_twostage/2020-07-11/scenarios.csv
diff --git a/...twostage/2020-07-12/ScenarioStructure.dat → ...twostage/2020-07-12/ScenarioStructure.dat b/...twostage/2020-07-12/ScenarioStructure.dat → ...twostage/2020-07-12/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-12/Scenario_1.dat → ...yspdir_twostage/2020-07-12/Scenario_1.dat b/...yspdir_twostage/2020-07-12/Scenario_1.dat → ...yspdir_twostage/2020-07-12/Scenario_1.dat
diff --git a/..._twostage/2020-07-12/Scenario_actuals.dat → ..._twostage/2020-07-12/Scenario_actuals.dat b/..._twostage/2020-07-12/Scenario_actuals.dat → ..._twostage/2020-07-12/Scenario_actuals.dat
diff --git a/...wostage/2020-07-12/Scenario_forecasts.dat → ...wostage/2020-07-12/Scenario_forecasts.dat b/...wostage/2020-07-12/Scenario_forecasts.dat → ...wostage/2020-07-12/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-12/scenarios.csv → ...pyspdir_twostage/2020-07-12/scenarios.csv b/...pyspdir_twostage/2020-07-12/scenarios.csv → ...pyspdir_twostage/2020-07-12/scenarios.csv
diff --git a/...twostage/2020-07-13/ScenarioStructure.dat → ...twostage/2020-07-13/ScenarioStructure.dat b/...twostage/2020-07-13/ScenarioStructure.dat → ...twostage/2020-07-13/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-13/Scenario_1.dat → ...yspdir_twostage/2020-07-13/Scenario_1.dat b/...yspdir_twostage/2020-07-13/Scenario_1.dat → ...yspdir_twostage/2020-07-13/Scenario_1.dat
diff --git a/..._twostage/2020-07-13/Scenario_actuals.dat → ..._twostage/2020-07-13/Scenario_actuals.dat b/..._twostage/2020-07-13/Scenario_actuals.dat → ..._twostage/2020-07-13/Scenario_actuals.dat
diff --git a/...wostage/2020-07-13/Scenario_forecasts.dat → ...wostage/2020-07-13/Scenario_forecasts.dat b/...wostage/2020-07-13/Scenario_forecasts.dat → ...wostage/2020-07-13/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-13/scenarios.csv → ...pyspdir_twostage/2020-07-13/scenarios.csv b/...pyspdir_twostage/2020-07-13/scenarios.csv → ...pyspdir_twostage/2020-07-13/scenarios.csv
diff --git a/...twostage/2020-07-14/ScenarioStructure.dat → ...twostage/2020-07-14/ScenarioStructure.dat b/...twostage/2020-07-14/ScenarioStructure.dat → ...twostage/2020-07-14/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-14/Scenario_1.dat → ...yspdir_twostage/2020-07-14/Scenario_1.dat b/...yspdir_twostage/2020-07-14/Scenario_1.dat → ...yspdir_twostage/2020-07-14/Scenario_1.dat
diff --git a/..._twostage/2020-07-14/Scenario_actuals.dat → ..._twostage/2020-07-14/Scenario_actuals.dat b/..._twostage/2020-07-14/Scenario_actuals.dat → ..._twostage/2020-07-14/Scenario_actuals.dat
diff --git a/...wostage/2020-07-14/Scenario_forecasts.dat → ...wostage/2020-07-14/Scenario_forecasts.dat b/...wostage/2020-07-14/Scenario_forecasts.dat → ...wostage/2020-07-14/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-14/scenarios.csv → ...pyspdir_twostage/2020-07-14/scenarios.csv b/...pyspdir_twostage/2020-07-14/scenarios.csv → ...pyspdir_twostage/2020-07-14/scenarios.csv
diff --git a/...twostage/2020-07-15/ScenarioStructure.dat → ...twostage/2020-07-15/ScenarioStructure.dat b/...twostage/2020-07-15/ScenarioStructure.dat → ...twostage/2020-07-15/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-15/Scenario_1.dat → ...yspdir_twostage/2020-07-15/Scenario_1.dat b/...yspdir_twostage/2020-07-15/Scenario_1.dat → ...yspdir_twostage/2020-07-15/Scenario_1.dat
diff --git a/..._twostage/2020-07-15/Scenario_actuals.dat → ..._twostage/2020-07-15/Scenario_actuals.dat b/..._twostage/2020-07-15/Scenario_actuals.dat → ..._twostage/2020-07-15/Scenario_actuals.dat
diff --git a/...wostage/2020-07-15/Scenario_forecasts.dat → ...wostage/2020-07-15/Scenario_forecasts.dat b/...wostage/2020-07-15/Scenario_forecasts.dat → ...wostage/2020-07-15/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-15/scenarios.csv → ...pyspdir_twostage/2020-07-15/scenarios.csv b/...pyspdir_twostage/2020-07-15/scenarios.csv → ...pyspdir_twostage/2020-07-15/scenarios.csv
diff --git a/...twostage/2020-07-16/ScenarioStructure.dat → ...twostage/2020-07-16/ScenarioStructure.dat b/...twostage/2020-07-16/ScenarioStructure.dat → ...twostage/2020-07-16/ScenarioStructure.dat
diff --git a/...yspdir_twostage/2020-07-16/Scenario_1.dat → ...yspdir_twostage/2020-07-16/Scenario_1.dat b/...yspdir_twostage/2020-07-16/Scenario_1.dat → ...yspdir_twostage/2020-07-16/Scenario_1.dat
diff --git a/..._twostage/2020-07-16/Scenario_actuals.dat → ..._twostage/2020-07-16/Scenario_actuals.dat b/..._twostage/2020-07-16/Scenario_actuals.dat → ..._twostage/2020-07-16/Scenario_actuals.dat
diff --git a/...wostage/2020-07-16/Scenario_forecasts.dat → ...wostage/2020-07-16/Scenario_forecasts.dat b/...wostage/2020-07-16/Scenario_forecasts.dat → ...wostage/2020-07-16/Scenario_forecasts.dat
diff --git a/...pyspdir_twostage/2020-07-16/scenarios.csv → ...pyspdir_twostage/2020-07-16/scenarios.csv b/...pyspdir_twostage/2020-07-16/scenarios.csv → ...pyspdir_twostage/2020-07-16/scenarios.csv
diff --git a/...th_network_scenarios_csv/actuals_load.csv → ...th_network_scenarios_csv/actuals_load.csv b/...th_network_scenarios_csv/actuals_load.csv → ...th_network_scenarios_csv/actuals_load.csv
diff --git a/...cenarios_csv/actuals_renewables_max_p.csv → ...cenarios_csv/actuals_renewables_max_p.csv b/...cenarios_csv/actuals_renewables_max_p.csv → ...cenarios_csv/actuals_renewables_max_p.csv
diff --git a/...cenarios_csv/actuals_renewables_min_p.csv → ...cenarios_csv/actuals_renewables_min_p.csv b/...cenarios_csv/actuals_renewables_min_p.csv → ...cenarios_csv/actuals_renewables_min_p.csv
diff --git a/...tic_with_network_scenarios_csv/branch.csv → ...tic_with_network_scenarios_csv/branch.csv b/...tic_with_network_scenarios_csv/branch.csv → ...tic_with_network_scenarios_csv/branch.csv
diff --git a/...nistic_with_network_scenarios_csv/bus.csv → ...nistic_with_network_scenarios_csv/bus.csv b/...nistic_with_network_scenarios_csv/bus.csv → ...nistic_with_network_scenarios_csv/bus.csv
diff --git a/..._network_scenarios_csv/forecasts_load.csv → ..._network_scenarios_csv/forecasts_load.csv b/..._network_scenarios_csv/forecasts_load.csv → ..._network_scenarios_csv/forecasts_load.csv
diff --git a/...narios_csv/forecasts_renewables_max_p.csv → ...narios_csv/forecasts_renewables_max_p.csv b/...narios_csv/forecasts_renewables_max_p.csv → ...narios_csv/forecasts_renewables_max_p.csv
diff --git a/...narios_csv/forecasts_renewables_min_p.csv → ...narios_csv/forecasts_renewables_min_p.csv b/...narios_csv/forecasts_renewables_min_p.csv → ...narios_csv/forecasts_renewables_min_p.csv
diff --git a/...nistic_with_network_scenarios_csv/gen.csv → ...nistic_with_network_scenarios_csv/gen.csv b/...nistic_with_network_scenarios_csv/gen.csv → ...nistic_with_network_scenarios_csv/gen.csv
diff --git a/..._network_scenarios_csv/initial_status.csv → ..._network_scenarios_csv/initial_status.csv b/..._network_scenarios_csv/initial_status.csv → ..._network_scenarios_csv/initial_status.csv
diff --git a/...c_with_network_scenarios_csv/reserves.csv → ...c_with_network_scenarios_csv/reserves.csv b/...c_with_network_scenarios_csv/reserves.csv → ...c_with_network_scenarios_csv/reserves.csv
diff --git a/...work_scenarios_csv/simulation_objects.csv → ...work_scenarios_csv/simulation_objects.csv b/...work_scenarios_csv/simulation_objects.csv → ...work_scenarios_csv/simulation_objects.csv
diff --git a/...ic_with_network_scenarios_csv/storage.csv → ...ic_with_network_scenarios_csv/storage.csv b/...ic_with_network_scenarios_csv/storage.csv → ...ic_with_network_scenarios_csv/storage.csv
diff --git a/...ork_scenarios_csv/timeseries_pointers.csv → ...ork_scenarios_csv/timeseries_pointers.csv b/...ork_scenarios_csv/timeseries_pointers.csv → ...ork_scenarios_csv/timeseries_pointers.csv
diff --git a/...simulation_output_baseline/bus_detail.csv → ...simulation_output_baseline/bus_detail.csv b/...simulation_output_baseline/bus_detail.csv → ...simulation_output_baseline/bus_detail.csv
diff --git a/...on_output_baseline/contingency_detail.csv → ...on_output_baseline/contingency_detail.csv b/...on_output_baseline/contingency_detail.csv → ...on_output_baseline/contingency_detail.csv
diff --git a/...ulation_output_baseline/daily_summary.csv → ...ulation_output_baseline/daily_summary.csv b/...ulation_output_baseline/daily_summary.csv → ...ulation_output_baseline/daily_summary.csv
diff --git a/...on_output_baseline/hourly_gen_summary.csv → ...on_output_baseline/hourly_gen_summary.csv b/...on_output_baseline/hourly_gen_summary.csv → ...on_output_baseline/hourly_gen_summary.csv
diff --git a/...lation_output_baseline/hourly_summary.csv → ...lation_output_baseline/hourly_summary.csv b/...lation_output_baseline/hourly_summary.csv → ...lation_output_baseline/hourly_summary.csv
diff --git a/...imulation_output_baseline/line_detail.csv → ...imulation_output_baseline/line_detail.csv b/...imulation_output_baseline/line_detail.csv → ...imulation_output_baseline/line_detail.csv
diff --git a/...ut_baseline/overall_simulation_output.csv → ...ut_baseline/overall_simulation_output.csv b/...ut_baseline/overall_simulation_output.csv → ...ut_baseline/overall_simulation_output.csv
diff --git a/...ion_output_baseline/plots/daily_costs.png → ...ion_output_baseline/plots/daily_costs.png b/...ion_output_baseline/plots/daily_costs.png → ...ion_output_baseline/plots/daily_costs.png
diff --git a/..._baseline/plots/stackgraph_2020-07-10.png → ..._baseline/plots/stackgraph_2020-07-10.png b/..._baseline/plots/stackgraph_2020-07-10.png → ..._baseline/plots/stackgraph_2020-07-10.png
diff --git a/..._baseline/plots/stackgraph_2020-07-11.png → ..._baseline/plots/stackgraph_2020-07-11.png b/..._baseline/plots/stackgraph_2020-07-11.png → ..._baseline/plots/stackgraph_2020-07-11.png
diff --git a/..._baseline/plots/stackgraph_2020-07-12.png → ..._baseline/plots/stackgraph_2020-07-12.png b/..._baseline/plots/stackgraph_2020-07-12.png → ..._baseline/plots/stackgraph_2020-07-12.png
diff --git a/..._baseline/plots/stackgraph_2020-07-13.png → ..._baseline/plots/stackgraph_2020-07-13.png b/..._baseline/plots/stackgraph_2020-07-13.png → ..._baseline/plots/stackgraph_2020-07-13.png
diff --git a/..._baseline/plots/stackgraph_2020-07-14.png → ..._baseline/plots/stackgraph_2020-07-14.png b/..._baseline/plots/stackgraph_2020-07-14.png → ..._baseline/plots/stackgraph_2020-07-14.png
diff --git a/..._baseline/plots/stackgraph_2020-07-15.png → ..._baseline/plots/stackgraph_2020-07-15.png b/..._baseline/plots/stackgraph_2020-07-15.png → ..._baseline/plots/stackgraph_2020-07-15.png
diff --git a/..._baseline/plots/stackgraph_2020-07-16.png → ..._baseline/plots/stackgraph_2020-07-16.png b/..._baseline/plots/stackgraph_2020-07-16.png → ..._baseline/plots/stackgraph_2020-07-16.png
diff --git a/...ion_output_baseline/renewables_detail.csv → ...ion_output_baseline/renewables_detail.csv b/...ion_output_baseline/renewables_detail.csv → ...ion_output_baseline/renewables_detail.csv
diff --git a/...k_simulation_output_baseline/runtimes.csv → ...k_simulation_output_baseline/runtimes.csv b/...k_simulation_output_baseline/runtimes.csv → ...k_simulation_output_baseline/runtimes.csv
diff --git a/...lation_output_baseline/thermal_detail.csv → ...lation_output_baseline/thermal_detail.csv b/...lation_output_baseline/thermal_detail.csv → ...lation_output_baseline/thermal_detail.csv
diff --git a/...lation_output_baseline/virtual_detail.csv → ...lation_output_baseline/virtual_detail.csv b/...lation_output_baseline/virtual_detail.csv → ...lation_output_baseline/virtual_detail.csv
diff --git a/...es/shortcut_scenario/day_ahead_prices.csv → ...ta/shortcut_scenario/day_ahead_prices.csv b/...es/shortcut_scenario/day_ahead_prices.csv → ...ta/shortcut_scenario/day_ahead_prices.csv
diff --git a/...ests/test_cases/shortcut_scenario/gen.csv → ...sion_tests_data/shortcut_scenario/gen.csv b/...ests/test_cases/shortcut_scenario/gen.csv → ...sion_tests_data/shortcut_scenario/gen.csv
diff --git a/...es/shortcut_scenario/real_time_prices.csv → ...ta/shortcut_scenario/real_time_prices.csv b/...es/shortcut_scenario/real_time_prices.csv → ...ta/shortcut_scenario/real_time_prices.csv
diff --git a/...cases/shortcut_scenario/shortcut_gens.csv → ..._data/shortcut_scenario/shortcut_gens.csv b/...cases/shortcut_scenario/shortcut_gens.csv → ..._data/shortcut_scenario/shortcut_gens.csv
diff --git a/...sts/test_cases/simulate_deterministic.txt → ...ion_tests_data/simulate_deterministic.txt b/...sts/test_cases/simulate_deterministic.txt → ...ion_tests_data/simulate_deterministic.txt
diff --git a/...test_cases/simulate_deterministic_csv.txt → ...tests_data/simulate_deterministic_csv.txt b/...test_cases/simulate_deterministic_csv.txt → ...tests_data/simulate_deterministic_csv.txt
diff --git a/...or_tests/test_cases/simulate_shortcut.txt → ...gression_tests_data/simulate_shortcut.txt b/...or_tests/test_cases/simulate_shortcut.txt → ...gression_tests_data/simulate_shortcut.txt
diff --git a/...s/simulate_with_network_deterministic.txt → ...a/simulate_with_network_deterministic.txt b/...s/simulate_with_network_deterministic.txt → ...a/simulate_with_network_deterministic.txt
diff --git a/...mulate_with_network_deterministic_csv.txt → ...mulate_with_network_deterministic_csv.txt b/...mulate_with_network_deterministic_csv.txt → ...mulate_with_network_deterministic_csv.txt
diff --git a/...simulator_tests/test_cases/test_plugin.py → ...ests/regression_tests_data/test_plugin.py b/...simulator_tests/test_cases/test_plugin.py → ...ests/regression_tests_data/test_plugin.py
diff --git a/tests/simulator_tests/test_sim_rts_mod.py → prescient/simulator/tests/test_simulator.py b/tests/simulator_tests/test_sim_rts_mod.py → 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,45 +185,50 @@ 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'
         options['input_format'] = 'rts-gmlc'
         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
@@ -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',
                        ],