Skip to content

Commit

Permalink
update test and regold for issue #739
Browse files Browse the repository at this point in the history
  • Loading branch information
wangcj05 committed Aug 8, 2018
1 parent 4a65ce2 commit d396ced
Show file tree
Hide file tree
Showing 11 changed files with 173 additions and 110 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<data name="PrintPPHistorySet_dump1" type="HistorySet"><input>y0,x0,z0</input><output>y,x,z,time</output><inputFilename>PrintPPHistorySet_dump1.csv</inputFilename><metadata><SamplerType>array([u'MC'],
dtype='&lt;U2')</SamplerType><crowDist>array([ {u'y0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'x0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'z0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}'}], dtype=object)</crowDist><SampledVars>array([ {u'y0': 4.3435977886887782, u'x0': 3.2434673864645989, u'z0': 4.156263053292979}], dtype=object)</SampledVars><prefix>array(['1'],
dtype='|S1')</prefix><SampledVarsPb>array([ {u'y0': 0.37607441106613404, u'x0': 0.29965923571548186, u'z0': 0.39410117862255684}], dtype=object)</SampledVarsPb><PointProbability>array([ 0.04441291])</PointProbability></metadata></data>
<DataObjectMetadata name="outMC_PP1">
<DataSet type="Static">
<dims>
<y>time</y>
<x>time</x>
<z>time</z>
</dims>
<general>
<inputs>x0,y0,z0</inputs>
<outputs>x,y,z</outputs>
<sampleTag>RAVEN_sample_ID</sampleTag>
</general>
</DataSet>

</DataObjectMetadata>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
y,x,z,time
4.34359778869,3.24346738646,4.15626305329,0.0
8.70873346803,4.54560146877,4.74821383001,0.0544444444444
14.9350741187,7.5098172182,7.3944487416,0.108888888889
22.9312220448,12.3226460228,15.3278350715,0.163333333333
26.2689310028,18.0422627229,32.5071756938,0.217777777778
11.6874705955,19.4888099493,49.5699281169,0.272222222222
-8.36348704689,11.6636017187,45.4112588876,0.326666666667
-13.3433117535,1.49496346427,35.2325304154,0.381111111111
-12.3516934344,-4.84420932516,31.3951750805,0.435555555556
-10.6857759075,-7.79953251639,30.8501670182,0.49
time,x,y,z
0.0,3.24346738646,4.34359778869,4.15626305329
0.0544444444444,4.54560144726,8.70873348729,4.74821381305
0.108888888889,7.50981721821,14.9350741187,7.3944487416
0.163333333333,12.3226460228,22.9312220448,15.3278350715
0.217777777778,18.0422627229,26.2689310028,32.5071756938
0.272222222222,19.4888099493,11.6874705955,49.5699281169
0.326666666667,11.6636017187,-8.36348704689,45.4112588876
0.381111111111,1.49496346427,-13.3433117535,35.2325304154
0.435555555556,-4.84420933392,-12.3516934332,31.3951750587
0.49,-7.79953251639,-10.6857759075,30.8501670182
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<data name="PrintPPHistorySet_dump2" type="HistorySet"><input>y0,x0,z0</input><output>y,x,z,time</output><inputFilename>PrintPPHistorySet_dump2.csv</inputFilename><metadata><SamplerType>array([u'MC'],
dtype='&lt;U2')</SamplerType><crowDist>array([ {u'y0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'x0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'z0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}'}], dtype=object)</crowDist><SampledVars>array([ {u'y0': 4.3435977886887782, u'x0': 3.2434673864645989, u'z0': 4.156263053292979}], dtype=object)</SampledVars><prefix>array(['1'],
dtype='|S1')</prefix><SampledVarsPb>array([ {u'y0': 0.37607441106613404, u'x0': 0.29965923571548186, u'z0': 0.39410117862255684}], dtype=object)</SampledVarsPb><PointProbability>array([ 0.04441291])</PointProbability></metadata></data>
<DataObjectMetadata name="outMC_PP2">
<DataSet type="Static">
<dims>
<y>time</y>
<x>time</x>
<z>time</z>
</dims>
<general>
<inputs>x0,y0,z0</inputs>
<outputs>x,y,z</outputs>
<sampleTag>RAVEN_sample_ID</sampleTag>
</general>
</DataSet>

