Skip to content

Commit b1aea99

Browse files
BotrosHanna-INLBotrosHanna-INL
committed
git the sampling error
1 parent 526e6f9 commit b1aea99

File tree

4 files changed

+119
-117
lines changed

4 files changed

+119
-117
lines changed

‎tests/integration_tests/Aspen_HERON_FullTest/gold/Runs_o/sweep.csv‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
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
2-
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
3-
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
1+
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
2+
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
3+
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

‎tests/integration_tests/Aspen_HERON_FullTest/gold/new_heron_input.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<Case name="Runs">
1616
<mode>sweep</mode>
17-
<num_arma_samples>3</num_arma_samples>
17+
<num_arma_samples>20</num_arma_samples>
1818
<time_discretization>
1919
<time_variable>Time</time_variable>
2020
<end_time>2</end_time>
@@ -58,7 +58,7 @@
5858
<!--Units : MW-->
5959
</reference_driver>
6060
<reference_price>
61-
<fixed_value>-1428015.4590150523</fixed_value>
61+
<fixed_value>-1428015.4587681948</fixed_value>
6262
<!--Reference Price (USD)-->
6363
</reference_price>
6464
<scaling_factor_x>

‎tests/integration_tests/Aspen_HERON_FullTest/heron_input.xml‎

Lines changed: 111 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,111 @@
1-
<HERON>
2-
<TestInfo>
3-
<name>Cashflows</name>
4-
<author>talbpaul</author>
5-
<created>2020-10-16</created>
6-
<description>
7-
Tests various kinds of cashflows
8-
</description>
9-
<classesTested>HERON</classesTested>
10-
</TestInfo>
11-
12-
<Case name="Runs">
13-
<mode>sweep</mode>
14-
<num_arma_samples>5</num_arma_samples>
15-
<time_discretization>
16-
<time_variable>Time</time_variable>
17-
<end_time>2</end_time>
18-
<num_steps>21</num_steps>
19-
</time_discretization>
20-
<economics>
21-
<ProjectTime>20</ProjectTime>
22-
<DiscountRate>0.08</DiscountRate>
23-
<tax>0.25</tax>
24-
<inflation>0.00</inflation>
25-
<verbosity>50</verbosity>
26-
</economics>
27-
<dispatcher>
28-
<pyomo/>
29-
</dispatcher>
30-
</Case>
31-
32-
<Components>
33-
<Component name="source">
34-
<produces resource="a" dispatch="fixed">
35-
<capacity resource="a">
36-
<sweep_values>1, 2</sweep_values>
37-
</capacity>
38-
</produces>
39-
<economics>
40-
<lifetime>30</lifetime>
41-
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
42-
<driver>
43-
<Function method="capacity">functions</Function>
44-
</driver>
45-
<reference_price>
46-
<fixed_value>10000.0</fixed_value>
47-
<multiplier>-1</multiplier>
48-
</reference_price>
49-
<reference_driver>
50-
<fixed_value>10.0</fixed_value>
51-
</reference_driver>
52-
<scaling_factor_x>
53-
<fixed_value>0.999</fixed_value>
54-
</scaling_factor_x>
55-
<!-- <depreciate>5</depreciate> -->
56-
</CashFlow>
57-
<CashFlow name="FOM" type="repeating" period='year' taxable="False" inflation="none" mult_target="False">
58-
<driver>
59-
<Function method="capacity">functions</Function>
60-
</driver>
61-
<reference_price>
62-
<fixed_value>100.0</fixed_value>
63-
<multiplier>-1</multiplier>
64-
</reference_price>
65-
<reference_driver>
66-
<fixed_value>10.0</fixed_value>
67-
</reference_driver>
68-
<scaling_factor_x>
69-
<fixed_value>0.999</fixed_value>
70-
</scaling_factor_x>
71-
</CashFlow>
72-
<CashFlow name="VOM" type="repeating" taxable="True" inflation="none" mult_target="False">
73-
<driver>
74-
<activity>a</activity>
75-
</driver>
76-
<reference_price>
77-
<fixed_value>-1</fixed_value>
78-
</reference_price>
79-
</CashFlow>
80-
</economics>
81-
</Component>
82-
83-
<Component name="sink">
84-
<demands resource="a" dispatch="independent">
85-
<capacity>
86-
<fixed_value>-2</fixed_value>
87-
</capacity>
88-
</demands>
89-
<economics>
90-
<lifetime>30</lifetime>
91-
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
92-
<driver>
93-
<activity>a</activity>
94-
</driver>
95-
<reference_price>
96-
<fixed_value>10.0</fixed_value>
97-
<multiplier>-3.14</multiplier>
98-
</reference_price>
99-
</CashFlow>
100-
</economics>
101-
</Component>
102-
</Components>
103-
104-
<DataGenerators>
105-
<ARMA name='flex' variable="Signal">arma_30yr.pk</ARMA>
106-
<Function name="functions">functions.py</Function>
107-
</DataGenerators>
108-
</HERON>
109-
110-
111-
1+
<HERON>
2+
<TestInfo>
3+
<name>Cashflows</name>
4+
<author>talbpaul</author>
5+
<created>2020-10-16</created>
6+
<description>
7+
Tests various kinds of cashflows
8+
</description>
9+
<classesTested>HERON</classesTested>
10+
</TestInfo>
11+
12+
<Case name="Runs">
13+
<mode>sweep</mode>
14+
<num_arma_samples>20</num_arma_samples>
15+
<time_discretization>
16+
<time_variable>Time</time_variable>
17+
<end_time>2</end_time>
18+
<num_steps>21</num_steps>
19+
</time_discretization>
20+
<economics>
21+
<ProjectTime>20</ProjectTime>
22+
<DiscountRate>0.08</DiscountRate>
23+
<tax>0.25</tax>
24+
<inflation>0.00</inflation>
25+
<verbosity>50</verbosity>
26+
</economics>
27+
<dispatcher>
28+
<pyomo/>
29+
</dispatcher>
30+
</Case>
31+
32+
<Components>
33+
<Component name="source">
34+
<produces resource="a" dispatch="fixed">
35+
<capacity resource="a">
36+
<sweep_values>1, 2</sweep_values>
37+
</capacity>
38+
</produces>
39+
<economics>
40+
<lifetime>30</lifetime>
41+
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
42+
<driver>
43+
<Function method="capacity">functions</Function>
44+
</driver>
45+
<reference_price>
46+
<fixed_value>10000.0</fixed_value>
47+
<multiplier>-1</multiplier>
48+
</reference_price>
49+
<reference_driver>
50+
<fixed_value>10.0</fixed_value>
51+
</reference_driver>
52+
<scaling_factor_x>
53+
<fixed_value>0.999</fixed_value>
54+
</scaling_factor_x>
55+
<!-- <depreciate>5</depreciate> -->
56+
</CashFlow>
57+
<CashFlow name="FOM" type="repeating" period='year' taxable="False" inflation="none" mult_target="False">
58+
<driver>
59+
<Function method="capacity">functions</Function>
60+
</driver>
61+
<reference_price>
62+
<fixed_value>100.0</fixed_value>
63+
<multiplier>-1</multiplier>
64+
</reference_price>
65+
<reference_driver>
66+
<fixed_value>10.0</fixed_value>
67+
</reference_driver>
68+
<scaling_factor_x>
69+
<fixed_value>0.999</fixed_value>
70+
</scaling_factor_x>
71+
</CashFlow>
72+
<CashFlow name="VOM" type="repeating" taxable="True" inflation="none" mult_target="False">
73+
<driver>
74+
<activity>a</activity>
75+
</driver>
76+
<reference_price>
77+
<fixed_value>-1</fixed_value>
78+
</reference_price>
79+
</CashFlow>
80+
</economics>
81+
</Component>
82+
83+
<Component name="sink">
84+
<demands resource="a" dispatch="independent">
85+
<capacity>
86+
<fixed_value>-2</fixed_value>
87+
</capacity>
88+
</demands>
89+
<economics>
90+
<lifetime>30</lifetime>
91+
<CashFlow name="capex" type="one-time" taxable="False" inflation="none" mult_target="False">
92+
<driver>
93+
<activity>a</activity>
94+
</driver>
95+
<reference_price>
96+
<fixed_value>10.0</fixed_value>
97+
<multiplier>-3.14</multiplier>
98+
</reference_price>
99+
</CashFlow>
100+
</economics>
101+
</Component>
102+
</Components>
103+
104+
<DataGenerators>
105+
<ARMA name='flex' variable="Signal">arma_30yr.pk</ARMA>
106+
<Function name="functions">functions.py</Function>
107+
</DataGenerators>
108+
</HERON>
109+
110+
111+

‎tests/integration_tests/Aspen_HERON_FullTest/tests‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
[./run_RAVEN]
3939
type = OrderedCSV
4040
output = 'Runs_o/sweep.csv'
41-
rel_err = 1e-2
41+
rel_err = 0.01
42+
zero_threshold = 1e-9
43+
4244
[../]
4345
[../]
4446
[]

0 commit comments

Comments
 (0)