Skip to content

Commit

Permalink
git the sampling error
Browse files Browse the repository at this point in the history
  • Loading branch information
@BotrosHanna-INL
BotrosHanna-INL committed May 6, 2024
1 parent 526e6f9 commit b1aea99
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 117 deletions.
6 changes: 3 additions & 3 deletions tests/integration_tests/Aspen_HERON_FullTest/gold/Runs_o/sweep.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_capacity,sink_capacity,mean_NPV,std_NPV,med_NPV,max_NPV,min_NPV,perc_5_NPV,perc_95_NPV,samp_NPV,var_NPV,mean_TotalActivity__source__production__a,mean_TotalActivity__sink__production__a,std_TotalActivity__source__production__a,max_TotalActivity__source__production__a,min_TotalActivity__source__production__a,perc_5_TotalActivity__source__production__a,perc_95_TotalActivity__source__production__a,samp_TotalActivity__source__production__a,var_TotalActivity__source__production__a,var_TotalActivity__sink__production__a,samp_TotalActivity__sink__production__a,perc_95_TotalActivity__sink__production__a,perc_5_TotalActivity__sink__production__a,min_TotalActivity__sink__production__a,max_TotalActivity__sink__production__a,std_TotalActivity__sink__production__a,med_TotalActivity__source__production__a,med_TotalActivity__sink__production__a,ProbabilityWeight,ProbabilityWeight-source_capacity,prefix,PointProbability
1.0,-2.0,-1027240.07054,1.42579068359e-10,-1027240.07054,-1027240.07054,-1027240.07054,-1027240.07054,-1027240.07054,3.0,2.03287907341e-20,40.0,-40.0,0.0,40.0,40.0,40.0,40.0,3.0,0.0,0.0,3.0,-40.0,-40.0,-40.0,-40.0,0.0,40.0,-40.0,0.5,0.5,1,1.0
2.0,-2.0,-1450800.44634,0.0,-1450800.44634,-1450800.44634,-1450800.44634,-1450800.44634,-1450800.44634,3.0,0.0,80.0,-80.0,0.0,80.0,80.0,80.0,80.0,3.0,0.0,0.0,3.0,-80.0,-80.0,-80.0,-80.0,0.0,80.0,-80.0,0.5,0.5,2,1.0
source_capacity,sink_capacity,mean_NPV,std_NPV,med_NPV,max_NPV,min_NPV,perc_5_NPV,perc_95_NPV,samp_NPV,var_NPV,mean_TotalActivity__source__production__a,mean_TotalActivity__sink__production__a,std_TotalActivity__source__production__a,max_TotalActivity__source__production__a,min_TotalActivity__source__production__a,perc_5_TotalActivity__source__production__a,perc_95_TotalActivity__source__production__a,samp_TotalActivity__source__production__a,var_TotalActivity__source__production__a,var_TotalActivity__sink__production__a,samp_TotalActivity__sink__production__a,perc_95_TotalActivity__sink__production__a,perc_5_TotalActivity__sink__production__a,min_TotalActivity__sink__production__a,max_TotalActivity__sink__production__a,std_TotalActivity__sink__production__a,med_TotalActivity__source__production__a,med_TotalActivity__sink__production__a,ProbabilityWeight-source_capacity,ProbabilityWeight,PointProbability,prefix
1.0,-2.0,-1027240.07276,1.19439600045e-10,-1027240.07276,-1027240.07276,-1027240.07276,-1027240.07276,-1027240.07276,20.0,1.4265818059e-20,40.0,-40.0,0.0,40.0,40.0,40.0,40.0,20.0,0.0,0.0,20.0,-40.0,-40.0,-40.0,-40.0,0.0,40.0,-40.0,0.5,0.5,1.0,1
2.0,-2.0,-1450800.44949,2.38879200091e-10,-1450800.44949,-1450800.44949,-1450800.44949,-1450800.44949,-1450800.44949,20.0,5.70632722361e-20,80.0,-80.0,0.0,80.0,80.0,80.0,80.0,20.0,0.0,0.0,20.0,-80.0,-80.0,-80.0,-80.0,0.0,80.0,-80.0,0.5,0.5,1.0,2
4 changes: 2 additions & 2 deletions tests/integration_tests/Aspen_HERON_FullTest/gold/new_heron_input.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<Case name="Runs">
<mode>sweep</mode>
<num_arma_samples>3</num_arma_samples>
<num_arma_samples>20</num_arma_samples>
<time_discretization>
<time_variable>Time</time_variable>
<end_time>2</end_time>
Expand Down Expand Up @@ -58,7 +58,7 @@
<!--Units : MW-->
</reference_driver>
<reference_price>
<fixed_value>-1428015.4590150523</fixed_value>
<fixed_value>-1428015.4587681948</fixed_value>
<!--Reference Price (USD)-->
</reference_price>
<scaling_factor_x>
Expand Down
222 changes: 111 additions & 111 deletions tests/integration_tests/Aspen_HERON_FullTest/heron_input.xml
View file
Original file line number Diff line number Diff line change
@@ -1,111 +1,111 @@
<HERON>
<TestInfo>
<name>Cashflows</name>
<author>talbpaul</author>
<created>2020-10-16</created>
<description>
Tests various kinds of cashflows
</description>
<classesTested>HERON</classesTested>
</TestInfo>

