Skip to content

Commit

Permalink
regolding some heavy tests
Browse files Browse the repository at this point in the history
  • Loading branch information
GabrielSoto-INL committed Oct 10, 2023
1 parent c41b515 commit d60141f
Show file tree
Hide file tree
Showing 17 changed files with 285 additions and 496 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ tests/integration_tests/mechanics/optimizedDispatch2Hybrid/user_input.txt
tests/integration_tests/mechanics/hybrid_load/heron_input.xml
tests/integration_tests/workflows/HERD/nuclearCase_Sine/temp_initialized_model.json
tests/integration_tests/workflows/HERD/nuclearCase_notebook_match/temp_initialized_model.json
/tests/integration_tests/TSA/Sine/synthetic.*
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
iteration,accepted,steamer_capacity,generator_capacity,electr_market_capacity,electr_flex_capacity,mean_NPV,std_NPV,med_NPV,mean_TotalActivity__steamer__production__steam,mean_TotalActivity__generator__production__steam,mean_TotalActivity__generator__production__electricity,mean_TotalActivity__electr_market__production__electricity,mean_TotalActivity__electr_flex__production__electricity,std_TotalActivity__steamer__production__steam,std_TotalActivity__generator__production__steam,std_TotalActivity__generator__production__electricity,std_TotalActivity__electr_market__production__electricity,std_TotalActivity__electr_flex__production__electricity,med_TotalActivity__steamer__production__steam,med_TotalActivity__generator__production__steam,med_TotalActivity__generator__production__electricity,med_TotalActivity__electr_market__production__electricity,med_TotalActivity__electr_flex__production__electricity
0.0,first,1.45,-100.0,-2.0,-2002.5,22.7414534595,2.71300097151e-09,22.7414534606,8.7,-8.7,4.35,-2.93625,-1.41375,0.0,0.0,0.0,0.0,2.71947991102e-16,8.7,-8.7,4.35,-2.93625,-1.41375
1.0,accepted,3.99558441227,-100.0,-2.0,-2002.5,62.665790811,7.47586628818e-09,62.6657908142,23.9735064,-23.9735064,11.9867532,-8.09105841,-3.89569479,4.35116785763e-15,4.35116785763e-15,2.17558392882e-15,2.17558392882e-15,0.0,23.9735064,-23.9735064,11.9867532,-8.09105841,-3.89569479
2.0,accepted,6.54116882454,-100.0,-2.0,-2002.5,69.0824804038,3.94467727784e-09,69.0824804034,39.2470128,-39.2470128,19.6235064,-8.1,-11.5235064,0.0,0.0,0.0,0.0,0.0,39.2470128,-39.2470128,19.6235064,-8.1,-11.5235064
3.0,accepted,10.0,-100.0,-2.0,-2002.5,77.7220918232,1.21349082789e-08,77.7220918256,60.0,-60.0,30.0,-8.1,-21.9,0.0,0.0,0.0,0.0,0.0,60.0,-60.0,30.0,-8.1,-21.9
4.0,accepted,10.0,-100.0,-2.0,-2002.5,77.7220918232,1.21349082789e-08,77.7220918256,60.0,-60.0,30.0,-8.1,-21.9,0.0,0.0,0.0,0.0,0.0,60.0,-60.0,30.0,-8.1,-21.9
4.0,final,10.0,-100.0,-2.0,-2002.5,77.7220918232,1.21349082789e-08,77.7220918256,60.0,-60.0,30.0,-8.1,-21.9,0.0,0.0,0.0,0.0,0.0,60.0,-60.0,30.0,-8.1,-21.9
iteration,accepted,steamer_capacity,generator_capacity,electr_market_capacity,electr_flex_capacity,mean_NPV,std_NPV,med_NPV,mean_TotalActivity__steamer__production__steam,mean_TotalActivity__generator__production__electricity,mean_TotalActivity__generator__production__steam,mean_TotalActivity__electr_market__production__electricity,mean_TotalActivity__electr_flex__production__electricity,std_TotalActivity__steamer__production__steam,std_TotalActivity__generator__production__electricity,std_TotalActivity__generator__production__steam,std_TotalActivity__electr_market__production__electricity,std_TotalActivity__electr_flex__production__electricity,med_TotalActivity__steamer__production__steam,med_TotalActivity__generator__production__electricity,med_TotalActivity__generator__production__steam,med_TotalActivity__electr_market__production__electricity,med_TotalActivity__electr_flex__production__electricity
0.0,first,1.45,-100.0,-2.0,-2002.5,22.7414534458,0.0,22.7414534458,8.7,4.35,-8.7,-2.93625,-1.41375,0.0,0.0,0.0,0.0,2.71947991102e-16,8.7,4.35,-8.7,-2.93625,-1.41375
1.0,accepted,3.99558441227,-100.0,-2.0,-2002.5,62.6657909657,8.70233571527e-15,62.6657909657,23.9735064736,11.9867532368,-23.9735064736,-8.09105843485,-3.89569480196,0.0,0.0,0.0,0.0,0.0,23.9735064736,11.9867532368,-23.9735064736,-8.09105843485,-3.89569480196
2.0,accepted,6.54116882454,-100.0,-2.0,-2002.5,69.0824803517,1.74046714305e-14,69.0824803517,39.2470129472,19.6235064736,-39.2470129472,-8.1,-11.5235064736,0.0,0.0,0.0,0.0,0.0,39.2470129472,19.6235064736,-39.2470129472,-8.1,-11.5235064736
3.0,accepted,10.0,-100.0,-2.0,-2002.5,77.7220916068,0.0,77.7220916068,60.0,30.0,-60.0,-8.1,-21.9,0.0,0.0,0.0,0.0,0.0,60.0,30.0,-60.0,-8.1,-21.9
4.0,accepted,10.0,-100.0,-2.0,-2002.5,77.7220916068,0.0,77.7220916068,60.0,30.0,-60.0,-8.1,-21.9,0.0,0.0,0.0,0.0,0.0,60.0,30.0,-60.0,-8.1,-21.9
4.0,final,10.0,-100.0,-2.0,-2002.5,77.7220916068,0.0,77.7220916068,60.0,30.0,-60.0,-8.1,-21.9,0.0,0.0,0.0,0.0,0.0,60.0,30.0,-60.0,-8.1,-21.9
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
</Components>

