Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix moped arma #214

Merged
merged 7 commits into from
Sep 30, 2022
Merged

Fix moped arma #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ad571c
Change location of MOPED pk file
dylanjm Sep 29, 2022
c6d085e
Remove extraneous xml and pk files
dylanjm Sep 29, 2022
e5f934a
Modify input files
dylanjm Sep 29, 2022
271e080
ADD NYISO ARMA and regold MOPED
dylanjm Sep 29, 2022
4ab60d2
Remove old workshop ARMA and loosen tolerances
dylanjm Sep 29, 2022
1dd9cf7
Loosen MOPED wind tol to 1e3
dylanjm Sep 29, 2022
3ac54d8
Holy Moly, fix the tol in the right direction
dylanjm Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tests/integration_tests/ARMA/NYISO/Data.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
scaling,YEAR,filename
1,2020,Data_0.csv
1,2022,Data_0.csv
8,761 changes: 8,761 additions & 0 deletions tests/integration_tests/ARMA/NYISO/Data_0.csv
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk
View file
Open in desktop
Binary file not shown.
16 changes: 12 additions & 4 deletions ...workflows/MOPED/ny_default_load_train.xml → ...ntegration_tests/ARMA/train_nyiso_2yr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
<?xml version="1.0" ?>
<Simulation verbosity="debug">
<!-- NOTE: THE DATA FOR THIS INPUT FILE IS NOT INCLUDED IN THIS REPOSITORY!
THIS IS JUST INCLUDED FOR POSTERITY SO IT CAN BE TRACKED UNTIL IT'S MOVED TO FORCE -->
<TestInfo>
<name>NYISO_ARMA_2YR</name>
<author>dylanjm</author>
<created>2022-09-29</created>
<description>
This trains a stochastic ARMA using NYISO data for testing in HERON
</description>
<classesTested>SupervisedLearning.ARMA</classesTested>
</TestInfo>

<RunInfo>
<WorkingDir>Output</WorkingDir>
<WorkingDir>NYISO</WorkingDir>
<Sequence>load, train, meta, serialize, sample</Sequence>
</RunInfo>

<Files>
<Input name="input">Data.csv</Input>
<Input name="pk">arma_202112_nyiso_def.pk</Input>
<Input name="pk">nyiso_arma_2yr.pk</Input>
</Files>

<Steps>
Expand Down
Binary file removed tests/integration_tests/workflows/MOPED/arma_202112_nyiso_def.pk
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/integration_tests/workflows/MOPED/simple/gold/opt_solution.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,ngcc Capacity,import Capacity,Expected NPV
0,23.3074471582,100.0,-11271579481.7
0,23.5995280996,100.0,-11544041668.5
2 changes: 1 addition & 1 deletion tests/integration_tests/workflows/MOPED/simple/moped_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
</Components>

<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD,SOLAR">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD,SOLAR">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>
4 changes: 2 additions & 2 deletions tests/integration_tests/workflows/MOPED/simple/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
zero_threshold = 1e-6
# Loser tolerances due to seeding issue with ROMCollection objects
# see Issue #1351
rel_err = 1e-2
rel_err = 4e-2
[../]
[../]
[]
[]
2 changes: 1 addition & 1 deletion tests/integration_tests/workflows/MOPED/storage_heavy/moped_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
</Components>

<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>
4 changes: 2 additions & 2 deletions tests/integration_tests/workflows/MOPED/storage_heavy/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
zero_threshold = 1e-6
# Loser tolerances due to seeding issue with ROMCollection objects
# see Issue #1351
rel_err = 3e-2
rel_err = 4e-2
[../]
[../]
[]
[]
2 changes: 1 addition & 1 deletion tests/integration_tests/workflows/MOPED/synthetic_cashflows/gold/opt_solution.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,ngcc Capacity,import Capacity,Expected NPV
0,23.3693336702,100.0,-10372177995.7
0,23.3986601096,100.0,-10598036380.1
2 changes: 1 addition & 1 deletion tests/integration_tests/workflows/MOPED/synthetic_cashflows/moped_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
</Components>

<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD,SOLAR">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD,SOLAR">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>
4 changes: 2 additions & 2 deletions tests/integration_tests/workflows/MOPED/synthetic_cashflows/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
zero_threshold = 1e-6
# Loser tolerances due to seeding issue with ROMCollection objects
# see Issue #1351
rel_err = 1e-2
rel_err = 4e-2
[../]
[../]
[]
[]
2 changes: 1 addition & 1 deletion tests/integration_tests/workflows/MOPED/wind/gold/opt_solution.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
,npp Capacity,import Capacity,export Capacity,Expected NPV
0,25.05758,100.0,100.0,4108943330.7
0,31.6006546224,100.0,100.0,2778405071.34
2 changes: 1 addition & 1 deletion tests/integration_tests/workflows/MOPED/wind/moped_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@


<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD,WIND">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD,WIND">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>
4 changes: 2 additions & 2 deletions tests/integration_tests/workflows/MOPED/wind/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
zero_threshold = 1e-6
# Loser tolerances due to seeding issue with ROMCollection objects
# see Issue #1351
rel_err = 3e-2
rel_err = 1e-1
[../]
[../]
[]
[]
Binary file removed tests/workshop/arma_202112_nyiso_def.pk
View file
Open in desktop
Binary file not shown.
128 changes: 0 additions & 128 deletions tests/workshop/ny_default_load_train.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/workshop/simple/heron_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
</Components>

<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>
2 changes: 1 addition & 1 deletion tests/workshop/simple/moped_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</Components>

<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD,SOLAR">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD,SOLAR">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>
2 changes: 1 addition & 1 deletion tests/workshop/wind/heron_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@


<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD,WIND">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD,WIND">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>
2 changes: 1 addition & 1 deletion tests/workshop/wind/moped_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@


<DataGenerators>
<ARMA name='synth' variable="TOTALLOAD,WIND">../arma_202112_nyiso_def.pk</ARMA>
<ARMA name='synth' variable="TOTALLOAD,WIND">%HERON%/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk</ARMA>
</DataGenerators>

</HERON>