<Case name="Runs">
<mode>sweep</mode>
<num_arma_samples>5</num_arma_samples>
<time_discretization>
<time_variable>Time</time_variable>
<end_time>2</end_time>
<num_steps>21</num_steps>
</time_discretization>
<economics>
<ProjectTime>20</ProjectTime>
<DiscountRate>0.08</DiscountRate>
<tax>0.25</tax>
<inflation>0.00</inflation>
<verbosity>50</verbosity>
</economics>
<dispatcher>
<pyomo/>
</dispatcher>
</Case>

<Components>
<Component name="source">
<produces resource="a" dispatch="fixed">
<capacity resource="a">
<sweep_values>1, 2</sweep_values>
</capacity>
</produces>
<economics>
<lifetime>30</lifetime>
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
<driver>
<Function method="capacity">functions</Function>
</driver>
<reference_price>
<fixed_value>10000.0</fixed_value>
<multiplier>-1</multiplier>
</reference_price>
<reference_driver>
<fixed_value>10.0</fixed_value>
</reference_driver>
<scaling_factor_x>
<fixed_value>0.999</fixed_value>
</scaling_factor_x>
<!-- <depreciate>5</depreciate> -->
</CashFlow>
<CashFlow name="FOM" type="repeating" period='year' taxable="False" inflation="none" mult_target="False">
<driver>
<Function method="capacity">functions</Function>
</driver>
<reference_price>
<fixed_value>100.0</fixed_value>
<multiplier>-1</multiplier>
</reference_price>
<reference_driver>
<fixed_value>10.0</fixed_value>
</reference_driver>
<scaling_factor_x>
<fixed_value>0.999</fixed_value>
</scaling_factor_x>
</CashFlow>
<CashFlow name="VOM" type="repeating" taxable="True" inflation="none" mult_target="False">
<driver>
<activity>a</activity>
</driver>
<reference_price>
<fixed_value>-1</fixed_value>
</reference_price>
</CashFlow>
</economics>
</Component>

<Component name="sink">
<demands resource="a" dispatch="independent">
<capacity>
<fixed_value>-2</fixed_value>
</capacity>
</demands>
<economics>
<lifetime>30</lifetime>
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
<driver>
<activity>a</activity>
</driver>
<reference_price>
<fixed_value>10.0</fixed_value>
<multiplier>-3.14</multiplier>
</reference_price>
</CashFlow>
</economics>
</Component>
</Components>

<DataGenerators>
<ARMA name='flex' variable="Signal">arma_30yr.pk</ARMA>
<Function name="functions">functions.py</Function>
</DataGenerators>
</HERON>



<HERON>
<TestInfo>
<name>Cashflows</name>
<author>talbpaul</author>
<created>2020-10-16</created>
<description>
Tests various kinds of cashflows
</description>
<classesTested>HERON</classesTested>
</TestInfo>

<Case name="Runs">
<mode>sweep</mode>
<num_arma_samples>20</num_arma_samples>
<time_discretization>
<time_variable>Time</time_variable>
<end_time>2</end_time>
<num_steps>21</num_steps>
</time_discretization>
<economics>
<ProjectTime>20</ProjectTime>
<DiscountRate>0.08</DiscountRate>
<tax>0.25</tax>
<inflation>0.00</inflation>
<verbosity>50</verbosity>
</economics>
<dispatcher>
<pyomo/>
</dispatcher>
</Case>

<Components>
<Component name="source">
<produces resource="a" dispatch="fixed">
<capacity resource="a">
<sweep_values>1, 2</sweep_values>
</capacity>
</produces>
<economics>
<lifetime>30</lifetime>
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
<driver>
<Function method="capacity">functions</Function>
</driver>
<reference_price>
<fixed_value>10000.0</fixed_value>
<multiplier>-1</multiplier>
</reference_price>
<reference_driver>
<fixed_value>10.0</fixed_value>
</reference_driver>
<scaling_factor_x>
<fixed_value>0.999</fixed_value>
</scaling_factor_x>
<!-- <depreciate>5</depreciate> -->
</CashFlow>
<CashFlow name="FOM" type="repeating" period='year' taxable="False" inflation="none" mult_target="False">
<driver>
<Function method="capacity">functions</Function>
</driver>
<reference_price>
<fixed_value>100.0</fixed_value>
<multiplier>-1</multiplier>
</reference_price>
<reference_driver>
<fixed_value>10.0</fixed_value>
</reference_driver>
<scaling_factor_x>
<fixed_value>0.999</fixed_value>
</scaling_factor_x>
</CashFlow>
<CashFlow name="VOM" type="repeating" taxable="True" inflation="none" mult_target="False">
<driver>
<activity>a</activity>
</driver>
<reference_price>
<fixed_value>-1</fixed_value>
</reference_price>
</CashFlow>
</economics>
</Component>

<Component name="sink">
<demands resource="a" dispatch="independent">
<capacity>
<fixed_value>-2</fixed_value>
</capacity>
</demands>
<economics>
<lifetime>30</lifetime>
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
<driver>
<activity>a</activity>
</driver>
<reference_price>
<fixed_value>10.0</fixed_value>
<multiplier>-3.14</multiplier>
</reference_price>
</CashFlow>
</economics>
</Component>
</Components>

<DataGenerators>
<ARMA name='flex' variable="Signal">arma_30yr.pk</ARMA>
<Function name="functions">functions.py</Function>
</DataGenerators>
</HERON>



4 changes: 3 additions & 1 deletion tests/integration_tests/Aspen_HERON_FullTest/tests
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
[./run_RAVEN]
type = OrderedCSV
output = 'Runs_o/sweep.csv'
rel_err = 1e-2
rel_err = 0.01
zero_threshold = 1e-9

[../]
[../]
[]

0 comments on commit b1aea99

Please sign in to comment.