<DataGenerators>
<ARMA name='Price' variable="Signal">%HERON%/tests/integration_tests/ARMA/Sine/arma.pk</ARMA>
<ARMA name='Price' variable="Signal">%HERON%/tests/integration_tests/TSA/Sine/arma.pk</ARMA>
<Function name="transfers">transfers.py</Function>
</DataGenerators>

Expand Down
38 changes: 25 additions & 13 deletions tests/workshop/ies/gold/IES_o/sweep.csv

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/workshop/ies/heron_input.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
</Components>

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

</HERON>
14 changes: 7 additions & 7 deletions tests/workshop/simple/gold/1_simple_o/sweep.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ngcc_capacity,import_capacity,mean_NPV,std_NPV,med_NPV,max_NPV,min_NPV,perc_5_NPV,perc_95_NPV,samp_NPV,var_NPV,mean_TotalActivity__ngcc__production__electricity,mean_TotalActivity__import__production__electricity,mean_TotalActivity__grid__production__electricity,max_TotalActivity__ngcc__production__electricity,min_TotalActivity__ngcc__production__electricity,perc_5_TotalActivity__ngcc__production__electricity,perc_95_TotalActivity__ngcc__production__electricity,samp_TotalActivity__ngcc__production__electricity,var_TotalActivity__ngcc__production__electricity,var_TotalActivity__import__production__electricity,var_TotalActivity__grid__production__electricity,samp_TotalActivity__import__production__electricity,samp_TotalActivity__grid__production__electricity,perc_95_TotalActivity__import__production__electricity,perc_95_TotalActivity__grid__production__electricity,perc_5_TotalActivity__import__production__electricity,perc_5_TotalActivity__grid__production__electricity,min_TotalActivity__import__production__electricity,min_TotalActivity__grid__production__electricity,max_TotalActivity__import__production__electricity,max_TotalActivity__grid__production__electricity,std_TotalActivity__ngcc__production__electricity,std_TotalActivity__import__production__electricity,std_TotalActivity__grid__production__electricity,med_TotalActivity__ngcc__production__electricity,med_TotalActivity__import__production__electricity,med_TotalActivity__grid__production__electricity,prefix,ProbabilityWeight-ngcc_capacity,PointProbability,ProbabilityWeight
10.0,100.0,-1.44665347545e+15,1.00005052215e+13,-1.44871635965e+15,-1.42323817372e+15,-1.46249282764e+15,-1.46117119338e+15,-1.4331598441e+15,20.0,1.00010104686e+26,251791.259783,177369.057491,-429160.317247,251795.030071,251758.767956,251787.904613,251795.030071,20.0,65.7646779145,1944304.90904,1951972.37436,20.0,20.0,179544.783492,-427362.943061,175573.504549,-431339.81292,175077.129935,-432383.86513,180588.835059,-426866.568153,8.10954239859,1394.38334365,1397.13004919,251795.030071,177301.663197,-429096.694032,1,0.1,0.02,0.1
20.0,100.0,-1.46397015828e+14,1.08721899851e+13,-1.44118645538e+14,-1.27044274682e+14,-1.71646510284e+14,-1.6462527577e+14,-1.3476501888e+14,20.0,1.18204515072e+26,412657.784293,17324.2188145,-429982.00305,414101.583036,411327.208397,411501.090028,413788.202899,20.0,667508.741328,4661422.69287,5563440.66935,20.0,20.0,20770.8531701,-426214.649718,14672.6383113,-432764.88007,12997.1470866,-436148.364618,22376.6557802,-425142.776035,817.012081506,2159.03281422,2358.69469609,412570.283511,17023.8162202,-429905.829407,2,0.2,0.02,0.2
30.0,100.0,-2.10328699833e+13,1.15509577103e+12,-2.15395639662e+13,-1.93997654531e+13,-2.31981161983e+13,-2.26340832598e+13,-1.93997775386e+13,20.0,1.33424624026e+24,426881.924993,2323.09303618,-429205.018131,428800.278881,425103.595896,425128.786201,428545.185046,20.0,1437364.05829,97478.5684184,1803640.08957,20.0,20.0,2787.80808477,-427384.519494,1883.89573603,-431214.354783,1639.9606703,-431324.413428,2918.90594852,-427000.330398,1198.90118788,312.215580038,1342.99668263,426767.602681,2274.6278721,-429159.817444,3,0.2,0.02,0.2
40.0,100.0,-44706330999.3,29003122.8399,-44701949044.4,-44662758498.2,-44758007552.3,-44756829939.1,-44663982857.2,20.0,8.41181134467e+14,429151.333819,0.0,-429151.333819,433665.382265,425274.885466,425604.347356,433141.320888,20.0,5325336.86728,0.0,5325336.86728,20.0,20.0,0.0,-425604.347356,0.0,-433141.320888,0.0,-433665.382265,0.0,-425274.885466,2307.66914164,0.0,2307.66914164,428929.144982,0.0,-428929.144982,4,0.2,0.02,0.2
50.0,100.0,-53703682531.0,28656670.1564,-53698075106.7,-53658842150.2,-53779681076.8,-53749381626.3,-53664034510.7,20.0,8.21204744452e+14,429478.047824,0.0,-429478.047824,436070.21935,426796.575095,426935.922766,433058.086099,20.0,5009020.45964,0.0,5009020.45964,20.0,20.0,0.0,-426935.922766,0.0,-433058.086099,0.0,-436070.21935,0.0,-426796.575095,2238.08410468,0.0,2238.08410468,429444.264945,0.0,-429444.264945,5,0.2,0.02,0.2
60.0,100.0,-62704511254.2,22893872.9647,-62704795447.8,-62665023027.1,-62747786172.5,-62742974668.4,-62676349599.0,20.0,5.24129419323e+14,429576.01144,0.0,-429576.01144,432803.034618,425427.693716,425966.391646,431982.922482,20.0,4238266.0754,0.0,4238266.0754,20.0,20.0,0.0,-425966.391646,0.0,-431982.922482,0.0,-432803.034618,0.0,-425427.693716,2058.70495103,0.0,2058.70495103,429703.082913,0.0,-429703.082913,6,0.1,0.02,0.1
ngcc_capacity,import_capacity,mean_NPV,std_NPV,med_NPV,max_NPV,min_NPV,perc_5_NPV,perc_95_NPV,samp_NPV,var_NPV,mean_TotalActivity__ngcc__production__electricity,mean_TotalActivity__import__production__electricity,mean_TotalActivity__grid__production__electricity,max_TotalActivity__ngcc__production__electricity,min_TotalActivity__ngcc__production__electricity,perc_5_TotalActivity__ngcc__production__electricity,perc_95_TotalActivity__ngcc__production__electricity,samp_TotalActivity__ngcc__production__electricity,var_TotalActivity__ngcc__production__electricity,var_TotalActivity__import__production__electricity,var_TotalActivity__grid__production__electricity,samp_TotalActivity__import__production__electricity,samp_TotalActivity__grid__production__electricity,perc_95_TotalActivity__import__production__electricity,perc_95_TotalActivity__grid__production__electricity,perc_5_TotalActivity__import__production__electricity,perc_5_TotalActivity__grid__production__electricity,min_TotalActivity__import__production__electricity,min_TotalActivity__grid__production__electricity,max_TotalActivity__import__production__electricity,max_TotalActivity__grid__production__electricity,std_TotalActivity__ngcc__production__electricity,std_TotalActivity__import__production__electricity,std_TotalActivity__grid__production__electricity,med_TotalActivity__ngcc__production__electricity,med_TotalActivity__import__production__electricity,med_TotalActivity__grid__production__electricity,ProbabilityWeight,PointProbability,ProbabilityWeight-ngcc_capacity,prefix
10.0,100.0,-1.44855373781e+15,1.15040366388e+13,-1.44912216948e+15,-1.42605875922e+15,-1.47230416873e+15,-1.46724336159e+15,-1.42679075679e+15,20.0,1.32342858987e+26,251791.954522,177430.29431,-429222.248832,251795.030093,251789.438145,251789.438145,251795.030093,20.0,8.14662809089,4558330.61679,4558924.21274,20.0,20.0,181309.550785,-427231.569985,175436.819489,-433099.268527,172753.541007,-433699.420813,181904.390719,-424542.979152,2.85422985951,2135.02473447,2135.16374378,251789.438145,177254.700025,-429044.13817,0.1,0.02,0.1,1
20.0,100.0,-1.42898934051e+14,6.53483487929e+12,-1.42064757504e+14,-1.3136709542e+14,-1.59402913877e+14,-1.53182494099e+14,-1.33407031956e+14,20.0,4.27040668995e+25,412476.440419,16884.7630631,-429361.203482,413672.796103,411276.983664,411277.86368,413328.671618,20.0,447323.628452,1456345.66816,1951104.71807,20.0,20.0,18549.5464166,-426927.799483,15295.9876636,-430998.647321,14712.7715439,-431220.301796,19387.0021467,-426922.962735,668.822568737,1206.79147667,1396.81950089,412494.411456,17032.1133202,-429745.134142,0.2,0.02,0.2,2
30.0,100.0,-2.11188426344e+13,2.39268769605e+12,-2.15395554467e+13,-1.75652341565e+13,-2.84854443843e+13,-2.39264771694e+13,-1.75652704763e+13,20.0,5.72495441085e+24,426473.938486,2391.79627189,-428865.734757,429058.529542,423499.064448,423760.405308,428925.424928,20.0,3101339.49054,213044.27329,4337993.41447,20.0,20.0,2903.95080685,-425265.923116,1505.51780862,-431585.426626,1390.45409839,-432165.244256,3246.82483471,-424889.518546,1761.06203483,461.567192605,2082.78501398,426387.208895,2399.38115758,-429011.384799,0.2,0.02,0.2,3
40.0,100.0,-44711869153.1,23587903.8693,-44705247377.0,-44686382849.8,-44781024091.0,-44740816479.4,-44686567889.9,20.0,5.56389208949e+14,429535.052188,0.0,-429535.052188,433789.545311,425805.534818,426195.414643,432458.133761,20.0,3558035.98772,0.0,3558035.98772,20.0,20.0,0.0,-426195.414643,0.0,-432458.133761,0.0,-433789.545311,0.0,-425805.534818,1886.27569239,0.0,1886.27569239,429715.303197,0.0,-429715.303197,0.2,0.02,0.2,4
50.0,100.0,-53708157441.5,22092368.3249,-53701916891.3,-53679172455.7,-53769496487.0,-53743041139.8,-53682699584.4,20.0,4.88072738203e+14,429242.064213,0.0,-429242.064213,433230.812803,425744.197053,426739.236269,432766.231987,20.0,3734578.2902,0.0,3734578.2902,20.0,20.0,0.0,-426739.236269,0.0,-432766.231987,0.0,-433230.812803,0.0,-425744.197053,1932.5057025,0.0,1932.5057025,429551.288871,0.0,-429551.288871,0.2,0.02,0.2,5
60.0,100.0,-62704415644.0,22719029.8371,-62698241306.1,-62682036724.3,-62754622179.9,-62746568578.3,-62684051964.3,20.0,5.16154316738e+14,429479.800521,0.0,-429479.800521,433597.910714,425732.579523,426372.737583,433192.621986,20.0,4597727.77604,0.0,4597727.77604,20.0,20.0,0.0,-426372.737583,0.0,-433192.621986,0.0,-433597.910714,0.0,-425732.579523,2144.23127858,0.0,2144.23127858,429459.059546,0.0,-429459.059546,0.1,0.02,0.1,6
2 changes: 1 addition & 1 deletion tests/workshop/simple/heron_input.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
</Components>

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

</HERON>
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Case name="wind_coarse_opt">
<mode>opt</mode>
<!-- <mode>sweep</mode> -->
<debug/>
<!-- <debug/> -->
<num_arma_samples>20</num_arma_samples>
<time_discretization>
<year_variable>YEAR</year_variable>
Expand Down Expand Up @@ -171,7 +171,7 @@


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

</HERON>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d60141f

Please sign in to comment.