</DataObjectMetadata>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
y,x,z,time
4.34359778869,3.24346738646,4.15626305329,0.0
15.0868756161,7.58910678217,7.48816684078,0.11
22.4568408233,11.978042838,14.5993095533,0.16
26.5520948574,16.2793646369,25.9142492987,0.2
22.8473609722,19.6068417742,40.9700781952,0.24
8.33392395036,18.9135308444,50.3945888993,0.28
-3.68740795724,14.817825028,48.6498847794,0.31
-10.8267100272,8.9913840785,42.4971918858,0.34
-13.3372525347,1.66915945437,35.3742500298,0.38
-10.6857759075,-7.79953251639,30.8501670182,0.49
time,x,y,z
0.0,3.24346738646,4.34359778869,4.15626305329
0.11,7.58910678217,15.0868756161,7.48816684078
0.16,11.978042838,22.4568408233,14.5993095533
0.2,16.2793646369,26.5520948574,25.9142492987
0.24,19.6068417742,22.8473609722,40.9700781952
0.28,18.9135308444,8.33392395036,50.3945888993
0.31,14.817825028,-3.68740795724,48.6498847794
0.34,8.9913840785,-10.8267100272,42.4971918858
0.38,1.66915945437,-13.3372525347,35.3742500298
0.49,-7.79953251639,-10.6857759075,30.8501670182
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<data name="PrintPPHistorySet_dump3" type="HistorySet"><input>y0,x0,z0</input><output>y,x,z,time</output><inputFilename>PrintPPHistorySet_dump3.csv</inputFilename><metadata><SamplerType>array([u'MC'],
dtype='&lt;U2')</SamplerType><crowDist>array([ {u'y0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'x0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'z0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}'}], dtype=object)</crowDist><SampledVars>array([ {u'y0': 4.3435977886887782, u'x0': 3.2434673864645989, u'z0': 4.156263053292979}], dtype=object)</SampledVars><prefix>array(['1'],
dtype='|S1')</prefix><SampledVarsPb>array([ {u'y0': 0.37607441106613404, u'x0': 0.29965923571548186, u'z0': 0.39410117862255684}], dtype=object)</SampledVarsPb><PointProbability>array([ 0.04441291])</PointProbability></metadata></data>
<DataObjectMetadata name="outMC_PP3">
<DataSet type="Static">
<dims>
<y>time</y>
<x>time</x>
<z>time</z>
</dims>
<general>
<inputs>x0,y0,z0</inputs>
<outputs>x,y,z</outputs>
<sampleTag>RAVEN_sample_ID</sampleTag>
</general>
</DataSet>

</DataObjectMetadata>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
y,x,z,time
4.34359778869,3.24346738646,4.15626305329,0.0
19.4656461422,10.0347739909,10.972333547,0.14
26.5520948574,16.2793646369,25.9142492987,0.2
24.85275777,19.0239622191,37.2350331643,0.23
20.0758646528,19.930893694,44.357188692,0.25
12.6241681416,19.6123489225,49.2315338988,0.27
-0.0653474841513,16.4715108627,49.9938169493,0.3
-9.08194531841,10.9995317893,44.6878390564,0.33
-13.1772160841,3.31875673643,36.7927086743,0.37
-10.6857759075,-7.79953251639,30.8501670182,0.49
time,x,y,z
0.0,3.24346738646,4.34359778869,4.15626305329
0.14,10.0347739909,19.4656461422,10.972333547
0.2,16.2793646369,26.5520948574,25.9142492987
0.23,19.0239622191,24.85275777,37.2350331643
0.25,19.930893694,20.0758646528,44.357188692
0.27,19.6123489225,12.6241681416,49.2315338988
0.3,16.4715108627,-0.0653474841513,49.9938169493
0.33,10.9995317893,-9.08194531841,44.6878390564
0.37,3.31875673643,-13.1772160841,36.7927086743
0.49,-7.79953251639,-10.6857759075,30.8501670182
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<data name="PrintPPHistorySet_dump4" type="HistorySet"><input>y0,x0,z0</input><output>y,x,z,time</output><inputFilename>PrintPPHistorySet_dump4.csv</inputFilename><metadata><SamplerType>array([u'MC'],
dtype='&lt;U2')</SamplerType><crowDist>array([ {u'y0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'x0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'z0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}'}], dtype=object)</crowDist><SampledVars>array([ {u'y0': 4.3435977886887782, u'x0': 3.2434673864645989, u'z0': 4.156263053292979}], dtype=object)</SampledVars><prefix>array(['1'],
dtype='|S1')</prefix><SampledVarsPb>array([ {u'y0': 0.37607441106613404, u'x0': 0.29965923571548186, u'z0': 0.39410117862255684}], dtype=object)</SampledVarsPb><PointProbability>array([ 0.04441291])</PointProbability></metadata></data>
<DataObjectMetadata name="outMC_PP4">
<DataSet type="Static">
<dims>
<y>time</y>
<x>time</x>
<z>time</z>
</dims>
<general>
<inputs>x0,y0,z0</inputs>
<outputs>x,y,z</outputs>
<sampleTag>RAVEN_sample_ID</sampleTag>
</general>
</DataSet>

