Merge branch 'devel' into dispatches-lmp-rom

GabrielSoto-INL · Sep 30, 2022 · 4789c80 · 4789c80
2 parents 56a9895 + 3ed8003
commit 4789c80
Show file tree

Hide file tree

Showing 22 changed files with 8,795 additions and 151 deletions.
diff --git a/tests/integration_tests/ARMA/NYISO/Data.csv b/tests/integration_tests/ARMA/NYISO/Data.csv
@@ -0,0 +1,3 @@
+scaling,YEAR,filename
+1,2020,Data_0.csv
+1,2022,Data_0.csv
diff --git a/tests/integration_tests/ARMA/NYISO/Data_0.csv b/tests/integration_tests/ARMA/NYISO/Data_0.csv
diff --git a/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk b/tests/integration_tests/ARMA/NYISO/nyiso_arma_2yr.pk
diff --git a/...workflows/MOPED/ny_default_load_train.xml → ...ntegration_tests/ARMA/train_nyiso_2yr.xml b/...workflows/MOPED/ny_default_load_train.xml → ...ntegration_tests/ARMA/train_nyiso_2yr.xml
@@ -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>

diff --git a/tests/integration_tests/workflows/MOPED/arma_202112_nyiso_def.pk b/tests/integration_tests/workflows/MOPED/arma_202112_nyiso_def.pk
diff --git a/tests/integration_tests/workflows/MOPED/simple/gold/opt_solution.csv b/tests/integration_tests/workflows/MOPED/simple/gold/opt_solution.csv
@@ -1,2 +1,2 @@
 ,ngcc Capacity,import Capacity,Expected NPV
-0,23.3074471582,100.0,-11271579481.7
+0,23.5995280996,100.0,-11544041668.5
diff --git a/tests/integration_tests/workflows/MOPED/simple/moped_input.xml b/tests/integration_tests/workflows/MOPED/simple/moped_input.xml
@@ -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>
diff --git a/tests/integration_tests/workflows/MOPED/simple/tests b/tests/integration_tests/workflows/MOPED/simple/tests
@@ -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
     [../]
   [../]
-[]
+[]
diff --git a/tests/integration_tests/workflows/MOPED/storage_heavy/moped_input.xml b/tests/integration_tests/workflows/MOPED/storage_heavy/moped_input.xml
@@ -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>
diff --git a/tests/integration_tests/workflows/MOPED/storage_heavy/tests b/tests/integration_tests/workflows/MOPED/storage_heavy/tests
@@ -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
     [../]
   [../]
-[]
+[]
diff --git a/tests/integration_tests/workflows/MOPED/synthetic_cashflows/gold/opt_solution.csv b/tests/integration_tests/workflows/MOPED/synthetic_cashflows/gold/opt_solution.csv
@@ -1,2 +1,2 @@
 ,ngcc Capacity,import Capacity,Expected NPV
-0,23.3693336702,100.0,-10372177995.7
+0,23.3986601096,100.0,-10598036380.1
diff --git a/tests/integration_tests/workflows/MOPED/synthetic_cashflows/moped_input.xml b/tests/integration_tests/workflows/MOPED/synthetic_cashflows/moped_input.xml
@@ -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>
diff --git a/tests/integration_tests/workflows/MOPED/synthetic_cashflows/tests b/tests/integration_tests/workflows/MOPED/synthetic_cashflows/tests
@@ -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
     [../]
   [../]
-[]
+[]
diff --git a/tests/integration_tests/workflows/MOPED/wind/gold/opt_solution.csv b/tests/integration_tests/workflows/MOPED/wind/gold/opt_solution.csv
@@ -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
diff --git a/tests/integration_tests/workflows/MOPED/wind/moped_input.xml b/tests/integration_tests/workflows/MOPED/wind/moped_input.xml
@@ -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>
diff --git a/tests/integration_tests/workflows/MOPED/wind/tests b/tests/integration_tests/workflows/MOPED/wind/tests
@@ -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
     [../]
   [../]
-[]
+[]
diff --git a/tests/workshop/arma_202112_nyiso_def.pk b/tests/workshop/arma_202112_nyiso_def.pk
diff --git a/tests/workshop/ny_default_load_train.xml b/tests/workshop/ny_default_load_train.xml
diff --git a/tests/workshop/simple/heron_input.xml b/tests/workshop/simple/heron_input.xml
@@ -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>
diff --git a/tests/workshop/simple/moped_input.xml b/tests/workshop/simple/moped_input.xml
@@ -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>
diff --git a/tests/workshop/wind/heron_input.xml b/tests/workshop/wind/heron_input.xml
@@ -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>
diff --git a/tests/workshop/wind/moped_input.xml b/tests/workshop/wind/moped_input.xml
@@ -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>