Moving tests/integration_tests/{ROM/linear_rom.pk,TSA/Sine_Hour/arma.…

…pk} to data
joshua-cogliati-inl · Apr 1, 2024 · b34f009 · b34f009
1 parent eaa92f1
commit b34f009
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/tests/integration_tests/ROM/linear_rom.pk → data/ROM/linear_rom.pk b/tests/integration_tests/ROM/linear_rom.pk → data/ROM/linear_rom.pk
diff --git a/...s/integration_tests/TSA/Sine_Hour/arma.pk → data/TSA/Sine_Hour/arma.pk b/...s/integration_tests/TSA/Sine_Hour/arma.pk → data/TSA/Sine_Hour/arma.pk
diff --git a/data/orig_locations.txt b/data/orig_locations.txt
@@ -2,3 +2,5 @@ renamed:    tests/integration_tests/TSA/Sine/arma.pk -> data/TSA/Sine/arma.pk
 renamed:    tests/integration_tests/TSA/NYISO/nyiso_arma_2yr.pk -> data/TSA/NYISO/nyiso_arma_2yr.pk
 renamed:    tests/integration_tests/TSA/Sine30yr/arma_30yr.pk -> data/TSA/Sine30yr/arma_30yr.pk
 renamed:    tests/integration_tests/ARMA/Sine/arma.pk -> data/ARMA/Sine/arma.pk
+renamed:    tests/integration_tests/ROM/linear_rom.pk -> data/ROM/linear_rom.pk
+renamed:    tests/integration_tests/TSA/Sine_Hour/arma.pk -> data/TSA/Sine_Hour/arma.pk
diff --git a/tests/integration_tests/mechanics/ROM_source/heron_input.xml b/tests/integration_tests/mechanics/ROM_source/heron_input.xml
@@ -72,7 +72,7 @@
 
   <DataGenerators>
     <ARMA name='placeholder' variable="Signal">%HERON_DATA%/TSA/Sine/arma.pk</ARMA>
-    <ROM name="myROM">%BASE_WORKING_DIR%/../../../ROM/linear_rom.pk</ROM>
+    <ROM name="myROM">%HERON_DATA%/ROM/linear_rom.pk</ROM>
   </DataGenerators>
 
 </HERON>
diff --git a/tests/integration_tests/mechanics/labels/heron_input.xml b/tests/integration_tests/mechanics/labels/heron_input.xml
@@ -104,7 +104,7 @@
   </Components>
 
   <DataGenerators>
-    <ARMA name='Price' variable="Signal">%BASE_WORKING_DIR%/../../../TSA/Sine_Hour/arma.pk</ARMA>
+    <ARMA name='Price' variable="Signal">%HERON_DATA%/TSA/Sine_Hour/arma.pk</ARMA>
     <Function name="transfers">transfers.py</Function>
   </DataGenerators>