</DataObjectMetadata>
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
y,x,z,time
4.34359778869,3.24346738646,4.15626305329,0.0
12.5040956925,6.28176392156,6.09470054302,0.09
13.7550939338,6.90399709866,6.71765296713,0.1
15.0868756161,7.58910678217,7.48816684078,0.11
16.4926717814,8.33888366556,8.43344149229,0.12
17.9593776149,9.15426247714,9.58385443235,0.13
19.4656461422,10.0347739909,10.972333547,0.14
20.9796775252,10.977861206,12.6330715819,0.15
22.4568408233,11.978042838,14.5993095533,0.16
23.8374128574,13.0259226365,16.8998846457,0.17
25.0449311674,14.1070716586,19.5542640125,0.18
25.9859278836,15.2008576095,22.5659233588,0.19
26.5520948574,16.2793646369,25.9142492987,0.2
26.6261208709,17.3066376589,29.5457149913,0.21
26.0923483694,18.2385859801,33.3659155199,0.22
24.85275777,19.0239622191,37.2350331643,0.23
22.8473609722,19.6068417742,40.9700781952,0.24
20.0758646528,19.930893694,44.357188692,0.25
16.6149721167,19.9453907898,47.175629569,0.26
12.6241681416,19.6123489225,49.2315338988,0.27
8.33392395036,18.9135308444,50.3945888993,0.28
4.0149772319,17.855570155,50.6269724722,0.29
-0.0653474841513,16.4715108627,49.9938169493,0.3
-3.68740795724,14.817825028,48.6498847794,0.31
-6.71039767276,12.9673017295,46.8061608594,0.32
-9.08194531841,10.9995317893,44.6878390564,0.33
-10.8267100272,8.9913840785,42.4971918858,0.34
-12.02194113,7.00957466794,40.3904623539,0.35
-12.7702404291,5.10642308815,38.4706964178,0.36
-13.1772160841,3.31875673643,36.7927086743,0.37
-13.3372525347,1.66915945437,35.3742500298,0.38
-13.3269680009,0.168518255461,34.2083166841,0.39
-13.2041604679,-1.18103037018,33.2736365318,0.4
-13.0098356142,-2.38334337995,32.5422847029,0.41
-10.6857759075,-7.79953251639,30.8501670182,0.49
time,x,y,z
0.0,3.24346738646,4.34359778869,4.15626305329
0.09,6.28176392156,12.5040956925,6.09470054302
0.1,6.90399709866,13.7550939338,6.71765296713
0.11,7.58910678217,15.0868756161,7.48816684078
0.12,8.33888366556,16.4926717814,8.43344149229
0.13,9.15426247714,17.9593776149,9.58385443235
0.14,10.0347739909,19.4656461422,10.972333547
0.15,10.977861206,20.9796775252,12.6330715819
0.16,11.978042838,22.4568408233,14.5993095533
0.17,13.0259226365,23.8374128574,16.8998846457
0.18,14.1070716586,25.0449311674,19.5542640125
0.19,15.2008576095,25.9859278836,22.5659233588
0.2,16.2793646369,26.5520948574,25.9142492987
0.21,17.3066376589,26.6261208709,29.5457149913
0.22,18.2385859801,26.0923483694,33.3659155199
0.23,19.0239622191,24.85275777,37.2350331643
0.24,19.6068417742,22.8473609722,40.9700781952
0.25,19.930893694,20.0758646528,44.357188692
0.26,19.9453907898,16.6149721167,47.175629569
0.27,19.6123489225,12.6241681416,49.2315338988
0.28,18.9135308444,8.33392395036,50.3945888993
0.29,17.855570155,4.0149772319,50.6269724722
0.3,16.4715108627,-0.0653474841513,49.9938169493
0.31,14.817825028,-3.68740795724,48.6498847794
0.32,12.9673017295,-6.71039767276,46.8061608594
0.33,10.9995317893,-9.08194531841,44.6878390564
0.34,8.9913840785,-10.8267100272,42.4971918858
0.35,7.00957466794,-12.02194113,40.3904623539
0.36,5.10642308815,-12.7702404291,38.4706964178
0.37,3.31875673643,-13.1772160841,36.7927086743
0.38,1.66915945437,-13.3372525347,35.3742500298
0.39,0.168518255461,-13.3269680009,34.2083166841
0.4,-1.18103037018,-13.2041604679,33.2736365318
0.41,-2.38334337995,-13.0098356142,32.5422847029
0.49,-7.79953251639,-10.6857759075,30.8501670182
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<data name="PrintPPHistorySet_dump5" type="HistorySet"><input>y0,x0,z0</input><output>y,x,z,time</output><inputFilename>PrintPPHistorySet_dump5.csv</inputFilename><metadata><SamplerType>array([u'MC'],
dtype='&lt;U2')</SamplerType><crowDist>array([ {u'y0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'x0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}', u'z0': '{"mu": 4.0, "sigma": 1.0, "type": "NormalDistribution"}'}], dtype=object)</crowDist><SampledVars>array([ {u'y0': 4.3435977886887782, u'x0': 3.2434673864645989, u'z0': 4.156263053292979}], dtype=object)</SampledVars><prefix>array(['1'],
dtype='|S1')</prefix><SampledVarsPb>array([ {u'y0': 0.37607441106613404, u'x0': 0.29965923571548186, u'z0': 0.39410117862255684}], dtype=object)</SampledVarsPb><PointProbability>array([ 0.04441291])</PointProbability></metadata></data>
<DataObjectMetadata name="outMC_PP5">
<DataSet type="Static">
<dims>
<y>time</y>
<x>time</x>
<z>time</z>
</dims>
<general>
<inputs>x0,y0,z0</inputs>
<outputs>x,y,z</outputs>
<sampleTag>RAVEN_sample_ID</sampleTag>
</general>
</DataSet>

</DataObjectMetadata>
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
y,x,z,time
4.34359778869,3.24346738646,4.15626305329,0.0
23.8374128574,13.0259226365,16.8998846457,0.17
25.0449311674,14.1070716586,19.5542640125,0.18
25.9859278836,15.2008576095,22.5659233588,0.19
26.5520948574,16.2793646369,25.9142492987,0.2
26.6261208709,17.3066376589,29.5457149913,0.21
26.0923483694,18.2385859801,33.3659155199,0.22
24.85275777,19.0239622191,37.2350331643,0.23
22.8473609722,19.6068417742,40.9700781952,0.24
20.0758646528,19.930893694,44.357188692,0.25
16.6149721167,19.9453907898,47.175629569,0.26
12.6241681416,19.6123489225,49.2315338988,0.27
8.33392395036,18.9135308444,50.3945888993,0.28
4.0149772319,17.855570155,50.6269724722,0.29
-0.0653474841513,16.4715108627,49.9938169493,0.3
-3.68740795724,14.817825028,48.6498847794,0.31
-6.71039767276,12.9673017295,46.8061608594,0.32
-9.08194531841,10.9995317893,44.6878390564,0.33
-10.8267100272,8.9913840785,42.4971918858,0.34
-12.02194113,7.00957466794,40.3904623539,0.35
-12.7702404291,5.10642308815,38.4706964178,0.36
-13.1772160841,3.31875673643,36.7927086743,0.37
-13.3372525347,1.66915945437,35.3742500298,0.38
-10.6857759075,-7.79953251639,30.8501670182,0.49
time,x,y,z
0.0,3.24346738646,4.34359778869,4.15626305329
0.17,13.0259226365,23.8374128574,16.8998846457
0.18,14.1070716586,25.0449311674,19.5542640125
0.19,15.2008576095,25.9859278836,22.5659233588
0.2,16.2793646369,26.5520948574,25.9142492987
0.21,17.3066376589,26.6261208709,29.5457149913
0.22,18.2385859801,26.0923483694,33.3659155199
0.23,19.0239622191,24.85275777,37.2350331643
0.24,19.6068417742,22.8473609722,40.9700781952
0.25,19.930893694,20.0758646528,44.357188692
0.26,19.9453907898,16.6149721167,47.175629569
0.27,19.6123489225,12.6241681416,49.2315338988
0.28,18.9135308444,8.33392395036,50.3945888993
0.29,17.855570155,4.0149772319,50.6269724722
0.3,16.4715108627,-0.0653474841513,49.9938169493
0.31,14.817825028,-3.68740795724,48.6498847794
0.32,12.9673017295,-6.71039767276,46.8061608594
0.33,10.9995317893,-9.08194531841,44.6878390564
0.34,8.9913840785,-10.8267100272,42.4971918858
0.35,7.00957466794,-12.02194113,40.3904623539
0.36,5.10642308815,-12.7702404291,38.4706964178
0.37,3.31875673643,-13.1772160841,36.7927086743
0.38,1.66915945437,-13.3372525347,35.3742500298
0.49,-7.79953251639,-10.6857759075,30.8501670182
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<description>
Tests of the HistorySetSampling interfaced post-processor and all its sampling types
</description>
<revisions>
<revision author="wangc" date="2018-08-08">Test the defect issue #739</revision>
</revisions>
</TestInfo>

<RunInfo>
Expand Down Expand Up @@ -142,7 +145,7 @@
<Samplers>
<MonteCarlo name="MC_external">
<samplerInit>
<limit>1</limit>
<limit>2</limit>
</samplerInit>
<variable name="x0">
<distribution>x0_distrib</distribution>
Expand Down

0 comments on commit d396ced

Please sign in to comment.