From 18a1b177a371b64c1b844880d56cca6700bc21e9 Mon Sep 17 00:00:00 2001 From: alfoa Date: Wed, 15 Apr 2020 08:09:54 -0600 Subject: [PATCH 01/14] error bound --- .../PostProcessors/LimitSurfaceIntegral.py | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 11b1ad47d2..393a38693c 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -23,6 +23,7 @@ import xarray import math import os +import sys #External Modules End-------------------------------------------------------------------------------- #Internal Modules------------------------------------------------------------------------------------ @@ -95,6 +96,7 @@ def __init__(self, messageHandler): self.matrixDict = {} # dictionary of arrays and target self.lowerUpperDict = {} self.functionS = None + self.errorModel = None self.computationPrefix = None self.stat = BasicStatistics(self.messageHandler) # instantiation of the 'BasicStatistics' processor, which is used to compute the pb given montecarlo evaluations self.stat.what = ['expectedValue'] @@ -170,6 +172,7 @@ def _handleInput(self, paramInput): self.raiseAnError(IOError,'The required XML node has not been inputted!!!') if self.target == None: self.raiseAWarning('integral target has not been provided. The postprocessor is going to take the last output it finds in the provided limitsurface!!!') + self.computeErrrorBounds = True def initialize(self, runInfo, inputs, initDict): """ @@ -183,10 +186,28 @@ def initialize(self, runInfo, inputs, initDict): if self.integralType in ['montecarlo']: self.stat.toDo = {'expectedValue':[{'targets':set([self.target]), 'prefix':self.computationPrefix}]} self.stat.initialize(runInfo, inputs, initDict) - self.functionS = LearningGate.returnInstance('SupervisedGate','SciKitLearn', self, **{'SKLtype':'neighbors|KNeighborsClassifier', 'Features':','.join(list(self.variableDist.keys())), 'Target':self.target}) + self.functionS = LearningGate.returnInstance('SupervisedGate','SciKitLearn', self, + **{'SKLtype':'neighbors|KNeighborsClassifier', + 'Features':','.join(list(self.variableDist.keys())), + 'Target':self.target}) self.functionS.train(self.matrixDict) self.raiseADebug('DATA SET MATRIX:') self.raiseADebug(self.matrixDict) + self.computeErrrorBounds = True + if self.computeErrrorBounds: + # create a model for computing the "error" + self.errorModel = LearningGate.returnInstance('SupervisedGate','SciKitLearn', self, + **{'SKLtype':'neighbors|KNeighborsClassifier', + 'Features':','.join(list(self.variableDist.keys())), + 'Target':self.target}) + #modify the self.matrixDict to compute half of the "error" + indecesToModify = np.argwhere(self.matrixDict[self.target] < 1.0) + modifiedMatrixDict = {} + for key in self.matrixDict: + perturb = np.average(self.matrixDict[key]) * 2. * sys.float_info.epsilon + modifiedMatrixDict[key] = self.matrixDict[key][indecesToModify] + perturb if key != self.target else self.matrixDict[key] + self.errorModel.train(modifiedMatrixDict) + for varName, distName in self.variableDist.items(): if distName != None: self.variableDist[varName] = self.retrieveObjectFromAssemblerDict('distribution', distName) @@ -241,6 +262,10 @@ def run(self, input): randomMatrix[:, index] = f(randomMatrix[:, index]) tempDict[varName] = randomMatrix[:, index] pb = self.stat.run({'targets':{self.target:xarray.DataArray(self.functionS.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target] + if self.errorModel: + tightPb = self.stat.run({'targets':{self.target:xarray.DataArray(self.errorModel.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target] + pbError = abs(pb-tightPb) * 2.0 + print(pbError) else: self.raiseAnError(NotImplemented, "quadrature not yet implemented") return pb From 39eca981ec607a734304e0aefbb93c6caca86a0f Mon Sep 17 00:00:00 2001 From: alfoa Date: Wed, 15 Apr 2020 22:54:49 -0600 Subject: [PATCH 02/14] Closes #1216 --- doc/user_manual/postprocessor.tex | 5 + framework/DataObjects/DataSet.py | 2 - .../PostProcessors/LimitSurfaceIntegral.py | 41 ++-- framework/Samplers/LimitSurfaceSearch.py | 1 - framework/utils/mathUtils.py | 2 +- .../LimitSurfaceWeightedPb_dump.csv | 201 ++++++++++++++++++ .../test_LimitSurface_with_err_bounds.xml | 138 ++++++++++++ .../PostProcessors/LimitSurface/tests | 11 + 8 files changed, 381 insertions(+), 20 deletions(-) create mode 100644 tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv create mode 100644 tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml diff --git a/doc/user_manual/postprocessor.tex b/doc/user_manual/postprocessor.tex index 2c54b79552..92f1f12ae4 100644 --- a/doc/user_manual/postprocessor.tex +++ b/doc/user_manual/postprocessor.tex @@ -809,6 +809,11 @@ \subsubsection{LimitSurfaceIntegral} \item \xmlNode{integralType}, \xmlDesc{string, optional field}, specifies the type of integrations that need to be used. Currently only MonteCarlo integration is available \default{MonteCarlo} + \item \xmlNode{computeBounds}, \xmlDesc{bool, optional field}, + activates the computation of the bounding error of the limit + surface integral ( maximum error in the identification of the + limit surface location) + \default{False} \item \xmlNode{seed}, \xmlDesc{integer, optional field}, specifies the random number generator seed. \default{20021986} \item \xmlNode{target}, \xmlDesc{string, optional field}, specifies the target name that represents diff --git a/framework/DataObjects/DataSet.py b/framework/DataObjects/DataSet.py index 002d9df36c..930e739741 100644 --- a/framework/DataObjects/DataSet.py +++ b/framework/DataObjects/DataSet.py @@ -1244,8 +1244,6 @@ def _convertToXrDataset(self): self.addMeta('DataSet',{'Hierarchical':{'path':','.join(p)}}) # clear alignment tracking for indexes self._clearAlignment() - else: - self.raiseAWarning('No data in DataSet to construct!') return self._data def _formatRealization(self,rlz): diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 393a38693c..8c242c8b57 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -22,8 +22,8 @@ import numpy as np import xarray import math -import os import sys +from copy import deepcopy #External Modules End-------------------------------------------------------------------------------- #Internal Modules------------------------------------------------------------------------------------ @@ -79,6 +79,9 @@ class cls. LSIOutputNameInput = InputData.parameterInputFactory("outputName", contentType=InputTypes.StringType) inputSpecification.addSub(LSIOutputNameInput) + LSIOutputNameInput = InputData.parameterInputFactory("computeBounds", contentType=InputTypes.BoolType) + inputSpecification.addSub(LSIOutputNameInput) + return inputSpecification def __init__(self, messageHandler): @@ -161,6 +164,8 @@ def _handleInput(self, paramInput): self.target = child.value elif child.getName() == 'outputName': self.computationPrefix = child.value + elif child.getName() == 'computeBounds': + self.computeErrrorBounds = child.value else: self.raiseAnError(NameError, 'invalid or missing labels after the variables call. Only "variable" is accepted.tag: ' + child.getName()) # if no distribution, we look for the integration domain in the input @@ -168,11 +173,11 @@ def _handleInput(self, paramInput): if self.variableDist[varName] == None: if 'lowerBound' not in self.lowerUpperDict[varName].keys() or 'upperBound' not in self.lowerUpperDict[varName].keys(): self.raiseAnError(NameError, 'either a distribution name or lowerBound and upperBound need to be specified for variable ' + varName) - if self.computationPrefix == None: + if self.computationPrefix is None: self.raiseAnError(IOError,'The required XML node has not been inputted!!!') - if self.target == None: + if self.target is None: self.raiseAWarning('integral target has not been provided. The postprocessor is going to take the last output it finds in the provided limitsurface!!!') - self.computeErrrorBounds = True + True def initialize(self, runInfo, inputs, initDict): """ @@ -189,23 +194,23 @@ def initialize(self, runInfo, inputs, initDict): self.functionS = LearningGate.returnInstance('SupervisedGate','SciKitLearn', self, **{'SKLtype':'neighbors|KNeighborsClassifier', 'Features':','.join(list(self.variableDist.keys())), - 'Target':self.target}) + 'Target':self.target, 'n_jobs': -1}) self.functionS.train(self.matrixDict) self.raiseADebug('DATA SET MATRIX:') self.raiseADebug(self.matrixDict) - self.computeErrrorBounds = True if self.computeErrrorBounds: # create a model for computing the "error" self.errorModel = LearningGate.returnInstance('SupervisedGate','SciKitLearn', self, **{'SKLtype':'neighbors|KNeighborsClassifier', 'Features':','.join(list(self.variableDist.keys())), - 'Target':self.target}) + 'Target':self.target, 'weights': 'distance', 'n_jobs': -1}) #modify the self.matrixDict to compute half of the "error" - indecesToModify = np.argwhere(self.matrixDict[self.target] < 1.0) + indecesToModifyOnes = np.argwhere(self.matrixDict[self.target] > 0.).flatten() + res = np.concatenate((np.ones(len(indecesToModifyOnes)), np.zeros(len(indecesToModifyOnes)))) modifiedMatrixDict = {} for key in self.matrixDict: - perturb = np.average(self.matrixDict[key]) * 2. * sys.float_info.epsilon - modifiedMatrixDict[key] = self.matrixDict[key][indecesToModify] + perturb if key != self.target else self.matrixDict[key] + modifiedMatrixDict[key] = np.concatenate((self.matrixDict[key][indecesToModifyOnes], self.matrixDict[key][indecesToModifyOnes] + * (1. + sys.float_info.epsilon * 2.))) if key != self.target else res self.errorModel.train(modifiedMatrixDict) for varName, distName in self.variableDist.items(): @@ -249,8 +254,9 @@ def run(self, input): This method executes the postprocessor action. In this case, it performs the computation of the LS integral @ In, input, object, object contained the data to process. (inputToInternal output) @ Out, pb, float, integral outcome (probability of the event) + @ Out, boundError, float, optional, error bound (maximum error of the computed probability) """ - pb = None + pb, boundError = None, None if self.integralType == 'montecarlo': tempDict = {} randomMatrix = np.random.rand(int(math.ceil(1.0 / self.tolerance**2)), len(self.variableDist.keys())) @@ -263,12 +269,10 @@ def run(self, input): tempDict[varName] = randomMatrix[:, index] pb = self.stat.run({'targets':{self.target:xarray.DataArray(self.functionS.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target] if self.errorModel: - tightPb = self.stat.run({'targets':{self.target:xarray.DataArray(self.errorModel.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target] - pbError = abs(pb-tightPb) * 2.0 - print(pbError) + boundError = abs(pb-self.stat.run({'targets':{self.target:xarray.DataArray(self.errorModel.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target]) else: self.raiseAnError(NotImplemented, "quadrature not yet implemented") - return pb + return pb, boundError def collectOutput(self, finishedJob, output): """ @@ -278,13 +282,18 @@ def collectOutput(self, finishedJob, output): @ Out, None """ evaluation = finishedJob.getEvaluation() - pb = evaluation[1] + pb, boundError = evaluation[1] lms = evaluation[0][0] if output.type == 'PointSet': # we store back the limitsurface dataSet = lms.asDataset() loadDict = {key: dataSet[key].values for key in lms.getVars()} loadDict[self.computationPrefix] = np.full(len(lms), pb) + if self.computeErrrorBounds: + if self.computationPrefix+"_err" not in output.getVars(): + self.raiseAWarning('ERROR Bounds have been computed but the output DataObject does not request the variable: "', self.computationPrefix+"_err", '"!') + else: + loadDict[self.computationPrefix+"_err"] = np.full(len(lms), boundError) output.load(loadDict,'dict') # NB I keep this commented part in case we want to keep the possibility to have outputfiles for PP #elif isinstance(output,Files.File): diff --git a/framework/Samplers/LimitSurfaceSearch.py b/framework/Samplers/LimitSurfaceSearch.py index 6ac2431935..e2b20ab0a6 100644 --- a/framework/Samplers/LimitSurfaceSearch.py +++ b/framework/Samplers/LimitSurfaceSearch.py @@ -850,5 +850,4 @@ def _formatSolutionExportVariableNames(self, acceptable): new.append(template.format(RESIDUUM=self.goalFunction.name)) else: new.append(template) - print('DEBUGG new:', new) return set(new) diff --git a/framework/utils/mathUtils.py b/framework/utils/mathUtils.py index 6cd5e63558..59a44d233f 100644 --- a/framework/utils/mathUtils.py +++ b/framework/utils/mathUtils.py @@ -960,4 +960,4 @@ def angleBetweenVectors(a, b): dot = np.dot(a, b) / normA / normB ang = np.arccos(np.clip(dot, -1, 1)) ang = np.rad2deg(ang) - return ang \ No newline at end of file + return ang diff --git a/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv new file mode 100644 index 0000000000..0ff0aab7d3 --- /dev/null +++ b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv @@ -0,0 +1,201 @@ +y0,x0,EventProbability,EventProbability_err,goalFunctionForLimitSurface +7.05613837842,1.63193506661,0.502125,0.011425,0.0 +7.05613837842,1.67929636528,0.502125,0.011425,0.0 +7.00598866187,1.72665766395,0.502125,0.011425,0.0 +6.95583894533,1.77401896262,0.502125,0.011425,0.0 +6.90568922878,1.82138026128,0.502125,0.011425,0.0 +6.85553951223,1.86874155995,0.502125,0.011425,0.0 +6.85553951223,1.91610285862,0.502125,0.011425,0.0 +6.80538979569,1.96346415729,0.502125,0.011425,0.0 +6.75524007914,2.01082545595,0.502125,0.011425,0.0 +6.70509036259,2.05818675462,0.502125,0.011425,0.0 +6.65494064604,2.10554805329,0.502125,0.011425,0.0 +6.65494064604,2.15290935196,0.502125,0.011425,0.0 +6.6047909295,2.20027065063,0.502125,0.011425,0.0 +6.55464121295,2.24763194929,0.502125,0.011425,0.0 +6.5044914964,2.29499324796,0.502125,0.011425,0.0 +6.45434177986,2.34235454663,0.502125,0.011425,0.0 +6.40419206331,2.3897158453,0.502125,0.011425,0.0 +6.40419206331,2.43707714396,0.502125,0.011425,0.0 +6.35404234676,2.48443844263,0.502125,0.011425,0.0 +6.30389263022,2.5317997413,0.502125,0.011425,0.0 +6.25374291367,2.57916103997,0.502125,0.011425,0.0 +6.20359319712,2.62652233864,0.502125,0.011425,0.0 +6.20359319712,2.6738836373,0.502125,0.011425,0.0 +6.15344348058,2.72124493597,0.502125,0.011425,0.0 +6.10329376403,2.76860623464,0.502125,0.011425,0.0 +6.05314404748,2.81596753331,0.502125,0.011425,0.0 +6.00299433094,2.86332883197,0.502125,0.011425,0.0 +6.00299433094,2.91069013064,0.502125,0.011425,0.0 +5.95284461439,2.95805142931,0.502125,0.011425,0.0 +5.90269489784,3.00541272798,0.502125,0.011425,0.0 +5.8525451813,3.05277402664,0.502125,0.011425,0.0 +5.80239546475,3.10013532531,0.502125,0.011425,0.0 +5.7522457482,3.14749662398,0.502125,0.011425,0.0 +5.7522457482,3.19485792265,0.502125,0.011425,0.0 +5.70209603166,3.24221922132,0.502125,0.011425,0.0 +5.65194631511,3.28958051998,0.502125,0.011425,0.0 +5.60179659856,3.33694181865,0.502125,0.011425,0.0 +5.55164688201,3.38430311732,0.502125,0.011425,0.0 +5.55164688201,3.43166441599,0.502125,0.011425,0.0 +5.50149716547,3.47902571465,0.502125,0.011425,0.0 +5.45134744892,3.52638701332,0.502125,0.011425,0.0 +5.40119773237,3.57374831199,0.502125,0.011425,0.0 +5.35104801583,3.62110961066,0.502125,0.011425,0.0 +5.35104801583,3.66847090933,0.502125,0.011425,0.0 +5.30089829928,3.71583220799,0.502125,0.011425,0.0 +5.25074858273,3.76319350666,0.502125,0.011425,0.0 +5.20059886619,3.81055480533,0.502125,0.011425,0.0 +5.15044914964,3.857916104,0.502125,0.011425,0.0 +5.15044914964,3.90527740266,0.502125,0.011425,0.0 +5.10029943309,3.95263870133,0.502125,0.011425,0.0 +5.05014971655,4.0,0.502125,0.011425,0.0 +5.0,4.04736129867,0.502125,0.011425,0.0 +4.94985028345,4.09472259734,0.502125,0.011425,0.0 +4.89970056691,4.142083896,0.502125,0.011425,0.0 +4.89970056691,4.18944519467,0.502125,0.011425,0.0 +4.84955085036,4.23680649334,0.502125,0.011425,0.0 +4.79940113381,4.28416779201,0.502125,0.011425,0.0 +4.74925141727,4.33152909067,0.502125,0.011425,0.0 +4.69910170072,4.37889038934,0.502125,0.011425,0.0 +4.69910170072,4.42625168801,0.502125,0.011425,0.0 +4.64895198417,4.47361298668,0.502125,0.011425,0.0 +4.59880226763,4.52097428535,0.502125,0.011425,0.0 +4.54865255108,4.56833558401,0.502125,0.011425,0.0 +4.49850283453,4.61569688268,0.502125,0.011425,0.0 +4.49850283453,4.66305818135,0.502125,0.011425,0.0 +4.44835311799,4.71041948002,0.502125,0.011425,0.0 +4.39820340144,4.75778077868,0.502125,0.011425,0.0 +4.34805368489,4.80514207735,0.502125,0.011425,0.0 +4.29790396834,4.85250337602,0.502125,0.011425,0.0 +4.2477542518,4.89986467469,0.502125,0.011425,0.0 +4.2477542518,4.94722597336,0.502125,0.011425,0.0 +4.19760453525,4.99458727202,0.502125,0.011425,0.0 +4.1474548187,5.04194857069,0.502125,0.011425,0.0 +4.09730510216,5.08930986936,0.502125,0.011425,0.0 +4.04715538561,5.13667116803,0.502125,0.011425,0.0 +4.04715538561,5.18403246669,0.502125,0.011425,0.0 +3.99700566906,5.23139376536,0.502125,0.011425,0.0 +3.94685595252,5.27875506403,0.502125,0.011425,0.0 +3.89670623597,5.3261163627,0.502125,0.011425,0.0 +3.84655651942,5.37347766136,0.502125,0.011425,0.0 +3.84655651942,5.42083896003,0.502125,0.011425,0.0 +3.79640680288,5.4682002587,0.502125,0.011425,0.0 +3.74625708633,5.51556155737,0.502125,0.011425,0.0 +3.69610736978,5.56292285604,0.502125,0.011425,0.0 +3.64595765324,5.6102841547,0.502125,0.011425,0.0 +3.64595765324,5.65764545337,0.502125,0.011425,0.0 +3.59580793669,5.70500675204,0.502125,0.011425,0.0 +3.54565822014,5.75236805071,0.502125,0.011425,0.0 +3.4955085036,5.79972934937,0.502125,0.011425,0.0 +3.44535878705,5.84709064804,0.502125,0.011425,0.0 +3.3952090705,5.89445194671,0.502125,0.011425,0.0 +3.3952090705,5.94181324538,0.502125,0.011425,0.0 +3.34505935396,5.98917454405,0.502125,0.011425,0.0 +3.29490963741,6.03653584271,0.502125,0.011425,0.0 +3.24475992086,6.08389714138,0.502125,0.011425,0.0 +3.19461020431,6.13125844005,0.502125,0.011425,0.0 +3.19461020431,6.17861973872,0.502125,0.011425,0.0 +3.14446048777,6.22598103738,0.502125,0.011425,0.0 +3.09431077122,6.27334233605,0.502125,0.011425,0.0 +3.04416105467,6.32070363472,0.502125,0.011425,0.0 +7.00598866187,1.63193506661,0.502125,0.011425,1.0 +7.00598866187,1.67929636528,0.502125,0.011425,1.0 +6.95583894533,1.72665766395,0.502125,0.011425,1.0 +6.90568922878,1.77401896262,0.502125,0.011425,1.0 +6.85553951223,1.82138026128,0.502125,0.011425,1.0 +6.80538979569,1.86874155995,0.502125,0.011425,1.0 +6.80538979569,1.91610285862,0.502125,0.011425,1.0 +6.75524007914,1.96346415729,0.502125,0.011425,1.0 +6.70509036259,2.01082545595,0.502125,0.011425,1.0 +6.65494064604,2.05818675462,0.502125,0.011425,1.0 +6.6047909295,2.10554805329,0.502125,0.011425,1.0 +6.6047909295,2.15290935196,0.502125,0.011425,1.0 +6.55464121295,2.20027065063,0.502125,0.011425,1.0 +6.5044914964,2.24763194929,0.502125,0.011425,1.0 +6.45434177986,2.29499324796,0.502125,0.011425,1.0 +6.40419206331,2.34235454663,0.502125,0.011425,1.0 +6.35404234676,2.3897158453,0.502125,0.011425,1.0 +6.35404234676,2.43707714396,0.502125,0.011425,1.0 +6.30389263022,2.48443844263,0.502125,0.011425,1.0 +6.25374291367,2.5317997413,0.502125,0.011425,1.0 +6.20359319712,2.57916103997,0.502125,0.011425,1.0 +6.15344348058,2.62652233864,0.502125,0.011425,1.0 +6.15344348058,2.6738836373,0.502125,0.011425,1.0 +6.10329376403,2.72124493597,0.502125,0.011425,1.0 +6.05314404748,2.76860623464,0.502125,0.011425,1.0 +6.00299433094,2.81596753331,0.502125,0.011425,1.0 +5.95284461439,2.86332883197,0.502125,0.011425,1.0 +5.95284461439,2.91069013064,0.502125,0.011425,1.0 +5.90269489784,2.95805142931,0.502125,0.011425,1.0 +5.8525451813,3.00541272798,0.502125,0.011425,1.0 +5.80239546475,3.05277402664,0.502125,0.011425,1.0 +5.7522457482,3.10013532531,0.502125,0.011425,1.0 +5.70209603166,3.14749662398,0.502125,0.011425,1.0 +5.70209603166,3.19485792265,0.502125,0.011425,1.0 +5.65194631511,3.24221922132,0.502125,0.011425,1.0 +5.60179659856,3.28958051998,0.502125,0.011425,1.0 +5.55164688201,3.33694181865,0.502125,0.011425,1.0 +5.50149716547,3.38430311732,0.502125,0.011425,1.0 +5.50149716547,3.43166441599,0.502125,0.011425,1.0 +5.45134744892,3.47902571465,0.502125,0.011425,1.0 +5.40119773237,3.52638701332,0.502125,0.011425,1.0 +5.35104801583,3.57374831199,0.502125,0.011425,1.0 +5.30089829928,3.62110961066,0.502125,0.011425,1.0 +5.30089829928,3.66847090933,0.502125,0.011425,1.0 +5.25074858273,3.71583220799,0.502125,0.011425,1.0 +5.20059886619,3.76319350666,0.502125,0.011425,1.0 +5.15044914964,3.81055480533,0.502125,0.011425,1.0 +5.10029943309,3.857916104,0.502125,0.011425,1.0 +5.10029943309,3.90527740266,0.502125,0.011425,1.0 +5.05014971655,3.95263870133,0.502125,0.011425,1.0 +5.0,4.0,0.502125,0.011425,1.0 +4.94985028345,4.04736129867,0.502125,0.011425,1.0 +4.89970056691,4.09472259734,0.502125,0.011425,1.0 +4.84955085036,4.142083896,0.502125,0.011425,1.0 +4.84955085036,4.18944519467,0.502125,0.011425,1.0 +4.79940113381,4.23680649334,0.502125,0.011425,1.0 +4.74925141727,4.28416779201,0.502125,0.011425,1.0 +4.69910170072,4.33152909067,0.502125,0.011425,1.0 +4.64895198417,4.37889038934,0.502125,0.011425,1.0 +4.64895198417,4.42625168801,0.502125,0.011425,1.0 +4.59880226763,4.47361298668,0.502125,0.011425,1.0 +4.54865255108,4.52097428535,0.502125,0.011425,1.0 +4.49850283453,4.56833558401,0.502125,0.011425,1.0 +4.44835311799,4.61569688268,0.502125,0.011425,1.0 +4.44835311799,4.66305818135,0.502125,0.011425,1.0 +4.39820340144,4.71041948002,0.502125,0.011425,1.0 +4.34805368489,4.75778077868,0.502125,0.011425,1.0 +4.29790396834,4.80514207735,0.502125,0.011425,1.0 +4.2477542518,4.85250337602,0.502125,0.011425,1.0 +4.19760453525,4.89986467469,0.502125,0.011425,1.0 +4.19760453525,4.94722597336,0.502125,0.011425,1.0 +4.1474548187,4.99458727202,0.502125,0.011425,1.0 +4.09730510216,5.04194857069,0.502125,0.011425,1.0 +4.04715538561,5.08930986936,0.502125,0.011425,1.0 +3.99700566906,5.13667116803,0.502125,0.011425,1.0 +3.99700566906,5.18403246669,0.502125,0.011425,1.0 +3.94685595252,5.23139376536,0.502125,0.011425,1.0 +3.89670623597,5.27875506403,0.502125,0.011425,1.0 +3.84655651942,5.3261163627,0.502125,0.011425,1.0 +3.79640680288,5.37347766136,0.502125,0.011425,1.0 +3.79640680288,5.42083896003,0.502125,0.011425,1.0 +3.74625708633,5.4682002587,0.502125,0.011425,1.0 +3.69610736978,5.51556155737,0.502125,0.011425,1.0 +3.64595765324,5.56292285604,0.502125,0.011425,1.0 +3.59580793669,5.6102841547,0.502125,0.011425,1.0 +3.59580793669,5.65764545337,0.502125,0.011425,1.0 +3.54565822014,5.70500675204,0.502125,0.011425,1.0 +3.4955085036,5.75236805071,0.502125,0.011425,1.0 +3.44535878705,5.79972934937,0.502125,0.011425,1.0 +3.3952090705,5.84709064804,0.502125,0.011425,1.0 +3.34505935396,5.89445194671,0.502125,0.011425,1.0 +3.34505935396,5.94181324538,0.502125,0.011425,1.0 +3.29490963741,5.98917454405,0.502125,0.011425,1.0 +3.24475992086,6.03653584271,0.502125,0.011425,1.0 +3.19461020431,6.08389714138,0.502125,0.011425,1.0 +3.14446048777,6.13125844005,0.502125,0.011425,1.0 +3.14446048777,6.17861973872,0.502125,0.011425,1.0 +3.09431077122,6.22598103738,0.502125,0.011425,1.0 +3.04416105467,6.27334233605,0.502125,0.011425,1.0 +2.99401133813,6.32070363472,0.502125,0.011425,1.0 diff --git a/tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml b/tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml new file mode 100644 index 0000000000..4320997b08 --- /dev/null +++ b/tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml @@ -0,0 +1,138 @@ + + + + framework/PostProcessors/LimitSurface.testLimitSurfaceIntegralPPWihtBoundingError + alfoa + 2020-04-15 + Models.PostProcessors.LimitSurface, Models.PostProcessors.LimitSurfaceIntegral + + This test is aimed to check the capability of RAVEN to compute the integral of the Limit Surface (e.g. + Failure probability) reporting the bounding error as well (the maximum error, in probability, in the computation of the limit surface ) + + + Added test for computation of the error bound + + R-RA-7 + + + + limitSurfaceBoundingError + FirstMRun,ComputeLimitSurfacePositiveNegative,ComputeLimitSurfaceIntegralWeighted + 1 + + + + + z,x0,y0 + + + x0,y0 + both + Acc + goalFunctionForLimitSurface + + + 0.005 + MonteCarlo + 20021986 + goalFunctionForLimitSurface + EventProbability + True + + x0_distrib + + + y0_distrib + + + + x0,y0 + goalFunctionForLimitSurface + svm|LinearSVC + 1 + 0.0001 + 10 + + + + + + z + + + + + + 4 + 2 + 0.0 + 8.0 + + + 5 + 2 + 0.0 + 10.0 + + + + + + + x0_distrib + 0.1 0.9 + + + y0_distrib + 0.1 0.9 + + + + + + + Dummy + PythonModule + Grid_external + PointSetPostProcTest + + + PointSetPostProcTest + computeLimitSurfacePositiveNegative + LimitSurfacePositiveNegative + + + LimitSurfacePositiveNegative + LimitSurfaceIntegralWeighted + LimitSurfaceWeightedPb + LimitSurfaceWeightedPb_dump + + + + + + csv + LimitSurfaceWeightedPb + + + + + + x0,y0 + z + + + y0,x0 + goalFunctionForLimitSurface + + + y0,x0 + EventProbability,EventProbability_err,goalFunctionForLimitSurface + + + x0,y0 + OutputPlaceHolder + + + + diff --git a/tests/framework/PostProcessors/LimitSurface/tests b/tests/framework/PostProcessors/LimitSurface/tests index cadc0c504e..41becad838 100644 --- a/tests/framework/PostProcessors/LimitSurface/tests +++ b/tests/framework/PostProcessors/LimitSurface/tests @@ -26,4 +26,15 @@ max_time = 300 rel_err = 0.0001 [../] + + [./testLimitSurfaceIntegralPPWihtBoundingError] + type = 'RavenFramework' + input = 'test_LimitSurface_with_err_bounds.xml' + output = 'limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.xml' + csv = 'limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv' + max_time = 300 + rel_err = 0.0001 + [../] + + [] From e606b40a115b5518956268b04684265f61661c54 Mon Sep 17 00:00:00 2001 From: alfoa Date: Wed, 15 Apr 2020 23:21:25 -0600 Subject: [PATCH 03/14] fixed crash --- doc/user_manual/postprocessor.tex | 7 ++++++- framework/PostProcessors/LimitSurfaceIntegral.py | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/user_manual/postprocessor.tex b/doc/user_manual/postprocessor.tex index 92f1f12ae4..8074233d6e 100644 --- a/doc/user_manual/postprocessor.tex +++ b/doc/user_manual/postprocessor.tex @@ -812,7 +812,12 @@ \subsubsection{LimitSurfaceIntegral} \item \xmlNode{computeBounds}, \xmlDesc{bool, optional field}, activates the computation of the bounding error of the limit surface integral ( maximum error in the identification of the - limit surface location) + limit surface location). If True, the bounding error is stored + in a variable named as \xmlNode{outputName} appending the suffix + ``_err''. For example, if \xmlNode{outputName} is + ``EventProbability'', the bounding error will be stored as + ``EventProbability_err'' (this variable name must be listed as + variable in the output DataObject). \default{False} \item \xmlNode{seed}, \xmlDesc{integer, optional field}, specifies the random number generator seed. \default{20021986} diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 8c242c8b57..94c2aceefc 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -97,6 +97,7 @@ def __init__(self, messageHandler): self.integralType = 'montecarlo' # integral type (which alg needs to be used). Either montecarlo or quadrature(quadrature not yet) self.seed = 20021986 # seed for montecarlo self.matrixDict = {} # dictionary of arrays and target + self.computeErrrorBounds = False # compute the bounding error? self.lowerUpperDict = {} self.functionS = None self.errorModel = None From c17cea96e89742b9d463e1bebfb30ecd555da7e7 Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 16 Apr 2020 14:40:09 -0600 Subject: [PATCH 04/14] fixed doc --- doc/user_manual/postprocessor.tex | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/user_manual/postprocessor.tex b/doc/user_manual/postprocessor.tex index 8074233d6e..9e2ad13d5e 100644 --- a/doc/user_manual/postprocessor.tex +++ b/doc/user_manual/postprocessor.tex @@ -814,9 +814,9 @@ \subsubsection{LimitSurfaceIntegral} surface integral ( maximum error in the identification of the limit surface location). If True, the bounding error is stored in a variable named as \xmlNode{outputName} appending the suffix - ``_err''. For example, if \xmlNode{outputName} is + ``\_err''. For example, if \xmlNode{outputName} is ``EventProbability'', the bounding error will be stored as - ``EventProbability_err'' (this variable name must be listed as + ``EventProbability\_err'' (this variable name must be listed as variable in the output DataObject). \default{False} \item \xmlNode{seed}, \xmlDesc{integer, optional field}, specifies the random number generator seed. From 7512e531b918ab1e742ee857007607faed43306a Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 16 Apr 2020 21:45:45 -0600 Subject: [PATCH 05/14] added new requirement --- doc/sqa/srs/requirements_list.xml | 3 + .../LimitSurfaceWeightedPb_dump.csv | 400 +++++++++--------- .../test_LimitSurface_with_err_bounds.xml | 8 +- 3 files changed, 207 insertions(+), 204 deletions(-) diff --git a/doc/sqa/srs/requirements_list.xml b/doc/sqa/srs/requirements_list.xml index 51ab0bb406..1601463ff2 100644 --- a/doc/sqa/srs/requirements_list.xml +++ b/doc/sqa/srs/requirements_list.xml @@ -97,6 +97,9 @@ RAVEN shall be able to compute probability of failure based on generated data and goal functions + + RAVEN shall be able to estimate the maximum (bounding) error in the computation of the probability of failure based on generated data and goal functions + diff --git a/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv index 0ff0aab7d3..cdc507e50d 100644 --- a/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv +++ b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv @@ -1,201 +1,201 @@ y0,x0,EventProbability,EventProbability_err,goalFunctionForLimitSurface -7.05613837842,1.63193506661,0.502125,0.011425,0.0 -7.05613837842,1.67929636528,0.502125,0.011425,0.0 -7.00598866187,1.72665766395,0.502125,0.011425,0.0 -6.95583894533,1.77401896262,0.502125,0.011425,0.0 -6.90568922878,1.82138026128,0.502125,0.011425,0.0 -6.85553951223,1.86874155995,0.502125,0.011425,0.0 -6.85553951223,1.91610285862,0.502125,0.011425,0.0 -6.80538979569,1.96346415729,0.502125,0.011425,0.0 -6.75524007914,2.01082545595,0.502125,0.011425,0.0 -6.70509036259,2.05818675462,0.502125,0.011425,0.0 -6.65494064604,2.10554805329,0.502125,0.011425,0.0 -6.65494064604,2.15290935196,0.502125,0.011425,0.0 -6.6047909295,2.20027065063,0.502125,0.011425,0.0 -6.55464121295,2.24763194929,0.502125,0.011425,0.0 -6.5044914964,2.29499324796,0.502125,0.011425,0.0 -6.45434177986,2.34235454663,0.502125,0.011425,0.0 -6.40419206331,2.3897158453,0.502125,0.011425,0.0 -6.40419206331,2.43707714396,0.502125,0.011425,0.0 -6.35404234676,2.48443844263,0.502125,0.011425,0.0 -6.30389263022,2.5317997413,0.502125,0.011425,0.0 -6.25374291367,2.57916103997,0.502125,0.011425,0.0 -6.20359319712,2.62652233864,0.502125,0.011425,0.0 -6.20359319712,2.6738836373,0.502125,0.011425,0.0 -6.15344348058,2.72124493597,0.502125,0.011425,0.0 -6.10329376403,2.76860623464,0.502125,0.011425,0.0 -6.05314404748,2.81596753331,0.502125,0.011425,0.0 -6.00299433094,2.86332883197,0.502125,0.011425,0.0 -6.00299433094,2.91069013064,0.502125,0.011425,0.0 -5.95284461439,2.95805142931,0.502125,0.011425,0.0 -5.90269489784,3.00541272798,0.502125,0.011425,0.0 -5.8525451813,3.05277402664,0.502125,0.011425,0.0 -5.80239546475,3.10013532531,0.502125,0.011425,0.0 -5.7522457482,3.14749662398,0.502125,0.011425,0.0 -5.7522457482,3.19485792265,0.502125,0.011425,0.0 -5.70209603166,3.24221922132,0.502125,0.011425,0.0 -5.65194631511,3.28958051998,0.502125,0.011425,0.0 -5.60179659856,3.33694181865,0.502125,0.011425,0.0 -5.55164688201,3.38430311732,0.502125,0.011425,0.0 -5.55164688201,3.43166441599,0.502125,0.011425,0.0 -5.50149716547,3.47902571465,0.502125,0.011425,0.0 -5.45134744892,3.52638701332,0.502125,0.011425,0.0 -5.40119773237,3.57374831199,0.502125,0.011425,0.0 -5.35104801583,3.62110961066,0.502125,0.011425,0.0 -5.35104801583,3.66847090933,0.502125,0.011425,0.0 -5.30089829928,3.71583220799,0.502125,0.011425,0.0 -5.25074858273,3.76319350666,0.502125,0.011425,0.0 -5.20059886619,3.81055480533,0.502125,0.011425,0.0 -5.15044914964,3.857916104,0.502125,0.011425,0.0 -5.15044914964,3.90527740266,0.502125,0.011425,0.0 -5.10029943309,3.95263870133,0.502125,0.011425,0.0 -5.05014971655,4.0,0.502125,0.011425,0.0 -5.0,4.04736129867,0.502125,0.011425,0.0 -4.94985028345,4.09472259734,0.502125,0.011425,0.0 -4.89970056691,4.142083896,0.502125,0.011425,0.0 -4.89970056691,4.18944519467,0.502125,0.011425,0.0 -4.84955085036,4.23680649334,0.502125,0.011425,0.0 -4.79940113381,4.28416779201,0.502125,0.011425,0.0 -4.74925141727,4.33152909067,0.502125,0.011425,0.0 -4.69910170072,4.37889038934,0.502125,0.011425,0.0 -4.69910170072,4.42625168801,0.502125,0.011425,0.0 -4.64895198417,4.47361298668,0.502125,0.011425,0.0 -4.59880226763,4.52097428535,0.502125,0.011425,0.0 -4.54865255108,4.56833558401,0.502125,0.011425,0.0 -4.49850283453,4.61569688268,0.502125,0.011425,0.0 -4.49850283453,4.66305818135,0.502125,0.011425,0.0 -4.44835311799,4.71041948002,0.502125,0.011425,0.0 -4.39820340144,4.75778077868,0.502125,0.011425,0.0 -4.34805368489,4.80514207735,0.502125,0.011425,0.0 -4.29790396834,4.85250337602,0.502125,0.011425,0.0 -4.2477542518,4.89986467469,0.502125,0.011425,0.0 -4.2477542518,4.94722597336,0.502125,0.011425,0.0 -4.19760453525,4.99458727202,0.502125,0.011425,0.0 -4.1474548187,5.04194857069,0.502125,0.011425,0.0 -4.09730510216,5.08930986936,0.502125,0.011425,0.0 -4.04715538561,5.13667116803,0.502125,0.011425,0.0 -4.04715538561,5.18403246669,0.502125,0.011425,0.0 -3.99700566906,5.23139376536,0.502125,0.011425,0.0 -3.94685595252,5.27875506403,0.502125,0.011425,0.0 -3.89670623597,5.3261163627,0.502125,0.011425,0.0 -3.84655651942,5.37347766136,0.502125,0.011425,0.0 -3.84655651942,5.42083896003,0.502125,0.011425,0.0 -3.79640680288,5.4682002587,0.502125,0.011425,0.0 -3.74625708633,5.51556155737,0.502125,0.011425,0.0 -3.69610736978,5.56292285604,0.502125,0.011425,0.0 -3.64595765324,5.6102841547,0.502125,0.011425,0.0 -3.64595765324,5.65764545337,0.502125,0.011425,0.0 -3.59580793669,5.70500675204,0.502125,0.011425,0.0 -3.54565822014,5.75236805071,0.502125,0.011425,0.0 -3.4955085036,5.79972934937,0.502125,0.011425,0.0 -3.44535878705,5.84709064804,0.502125,0.011425,0.0 -3.3952090705,5.89445194671,0.502125,0.011425,0.0 -3.3952090705,5.94181324538,0.502125,0.011425,0.0 -3.34505935396,5.98917454405,0.502125,0.011425,0.0 -3.29490963741,6.03653584271,0.502125,0.011425,0.0 -3.24475992086,6.08389714138,0.502125,0.011425,0.0 -3.19461020431,6.13125844005,0.502125,0.011425,0.0 -3.19461020431,6.17861973872,0.502125,0.011425,0.0 -3.14446048777,6.22598103738,0.502125,0.011425,0.0 -3.09431077122,6.27334233605,0.502125,0.011425,0.0 -3.04416105467,6.32070363472,0.502125,0.011425,0.0 -7.00598866187,1.63193506661,0.502125,0.011425,1.0 -7.00598866187,1.67929636528,0.502125,0.011425,1.0 -6.95583894533,1.72665766395,0.502125,0.011425,1.0 -6.90568922878,1.77401896262,0.502125,0.011425,1.0 -6.85553951223,1.82138026128,0.502125,0.011425,1.0 -6.80538979569,1.86874155995,0.502125,0.011425,1.0 -6.80538979569,1.91610285862,0.502125,0.011425,1.0 -6.75524007914,1.96346415729,0.502125,0.011425,1.0 -6.70509036259,2.01082545595,0.502125,0.011425,1.0 -6.65494064604,2.05818675462,0.502125,0.011425,1.0 -6.6047909295,2.10554805329,0.502125,0.011425,1.0 -6.6047909295,2.15290935196,0.502125,0.011425,1.0 -6.55464121295,2.20027065063,0.502125,0.011425,1.0 -6.5044914964,2.24763194929,0.502125,0.011425,1.0 -6.45434177986,2.29499324796,0.502125,0.011425,1.0 -6.40419206331,2.34235454663,0.502125,0.011425,1.0 -6.35404234676,2.3897158453,0.502125,0.011425,1.0 -6.35404234676,2.43707714396,0.502125,0.011425,1.0 -6.30389263022,2.48443844263,0.502125,0.011425,1.0 -6.25374291367,2.5317997413,0.502125,0.011425,1.0 -6.20359319712,2.57916103997,0.502125,0.011425,1.0 -6.15344348058,2.62652233864,0.502125,0.011425,1.0 -6.15344348058,2.6738836373,0.502125,0.011425,1.0 -6.10329376403,2.72124493597,0.502125,0.011425,1.0 -6.05314404748,2.76860623464,0.502125,0.011425,1.0 -6.00299433094,2.81596753331,0.502125,0.011425,1.0 -5.95284461439,2.86332883197,0.502125,0.011425,1.0 -5.95284461439,2.91069013064,0.502125,0.011425,1.0 -5.90269489784,2.95805142931,0.502125,0.011425,1.0 -5.8525451813,3.00541272798,0.502125,0.011425,1.0 -5.80239546475,3.05277402664,0.502125,0.011425,1.0 -5.7522457482,3.10013532531,0.502125,0.011425,1.0 -5.70209603166,3.14749662398,0.502125,0.011425,1.0 -5.70209603166,3.19485792265,0.502125,0.011425,1.0 -5.65194631511,3.24221922132,0.502125,0.011425,1.0 -5.60179659856,3.28958051998,0.502125,0.011425,1.0 -5.55164688201,3.33694181865,0.502125,0.011425,1.0 -5.50149716547,3.38430311732,0.502125,0.011425,1.0 -5.50149716547,3.43166441599,0.502125,0.011425,1.0 -5.45134744892,3.47902571465,0.502125,0.011425,1.0 -5.40119773237,3.52638701332,0.502125,0.011425,1.0 -5.35104801583,3.57374831199,0.502125,0.011425,1.0 -5.30089829928,3.62110961066,0.502125,0.011425,1.0 -5.30089829928,3.66847090933,0.502125,0.011425,1.0 -5.25074858273,3.71583220799,0.502125,0.011425,1.0 -5.20059886619,3.76319350666,0.502125,0.011425,1.0 -5.15044914964,3.81055480533,0.502125,0.011425,1.0 -5.10029943309,3.857916104,0.502125,0.011425,1.0 -5.10029943309,3.90527740266,0.502125,0.011425,1.0 -5.05014971655,3.95263870133,0.502125,0.011425,1.0 -5.0,4.0,0.502125,0.011425,1.0 -4.94985028345,4.04736129867,0.502125,0.011425,1.0 -4.89970056691,4.09472259734,0.502125,0.011425,1.0 -4.84955085036,4.142083896,0.502125,0.011425,1.0 -4.84955085036,4.18944519467,0.502125,0.011425,1.0 -4.79940113381,4.23680649334,0.502125,0.011425,1.0 -4.74925141727,4.28416779201,0.502125,0.011425,1.0 -4.69910170072,4.33152909067,0.502125,0.011425,1.0 -4.64895198417,4.37889038934,0.502125,0.011425,1.0 -4.64895198417,4.42625168801,0.502125,0.011425,1.0 -4.59880226763,4.47361298668,0.502125,0.011425,1.0 -4.54865255108,4.52097428535,0.502125,0.011425,1.0 -4.49850283453,4.56833558401,0.502125,0.011425,1.0 -4.44835311799,4.61569688268,0.502125,0.011425,1.0 -4.44835311799,4.66305818135,0.502125,0.011425,1.0 -4.39820340144,4.71041948002,0.502125,0.011425,1.0 -4.34805368489,4.75778077868,0.502125,0.011425,1.0 -4.29790396834,4.80514207735,0.502125,0.011425,1.0 -4.2477542518,4.85250337602,0.502125,0.011425,1.0 -4.19760453525,4.89986467469,0.502125,0.011425,1.0 -4.19760453525,4.94722597336,0.502125,0.011425,1.0 -4.1474548187,4.99458727202,0.502125,0.011425,1.0 -4.09730510216,5.04194857069,0.502125,0.011425,1.0 -4.04715538561,5.08930986936,0.502125,0.011425,1.0 -3.99700566906,5.13667116803,0.502125,0.011425,1.0 -3.99700566906,5.18403246669,0.502125,0.011425,1.0 -3.94685595252,5.23139376536,0.502125,0.011425,1.0 -3.89670623597,5.27875506403,0.502125,0.011425,1.0 -3.84655651942,5.3261163627,0.502125,0.011425,1.0 -3.79640680288,5.37347766136,0.502125,0.011425,1.0 -3.79640680288,5.42083896003,0.502125,0.011425,1.0 -3.74625708633,5.4682002587,0.502125,0.011425,1.0 -3.69610736978,5.51556155737,0.502125,0.011425,1.0 -3.64595765324,5.56292285604,0.502125,0.011425,1.0 -3.59580793669,5.6102841547,0.502125,0.011425,1.0 -3.59580793669,5.65764545337,0.502125,0.011425,1.0 -3.54565822014,5.70500675204,0.502125,0.011425,1.0 -3.4955085036,5.75236805071,0.502125,0.011425,1.0 -3.44535878705,5.79972934937,0.502125,0.011425,1.0 -3.3952090705,5.84709064804,0.502125,0.011425,1.0 -3.34505935396,5.89445194671,0.502125,0.011425,1.0 -3.34505935396,5.94181324538,0.502125,0.011425,1.0 -3.29490963741,5.98917454405,0.502125,0.011425,1.0 -3.24475992086,6.03653584271,0.502125,0.011425,1.0 -3.19461020431,6.08389714138,0.502125,0.011425,1.0 -3.14446048777,6.13125844005,0.502125,0.011425,1.0 -3.14446048777,6.17861973872,0.502125,0.011425,1.0 -3.09431077122,6.22598103738,0.502125,0.011425,1.0 -3.04416105467,6.27334233605,0.502125,0.011425,1.0 -2.99401133813,6.32070363472,0.502125,0.011425,1.0 +7.05613837842,1.63193506661,0.503725,0.0120375,0.0 +7.05613837842,1.67929636528,0.503725,0.0120375,0.0 +7.00598866187,1.72665766395,0.503725,0.0120375,0.0 +6.95583894533,1.77401896262,0.503725,0.0120375,0.0 +6.90568922878,1.82138026128,0.503725,0.0120375,0.0 +6.85553951223,1.86874155995,0.503725,0.0120375,0.0 +6.85553951223,1.91610285862,0.503725,0.0120375,0.0 +6.80538979569,1.96346415729,0.503725,0.0120375,0.0 +6.75524007914,2.01082545595,0.503725,0.0120375,0.0 +6.70509036259,2.05818675462,0.503725,0.0120375,0.0 +6.65494064604,2.10554805329,0.503725,0.0120375,0.0 +6.65494064604,2.15290935196,0.503725,0.0120375,0.0 +6.6047909295,2.20027065063,0.503725,0.0120375,0.0 +6.55464121295,2.24763194929,0.503725,0.0120375,0.0 +6.5044914964,2.29499324796,0.503725,0.0120375,0.0 +6.45434177986,2.34235454663,0.503725,0.0120375,0.0 +6.40419206331,2.3897158453,0.503725,0.0120375,0.0 +6.40419206331,2.43707714396,0.503725,0.0120375,0.0 +6.35404234676,2.48443844263,0.503725,0.0120375,0.0 +6.30389263022,2.5317997413,0.503725,0.0120375,0.0 +6.25374291367,2.57916103997,0.503725,0.0120375,0.0 +6.20359319712,2.62652233864,0.503725,0.0120375,0.0 +6.20359319712,2.6738836373,0.503725,0.0120375,0.0 +6.15344348058,2.72124493597,0.503725,0.0120375,0.0 +6.10329376403,2.76860623464,0.503725,0.0120375,0.0 +6.05314404748,2.81596753331,0.503725,0.0120375,0.0 +6.00299433094,2.86332883197,0.503725,0.0120375,0.0 +6.00299433094,2.91069013064,0.503725,0.0120375,0.0 +5.95284461439,2.95805142931,0.503725,0.0120375,0.0 +5.90269489784,3.00541272798,0.503725,0.0120375,0.0 +5.8525451813,3.05277402664,0.503725,0.0120375,0.0 +5.80239546475,3.10013532531,0.503725,0.0120375,0.0 +5.7522457482,3.14749662398,0.503725,0.0120375,0.0 +5.7522457482,3.19485792265,0.503725,0.0120375,0.0 +5.70209603166,3.24221922132,0.503725,0.0120375,0.0 +5.65194631511,3.28958051998,0.503725,0.0120375,0.0 +5.60179659856,3.33694181865,0.503725,0.0120375,0.0 +5.55164688201,3.38430311732,0.503725,0.0120375,0.0 +5.55164688201,3.43166441599,0.503725,0.0120375,0.0 +5.50149716547,3.47902571465,0.503725,0.0120375,0.0 +5.45134744892,3.52638701332,0.503725,0.0120375,0.0 +5.40119773237,3.57374831199,0.503725,0.0120375,0.0 +5.35104801583,3.62110961066,0.503725,0.0120375,0.0 +5.35104801583,3.66847090933,0.503725,0.0120375,0.0 +5.30089829928,3.71583220799,0.503725,0.0120375,0.0 +5.25074858273,3.76319350666,0.503725,0.0120375,0.0 +5.20059886619,3.81055480533,0.503725,0.0120375,0.0 +5.15044914964,3.857916104,0.503725,0.0120375,0.0 +5.15044914964,3.90527740266,0.503725,0.0120375,0.0 +5.10029943309,3.95263870133,0.503725,0.0120375,0.0 +5.05014971655,4.0,0.503725,0.0120375,0.0 +5.0,4.04736129867,0.503725,0.0120375,0.0 +4.94985028345,4.09472259734,0.503725,0.0120375,0.0 +4.89970056691,4.142083896,0.503725,0.0120375,0.0 +4.89970056691,4.18944519467,0.503725,0.0120375,0.0 +4.84955085036,4.23680649334,0.503725,0.0120375,0.0 +4.79940113381,4.28416779201,0.503725,0.0120375,0.0 +4.74925141727,4.33152909067,0.503725,0.0120375,0.0 +4.69910170072,4.37889038934,0.503725,0.0120375,0.0 +4.69910170072,4.42625168801,0.503725,0.0120375,0.0 +4.64895198417,4.47361298668,0.503725,0.0120375,0.0 +4.59880226763,4.52097428535,0.503725,0.0120375,0.0 +4.54865255108,4.56833558401,0.503725,0.0120375,0.0 +4.49850283453,4.61569688268,0.503725,0.0120375,0.0 +4.49850283453,4.66305818135,0.503725,0.0120375,0.0 +4.44835311799,4.71041948002,0.503725,0.0120375,0.0 +4.39820340144,4.75778077868,0.503725,0.0120375,0.0 +4.34805368489,4.80514207735,0.503725,0.0120375,0.0 +4.29790396834,4.85250337602,0.503725,0.0120375,0.0 +4.2477542518,4.89986467469,0.503725,0.0120375,0.0 +4.2477542518,4.94722597336,0.503725,0.0120375,0.0 +4.19760453525,4.99458727202,0.503725,0.0120375,0.0 +4.1474548187,5.04194857069,0.503725,0.0120375,0.0 +4.09730510216,5.08930986936,0.503725,0.0120375,0.0 +4.04715538561,5.13667116803,0.503725,0.0120375,0.0 +4.04715538561,5.18403246669,0.503725,0.0120375,0.0 +3.99700566906,5.23139376536,0.503725,0.0120375,0.0 +3.94685595252,5.27875506403,0.503725,0.0120375,0.0 +3.89670623597,5.3261163627,0.503725,0.0120375,0.0 +3.84655651942,5.37347766136,0.503725,0.0120375,0.0 +3.84655651942,5.42083896003,0.503725,0.0120375,0.0 +3.79640680288,5.4682002587,0.503725,0.0120375,0.0 +3.74625708633,5.51556155737,0.503725,0.0120375,0.0 +3.69610736978,5.56292285604,0.503725,0.0120375,0.0 +3.64595765324,5.6102841547,0.503725,0.0120375,0.0 +3.64595765324,5.65764545337,0.503725,0.0120375,0.0 +3.59580793669,5.70500675204,0.503725,0.0120375,0.0 +3.54565822014,5.75236805071,0.503725,0.0120375,0.0 +3.4955085036,5.79972934937,0.503725,0.0120375,0.0 +3.44535878705,5.84709064804,0.503725,0.0120375,0.0 +3.3952090705,5.89445194671,0.503725,0.0120375,0.0 +3.3952090705,5.94181324538,0.503725,0.0120375,0.0 +3.34505935396,5.98917454405,0.503725,0.0120375,0.0 +3.29490963741,6.03653584271,0.503725,0.0120375,0.0 +3.24475992086,6.08389714138,0.503725,0.0120375,0.0 +3.19461020431,6.13125844005,0.503725,0.0120375,0.0 +3.19461020431,6.17861973872,0.503725,0.0120375,0.0 +3.14446048777,6.22598103738,0.503725,0.0120375,0.0 +3.09431077122,6.27334233605,0.503725,0.0120375,0.0 +3.04416105467,6.32070363472,0.503725,0.0120375,0.0 +7.00598866187,1.63193506661,0.503725,0.0120375,1.0 +7.00598866187,1.67929636528,0.503725,0.0120375,1.0 +6.95583894533,1.72665766395,0.503725,0.0120375,1.0 +6.90568922878,1.77401896262,0.503725,0.0120375,1.0 +6.85553951223,1.82138026128,0.503725,0.0120375,1.0 +6.80538979569,1.86874155995,0.503725,0.0120375,1.0 +6.80538979569,1.91610285862,0.503725,0.0120375,1.0 +6.75524007914,1.96346415729,0.503725,0.0120375,1.0 +6.70509036259,2.01082545595,0.503725,0.0120375,1.0 +6.65494064604,2.05818675462,0.503725,0.0120375,1.0 +6.6047909295,2.10554805329,0.503725,0.0120375,1.0 +6.6047909295,2.15290935196,0.503725,0.0120375,1.0 +6.55464121295,2.20027065063,0.503725,0.0120375,1.0 +6.5044914964,2.24763194929,0.503725,0.0120375,1.0 +6.45434177986,2.29499324796,0.503725,0.0120375,1.0 +6.40419206331,2.34235454663,0.503725,0.0120375,1.0 +6.35404234676,2.3897158453,0.503725,0.0120375,1.0 +6.35404234676,2.43707714396,0.503725,0.0120375,1.0 +6.30389263022,2.48443844263,0.503725,0.0120375,1.0 +6.25374291367,2.5317997413,0.503725,0.0120375,1.0 +6.20359319712,2.57916103997,0.503725,0.0120375,1.0 +6.15344348058,2.62652233864,0.503725,0.0120375,1.0 +6.15344348058,2.6738836373,0.503725,0.0120375,1.0 +6.10329376403,2.72124493597,0.503725,0.0120375,1.0 +6.05314404748,2.76860623464,0.503725,0.0120375,1.0 +6.00299433094,2.81596753331,0.503725,0.0120375,1.0 +5.95284461439,2.86332883197,0.503725,0.0120375,1.0 +5.95284461439,2.91069013064,0.503725,0.0120375,1.0 +5.90269489784,2.95805142931,0.503725,0.0120375,1.0 +5.8525451813,3.00541272798,0.503725,0.0120375,1.0 +5.80239546475,3.05277402664,0.503725,0.0120375,1.0 +5.7522457482,3.10013532531,0.503725,0.0120375,1.0 +5.70209603166,3.14749662398,0.503725,0.0120375,1.0 +5.70209603166,3.19485792265,0.503725,0.0120375,1.0 +5.65194631511,3.24221922132,0.503725,0.0120375,1.0 +5.60179659856,3.28958051998,0.503725,0.0120375,1.0 +5.55164688201,3.33694181865,0.503725,0.0120375,1.0 +5.50149716547,3.38430311732,0.503725,0.0120375,1.0 +5.50149716547,3.43166441599,0.503725,0.0120375,1.0 +5.45134744892,3.47902571465,0.503725,0.0120375,1.0 +5.40119773237,3.52638701332,0.503725,0.0120375,1.0 +5.35104801583,3.57374831199,0.503725,0.0120375,1.0 +5.30089829928,3.62110961066,0.503725,0.0120375,1.0 +5.30089829928,3.66847090933,0.503725,0.0120375,1.0 +5.25074858273,3.71583220799,0.503725,0.0120375,1.0 +5.20059886619,3.76319350666,0.503725,0.0120375,1.0 +5.15044914964,3.81055480533,0.503725,0.0120375,1.0 +5.10029943309,3.857916104,0.503725,0.0120375,1.0 +5.10029943309,3.90527740266,0.503725,0.0120375,1.0 +5.05014971655,3.95263870133,0.503725,0.0120375,1.0 +5.0,4.0,0.503725,0.0120375,1.0 +4.94985028345,4.04736129867,0.503725,0.0120375,1.0 +4.89970056691,4.09472259734,0.503725,0.0120375,1.0 +4.84955085036,4.142083896,0.503725,0.0120375,1.0 +4.84955085036,4.18944519467,0.503725,0.0120375,1.0 +4.79940113381,4.23680649334,0.503725,0.0120375,1.0 +4.74925141727,4.28416779201,0.503725,0.0120375,1.0 +4.69910170072,4.33152909067,0.503725,0.0120375,1.0 +4.64895198417,4.37889038934,0.503725,0.0120375,1.0 +4.64895198417,4.42625168801,0.503725,0.0120375,1.0 +4.59880226763,4.47361298668,0.503725,0.0120375,1.0 +4.54865255108,4.52097428535,0.503725,0.0120375,1.0 +4.49850283453,4.56833558401,0.503725,0.0120375,1.0 +4.44835311799,4.61569688268,0.503725,0.0120375,1.0 +4.44835311799,4.66305818135,0.503725,0.0120375,1.0 +4.39820340144,4.71041948002,0.503725,0.0120375,1.0 +4.34805368489,4.75778077868,0.503725,0.0120375,1.0 +4.29790396834,4.80514207735,0.503725,0.0120375,1.0 +4.2477542518,4.85250337602,0.503725,0.0120375,1.0 +4.19760453525,4.89986467469,0.503725,0.0120375,1.0 +4.19760453525,4.94722597336,0.503725,0.0120375,1.0 +4.1474548187,4.99458727202,0.503725,0.0120375,1.0 +4.09730510216,5.04194857069,0.503725,0.0120375,1.0 +4.04715538561,5.08930986936,0.503725,0.0120375,1.0 +3.99700566906,5.13667116803,0.503725,0.0120375,1.0 +3.99700566906,5.18403246669,0.503725,0.0120375,1.0 +3.94685595252,5.23139376536,0.503725,0.0120375,1.0 +3.89670623597,5.27875506403,0.503725,0.0120375,1.0 +3.84655651942,5.3261163627,0.503725,0.0120375,1.0 +3.79640680288,5.37347766136,0.503725,0.0120375,1.0 +3.79640680288,5.42083896003,0.503725,0.0120375,1.0 +3.74625708633,5.4682002587,0.503725,0.0120375,1.0 +3.69610736978,5.51556155737,0.503725,0.0120375,1.0 +3.64595765324,5.56292285604,0.503725,0.0120375,1.0 +3.59580793669,5.6102841547,0.503725,0.0120375,1.0 +3.59580793669,5.65764545337,0.503725,0.0120375,1.0 +3.54565822014,5.70500675204,0.503725,0.0120375,1.0 +3.4955085036,5.75236805071,0.503725,0.0120375,1.0 +3.44535878705,5.79972934937,0.503725,0.0120375,1.0 +3.3952090705,5.84709064804,0.503725,0.0120375,1.0 +3.34505935396,5.89445194671,0.503725,0.0120375,1.0 +3.34505935396,5.94181324538,0.503725,0.0120375,1.0 +3.29490963741,5.98917454405,0.503725,0.0120375,1.0 +3.24475992086,6.03653584271,0.503725,0.0120375,1.0 +3.19461020431,6.08389714138,0.503725,0.0120375,1.0 +3.14446048777,6.13125844005,0.503725,0.0120375,1.0 +3.14446048777,6.17861973872,0.503725,0.0120375,1.0 +3.09431077122,6.22598103738,0.503725,0.0120375,1.0 +3.04416105467,6.27334233605,0.503725,0.0120375,1.0 +2.99401133813,6.32070363472,0.503725,0.0120375,1.0 diff --git a/tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml b/tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml index 4320997b08..ab36e245ec 100644 --- a/tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml +++ b/tests/framework/PostProcessors/LimitSurface/test_LimitSurface_with_err_bounds.xml @@ -1,5 +1,5 @@ - + framework/PostProcessors/LimitSurface.testLimitSurfaceIntegralPPWihtBoundingError alfoa @@ -10,9 +10,9 @@ Failure probability) reporting the bounding error as well (the maximum error, in probability, in the computation of the limit surface ) - Added test for computation of the error bound + Added test for computation of the error bound and linked to new requirement - R-RA-7 + R-RA-8 @@ -32,7 +32,7 @@ goalFunctionForLimitSurface - 0.005 + 0.0025 MonteCarlo 20021986 goalFunctionForLimitSurface From cdfec91ca8c2795e81e1f798af19d08d3faabd78 Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 16 Apr 2020 21:50:00 -0600 Subject: [PATCH 06/14] cmmented self variables --- .../MooseBasedApp/MooseBasedAppInterface.py | 2 +- .../MooseBasedApp/MooseInputParser.py | 2 +- framework/Optimizers/SimulatedAnnealing.py | 2 +- framework/PostProcessors/LimitSurfaceIntegral.py | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/framework/CodeInterfaces/MooseBasedApp/MooseBasedAppInterface.py b/framework/CodeInterfaces/MooseBasedApp/MooseBasedAppInterface.py index d6f39e49c9..be23d0732c 100644 --- a/framework/CodeInterfaces/MooseBasedApp/MooseBasedAppInterface.py +++ b/framework/CodeInterfaces/MooseBasedApp/MooseBasedAppInterface.py @@ -190,4 +190,4 @@ def dynamicEventTreeForMooseBasedApp(self,**Kwargs): @ Out, listDict, list, list of dictionaries used by the parser to change the input file """ listDict = [] - raise IOError('dynamicEventTreeForMooseBasedApp not yet implemented') \ No newline at end of file + raise IOError('dynamicEventTreeForMooseBasedApp not yet implemented') diff --git a/framework/CodeInterfaces/MooseBasedApp/MooseInputParser.py b/framework/CodeInterfaces/MooseBasedApp/MooseInputParser.py index 29f427b290..f40136275f 100644 --- a/framework/CodeInterfaces/MooseBasedApp/MooseInputParser.py +++ b/framework/CodeInterfaces/MooseBasedApp/MooseInputParser.py @@ -265,4 +265,4 @@ def findInTree(searchNode, targetPath, heritage=None): found = findInTree(sub, targetPath[1:], heritage=heritage) if found: break - return found \ No newline at end of file + return found diff --git a/framework/Optimizers/SimulatedAnnealing.py b/framework/Optimizers/SimulatedAnnealing.py index d7d5e3b547..0b40c66e3c 100644 --- a/framework/Optimizers/SimulatedAnnealing.py +++ b/framework/Optimizers/SimulatedAnnealing.py @@ -713,4 +713,4 @@ def __del__(self): @ In, None @ Out, None """ - return \ No newline at end of file + return diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 94c2aceefc..55a2e020eb 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -98,14 +98,14 @@ def __init__(self, messageHandler): self.seed = 20021986 # seed for montecarlo self.matrixDict = {} # dictionary of arrays and target self.computeErrrorBounds = False # compute the bounding error? - self.lowerUpperDict = {} - self.functionS = None - self.errorModel = None - self.computationPrefix = None + self.lowerUpperDict = {} # dictionary of lower and upper bounds (used if no distributions are inputted) + self.functionS = None # evaluation classifier for the integration + self.errorModel = None # classifier used for the error estimation + self.computationPrefix = None # output prefix for the storage of the probability and, if requested, bounding error self.stat = BasicStatistics(self.messageHandler) # instantiation of the 'BasicStatistics' processor, which is used to compute the pb given montecarlo evaluations - self.stat.what = ['expectedValue'] - self.addAssemblerObject('distribution','-n', newXmlFlg = True) - self.printTag = 'POSTPROCESSOR INTEGRAL' + self.stat.what = ['expectedValue'] # expected value calculation + self.addAssemblerObject('distribution','-n', newXmlFlg = True) # distributions are optional + self.printTag = 'POSTPROCESSOR INTEGRAL' # print tag def _localReadMoreXML(self, xmlNode): """ From d5f8bebc4a13d835a9c397465eb01e23d06e6afe Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 16 Apr 2020 22:29:12 -0600 Subject: [PATCH 07/14] considering the number of points, the error bound can be at maximum accurate to 1e-3 --- tests/framework/PostProcessors/LimitSurface/tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/framework/PostProcessors/LimitSurface/tests b/tests/framework/PostProcessors/LimitSurface/tests index 41becad838..d814c8cbfe 100644 --- a/tests/framework/PostProcessors/LimitSurface/tests +++ b/tests/framework/PostProcessors/LimitSurface/tests @@ -33,7 +33,7 @@ output = 'limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.xml' csv = 'limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv' max_time = 300 - rel_err = 0.0001 + rel_err = 0.001 [../] From 939ddc7e99e52fea336af37b3c07c734c392b2cd Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 16 Apr 2020 23:50:19 -0600 Subject: [PATCH 08/14] fixed perturbation --- .../PostProcessors/LimitSurfaceIntegral.py | 2 +- .../LimitSurfaceWeightedPb_dump.csv | 400 +++++++++--------- 2 files changed, 201 insertions(+), 201 deletions(-) diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 55a2e020eb..078ad9420d 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -211,7 +211,7 @@ def initialize(self, runInfo, inputs, initDict): modifiedMatrixDict = {} for key in self.matrixDict: modifiedMatrixDict[key] = np.concatenate((self.matrixDict[key][indecesToModifyOnes], self.matrixDict[key][indecesToModifyOnes] - * (1. + sys.float_info.epsilon * 2.))) if key != self.target else res + * (1. + 2.e-16))) if key != self.target else res self.errorModel.train(modifiedMatrixDict) for varName, distName in self.variableDist.items(): diff --git a/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv index cdc507e50d..7a3794d29b 100644 --- a/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv +++ b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv @@ -1,201 +1,201 @@ y0,x0,EventProbability,EventProbability_err,goalFunctionForLimitSurface -7.05613837842,1.63193506661,0.503725,0.0120375,0.0 -7.05613837842,1.67929636528,0.503725,0.0120375,0.0 -7.00598866187,1.72665766395,0.503725,0.0120375,0.0 -6.95583894533,1.77401896262,0.503725,0.0120375,0.0 -6.90568922878,1.82138026128,0.503725,0.0120375,0.0 -6.85553951223,1.86874155995,0.503725,0.0120375,0.0 -6.85553951223,1.91610285862,0.503725,0.0120375,0.0 -6.80538979569,1.96346415729,0.503725,0.0120375,0.0 -6.75524007914,2.01082545595,0.503725,0.0120375,0.0 -6.70509036259,2.05818675462,0.503725,0.0120375,0.0 -6.65494064604,2.10554805329,0.503725,0.0120375,0.0 -6.65494064604,2.15290935196,0.503725,0.0120375,0.0 -6.6047909295,2.20027065063,0.503725,0.0120375,0.0 -6.55464121295,2.24763194929,0.503725,0.0120375,0.0 -6.5044914964,2.29499324796,0.503725,0.0120375,0.0 -6.45434177986,2.34235454663,0.503725,0.0120375,0.0 -6.40419206331,2.3897158453,0.503725,0.0120375,0.0 -6.40419206331,2.43707714396,0.503725,0.0120375,0.0 -6.35404234676,2.48443844263,0.503725,0.0120375,0.0 -6.30389263022,2.5317997413,0.503725,0.0120375,0.0 -6.25374291367,2.57916103997,0.503725,0.0120375,0.0 -6.20359319712,2.62652233864,0.503725,0.0120375,0.0 -6.20359319712,2.6738836373,0.503725,0.0120375,0.0 -6.15344348058,2.72124493597,0.503725,0.0120375,0.0 -6.10329376403,2.76860623464,0.503725,0.0120375,0.0 -6.05314404748,2.81596753331,0.503725,0.0120375,0.0 -6.00299433094,2.86332883197,0.503725,0.0120375,0.0 -6.00299433094,2.91069013064,0.503725,0.0120375,0.0 -5.95284461439,2.95805142931,0.503725,0.0120375,0.0 -5.90269489784,3.00541272798,0.503725,0.0120375,0.0 -5.8525451813,3.05277402664,0.503725,0.0120375,0.0 -5.80239546475,3.10013532531,0.503725,0.0120375,0.0 -5.7522457482,3.14749662398,0.503725,0.0120375,0.0 -5.7522457482,3.19485792265,0.503725,0.0120375,0.0 -5.70209603166,3.24221922132,0.503725,0.0120375,0.0 -5.65194631511,3.28958051998,0.503725,0.0120375,0.0 -5.60179659856,3.33694181865,0.503725,0.0120375,0.0 -5.55164688201,3.38430311732,0.503725,0.0120375,0.0 -5.55164688201,3.43166441599,0.503725,0.0120375,0.0 -5.50149716547,3.47902571465,0.503725,0.0120375,0.0 -5.45134744892,3.52638701332,0.503725,0.0120375,0.0 -5.40119773237,3.57374831199,0.503725,0.0120375,0.0 -5.35104801583,3.62110961066,0.503725,0.0120375,0.0 -5.35104801583,3.66847090933,0.503725,0.0120375,0.0 -5.30089829928,3.71583220799,0.503725,0.0120375,0.0 -5.25074858273,3.76319350666,0.503725,0.0120375,0.0 -5.20059886619,3.81055480533,0.503725,0.0120375,0.0 -5.15044914964,3.857916104,0.503725,0.0120375,0.0 -5.15044914964,3.90527740266,0.503725,0.0120375,0.0 -5.10029943309,3.95263870133,0.503725,0.0120375,0.0 -5.05014971655,4.0,0.503725,0.0120375,0.0 -5.0,4.04736129867,0.503725,0.0120375,0.0 -4.94985028345,4.09472259734,0.503725,0.0120375,0.0 -4.89970056691,4.142083896,0.503725,0.0120375,0.0 -4.89970056691,4.18944519467,0.503725,0.0120375,0.0 -4.84955085036,4.23680649334,0.503725,0.0120375,0.0 -4.79940113381,4.28416779201,0.503725,0.0120375,0.0 -4.74925141727,4.33152909067,0.503725,0.0120375,0.0 -4.69910170072,4.37889038934,0.503725,0.0120375,0.0 -4.69910170072,4.42625168801,0.503725,0.0120375,0.0 -4.64895198417,4.47361298668,0.503725,0.0120375,0.0 -4.59880226763,4.52097428535,0.503725,0.0120375,0.0 -4.54865255108,4.56833558401,0.503725,0.0120375,0.0 -4.49850283453,4.61569688268,0.503725,0.0120375,0.0 -4.49850283453,4.66305818135,0.503725,0.0120375,0.0 -4.44835311799,4.71041948002,0.503725,0.0120375,0.0 -4.39820340144,4.75778077868,0.503725,0.0120375,0.0 -4.34805368489,4.80514207735,0.503725,0.0120375,0.0 -4.29790396834,4.85250337602,0.503725,0.0120375,0.0 -4.2477542518,4.89986467469,0.503725,0.0120375,0.0 -4.2477542518,4.94722597336,0.503725,0.0120375,0.0 -4.19760453525,4.99458727202,0.503725,0.0120375,0.0 -4.1474548187,5.04194857069,0.503725,0.0120375,0.0 -4.09730510216,5.08930986936,0.503725,0.0120375,0.0 -4.04715538561,5.13667116803,0.503725,0.0120375,0.0 -4.04715538561,5.18403246669,0.503725,0.0120375,0.0 -3.99700566906,5.23139376536,0.503725,0.0120375,0.0 -3.94685595252,5.27875506403,0.503725,0.0120375,0.0 -3.89670623597,5.3261163627,0.503725,0.0120375,0.0 -3.84655651942,5.37347766136,0.503725,0.0120375,0.0 -3.84655651942,5.42083896003,0.503725,0.0120375,0.0 -3.79640680288,5.4682002587,0.503725,0.0120375,0.0 -3.74625708633,5.51556155737,0.503725,0.0120375,0.0 -3.69610736978,5.56292285604,0.503725,0.0120375,0.0 -3.64595765324,5.6102841547,0.503725,0.0120375,0.0 -3.64595765324,5.65764545337,0.503725,0.0120375,0.0 -3.59580793669,5.70500675204,0.503725,0.0120375,0.0 -3.54565822014,5.75236805071,0.503725,0.0120375,0.0 -3.4955085036,5.79972934937,0.503725,0.0120375,0.0 -3.44535878705,5.84709064804,0.503725,0.0120375,0.0 -3.3952090705,5.89445194671,0.503725,0.0120375,0.0 -3.3952090705,5.94181324538,0.503725,0.0120375,0.0 -3.34505935396,5.98917454405,0.503725,0.0120375,0.0 -3.29490963741,6.03653584271,0.503725,0.0120375,0.0 -3.24475992086,6.08389714138,0.503725,0.0120375,0.0 -3.19461020431,6.13125844005,0.503725,0.0120375,0.0 -3.19461020431,6.17861973872,0.503725,0.0120375,0.0 -3.14446048777,6.22598103738,0.503725,0.0120375,0.0 -3.09431077122,6.27334233605,0.503725,0.0120375,0.0 -3.04416105467,6.32070363472,0.503725,0.0120375,0.0 -7.00598866187,1.63193506661,0.503725,0.0120375,1.0 -7.00598866187,1.67929636528,0.503725,0.0120375,1.0 -6.95583894533,1.72665766395,0.503725,0.0120375,1.0 -6.90568922878,1.77401896262,0.503725,0.0120375,1.0 -6.85553951223,1.82138026128,0.503725,0.0120375,1.0 -6.80538979569,1.86874155995,0.503725,0.0120375,1.0 -6.80538979569,1.91610285862,0.503725,0.0120375,1.0 -6.75524007914,1.96346415729,0.503725,0.0120375,1.0 -6.70509036259,2.01082545595,0.503725,0.0120375,1.0 -6.65494064604,2.05818675462,0.503725,0.0120375,1.0 -6.6047909295,2.10554805329,0.503725,0.0120375,1.0 -6.6047909295,2.15290935196,0.503725,0.0120375,1.0 -6.55464121295,2.20027065063,0.503725,0.0120375,1.0 -6.5044914964,2.24763194929,0.503725,0.0120375,1.0 -6.45434177986,2.29499324796,0.503725,0.0120375,1.0 -6.40419206331,2.34235454663,0.503725,0.0120375,1.0 -6.35404234676,2.3897158453,0.503725,0.0120375,1.0 -6.35404234676,2.43707714396,0.503725,0.0120375,1.0 -6.30389263022,2.48443844263,0.503725,0.0120375,1.0 -6.25374291367,2.5317997413,0.503725,0.0120375,1.0 -6.20359319712,2.57916103997,0.503725,0.0120375,1.0 -6.15344348058,2.62652233864,0.503725,0.0120375,1.0 -6.15344348058,2.6738836373,0.503725,0.0120375,1.0 -6.10329376403,2.72124493597,0.503725,0.0120375,1.0 -6.05314404748,2.76860623464,0.503725,0.0120375,1.0 -6.00299433094,2.81596753331,0.503725,0.0120375,1.0 -5.95284461439,2.86332883197,0.503725,0.0120375,1.0 -5.95284461439,2.91069013064,0.503725,0.0120375,1.0 -5.90269489784,2.95805142931,0.503725,0.0120375,1.0 -5.8525451813,3.00541272798,0.503725,0.0120375,1.0 -5.80239546475,3.05277402664,0.503725,0.0120375,1.0 -5.7522457482,3.10013532531,0.503725,0.0120375,1.0 -5.70209603166,3.14749662398,0.503725,0.0120375,1.0 -5.70209603166,3.19485792265,0.503725,0.0120375,1.0 -5.65194631511,3.24221922132,0.503725,0.0120375,1.0 -5.60179659856,3.28958051998,0.503725,0.0120375,1.0 -5.55164688201,3.33694181865,0.503725,0.0120375,1.0 -5.50149716547,3.38430311732,0.503725,0.0120375,1.0 -5.50149716547,3.43166441599,0.503725,0.0120375,1.0 -5.45134744892,3.47902571465,0.503725,0.0120375,1.0 -5.40119773237,3.52638701332,0.503725,0.0120375,1.0 -5.35104801583,3.57374831199,0.503725,0.0120375,1.0 -5.30089829928,3.62110961066,0.503725,0.0120375,1.0 -5.30089829928,3.66847090933,0.503725,0.0120375,1.0 -5.25074858273,3.71583220799,0.503725,0.0120375,1.0 -5.20059886619,3.76319350666,0.503725,0.0120375,1.0 -5.15044914964,3.81055480533,0.503725,0.0120375,1.0 -5.10029943309,3.857916104,0.503725,0.0120375,1.0 -5.10029943309,3.90527740266,0.503725,0.0120375,1.0 -5.05014971655,3.95263870133,0.503725,0.0120375,1.0 -5.0,4.0,0.503725,0.0120375,1.0 -4.94985028345,4.04736129867,0.503725,0.0120375,1.0 -4.89970056691,4.09472259734,0.503725,0.0120375,1.0 -4.84955085036,4.142083896,0.503725,0.0120375,1.0 -4.84955085036,4.18944519467,0.503725,0.0120375,1.0 -4.79940113381,4.23680649334,0.503725,0.0120375,1.0 -4.74925141727,4.28416779201,0.503725,0.0120375,1.0 -4.69910170072,4.33152909067,0.503725,0.0120375,1.0 -4.64895198417,4.37889038934,0.503725,0.0120375,1.0 -4.64895198417,4.42625168801,0.503725,0.0120375,1.0 -4.59880226763,4.47361298668,0.503725,0.0120375,1.0 -4.54865255108,4.52097428535,0.503725,0.0120375,1.0 -4.49850283453,4.56833558401,0.503725,0.0120375,1.0 -4.44835311799,4.61569688268,0.503725,0.0120375,1.0 -4.44835311799,4.66305818135,0.503725,0.0120375,1.0 -4.39820340144,4.71041948002,0.503725,0.0120375,1.0 -4.34805368489,4.75778077868,0.503725,0.0120375,1.0 -4.29790396834,4.80514207735,0.503725,0.0120375,1.0 -4.2477542518,4.85250337602,0.503725,0.0120375,1.0 -4.19760453525,4.89986467469,0.503725,0.0120375,1.0 -4.19760453525,4.94722597336,0.503725,0.0120375,1.0 -4.1474548187,4.99458727202,0.503725,0.0120375,1.0 -4.09730510216,5.04194857069,0.503725,0.0120375,1.0 -4.04715538561,5.08930986936,0.503725,0.0120375,1.0 -3.99700566906,5.13667116803,0.503725,0.0120375,1.0 -3.99700566906,5.18403246669,0.503725,0.0120375,1.0 -3.94685595252,5.23139376536,0.503725,0.0120375,1.0 -3.89670623597,5.27875506403,0.503725,0.0120375,1.0 -3.84655651942,5.3261163627,0.503725,0.0120375,1.0 -3.79640680288,5.37347766136,0.503725,0.0120375,1.0 -3.79640680288,5.42083896003,0.503725,0.0120375,1.0 -3.74625708633,5.4682002587,0.503725,0.0120375,1.0 -3.69610736978,5.51556155737,0.503725,0.0120375,1.0 -3.64595765324,5.56292285604,0.503725,0.0120375,1.0 -3.59580793669,5.6102841547,0.503725,0.0120375,1.0 -3.59580793669,5.65764545337,0.503725,0.0120375,1.0 -3.54565822014,5.70500675204,0.503725,0.0120375,1.0 -3.4955085036,5.75236805071,0.503725,0.0120375,1.0 -3.44535878705,5.79972934937,0.503725,0.0120375,1.0 -3.3952090705,5.84709064804,0.503725,0.0120375,1.0 -3.34505935396,5.89445194671,0.503725,0.0120375,1.0 -3.34505935396,5.94181324538,0.503725,0.0120375,1.0 -3.29490963741,5.98917454405,0.503725,0.0120375,1.0 -3.24475992086,6.03653584271,0.503725,0.0120375,1.0 -3.19461020431,6.08389714138,0.503725,0.0120375,1.0 -3.14446048777,6.13125844005,0.503725,0.0120375,1.0 -3.14446048777,6.17861973872,0.503725,0.0120375,1.0 -3.09431077122,6.22598103738,0.503725,0.0120375,1.0 -3.04416105467,6.27334233605,0.503725,0.0120375,1.0 -2.99401133813,6.32070363472,0.503725,0.0120375,1.0 +7.05613837842,1.63193506661,0.503725,0.0105875,0.0 +7.05613837842,1.67929636528,0.503725,0.0105875,0.0 +7.00598866187,1.72665766395,0.503725,0.0105875,0.0 +6.95583894533,1.77401896262,0.503725,0.0105875,0.0 +6.90568922878,1.82138026128,0.503725,0.0105875,0.0 +6.85553951223,1.86874155995,0.503725,0.0105875,0.0 +6.85553951223,1.91610285862,0.503725,0.0105875,0.0 +6.80538979569,1.96346415729,0.503725,0.0105875,0.0 +6.75524007914,2.01082545595,0.503725,0.0105875,0.0 +6.70509036259,2.05818675462,0.503725,0.0105875,0.0 +6.65494064604,2.10554805329,0.503725,0.0105875,0.0 +6.65494064604,2.15290935196,0.503725,0.0105875,0.0 +6.6047909295,2.20027065063,0.503725,0.0105875,0.0 +6.55464121295,2.24763194929,0.503725,0.0105875,0.0 +6.5044914964,2.29499324796,0.503725,0.0105875,0.0 +6.45434177986,2.34235454663,0.503725,0.0105875,0.0 +6.40419206331,2.3897158453,0.503725,0.0105875,0.0 +6.40419206331,2.43707714396,0.503725,0.0105875,0.0 +6.35404234676,2.48443844263,0.503725,0.0105875,0.0 +6.30389263022,2.5317997413,0.503725,0.0105875,0.0 +6.25374291367,2.57916103997,0.503725,0.0105875,0.0 +6.20359319712,2.62652233864,0.503725,0.0105875,0.0 +6.20359319712,2.6738836373,0.503725,0.0105875,0.0 +6.15344348058,2.72124493597,0.503725,0.0105875,0.0 +6.10329376403,2.76860623464,0.503725,0.0105875,0.0 +6.05314404748,2.81596753331,0.503725,0.0105875,0.0 +6.00299433094,2.86332883197,0.503725,0.0105875,0.0 +6.00299433094,2.91069013064,0.503725,0.0105875,0.0 +5.95284461439,2.95805142931,0.503725,0.0105875,0.0 +5.90269489784,3.00541272798,0.503725,0.0105875,0.0 +5.8525451813,3.05277402664,0.503725,0.0105875,0.0 +5.80239546475,3.10013532531,0.503725,0.0105875,0.0 +5.7522457482,3.14749662398,0.503725,0.0105875,0.0 +5.7522457482,3.19485792265,0.503725,0.0105875,0.0 +5.70209603166,3.24221922132,0.503725,0.0105875,0.0 +5.65194631511,3.28958051998,0.503725,0.0105875,0.0 +5.60179659856,3.33694181865,0.503725,0.0105875,0.0 +5.55164688201,3.38430311732,0.503725,0.0105875,0.0 +5.55164688201,3.43166441599,0.503725,0.0105875,0.0 +5.50149716547,3.47902571465,0.503725,0.0105875,0.0 +5.45134744892,3.52638701332,0.503725,0.0105875,0.0 +5.40119773237,3.57374831199,0.503725,0.0105875,0.0 +5.35104801583,3.62110961066,0.503725,0.0105875,0.0 +5.35104801583,3.66847090933,0.503725,0.0105875,0.0 +5.30089829928,3.71583220799,0.503725,0.0105875,0.0 +5.25074858273,3.76319350666,0.503725,0.0105875,0.0 +5.20059886619,3.81055480533,0.503725,0.0105875,0.0 +5.15044914964,3.857916104,0.503725,0.0105875,0.0 +5.15044914964,3.90527740266,0.503725,0.0105875,0.0 +5.10029943309,3.95263870133,0.503725,0.0105875,0.0 +5.05014971655,4.0,0.503725,0.0105875,0.0 +5.0,4.04736129867,0.503725,0.0105875,0.0 +4.94985028345,4.09472259734,0.503725,0.0105875,0.0 +4.89970056691,4.142083896,0.503725,0.0105875,0.0 +4.89970056691,4.18944519467,0.503725,0.0105875,0.0 +4.84955085036,4.23680649334,0.503725,0.0105875,0.0 +4.79940113381,4.28416779201,0.503725,0.0105875,0.0 +4.74925141727,4.33152909067,0.503725,0.0105875,0.0 +4.69910170072,4.37889038934,0.503725,0.0105875,0.0 +4.69910170072,4.42625168801,0.503725,0.0105875,0.0 +4.64895198417,4.47361298668,0.503725,0.0105875,0.0 +4.59880226763,4.52097428535,0.503725,0.0105875,0.0 +4.54865255108,4.56833558401,0.503725,0.0105875,0.0 +4.49850283453,4.61569688268,0.503725,0.0105875,0.0 +4.49850283453,4.66305818135,0.503725,0.0105875,0.0 +4.44835311799,4.71041948002,0.503725,0.0105875,0.0 +4.39820340144,4.75778077868,0.503725,0.0105875,0.0 +4.34805368489,4.80514207735,0.503725,0.0105875,0.0 +4.29790396834,4.85250337602,0.503725,0.0105875,0.0 +4.2477542518,4.89986467469,0.503725,0.0105875,0.0 +4.2477542518,4.94722597336,0.503725,0.0105875,0.0 +4.19760453525,4.99458727202,0.503725,0.0105875,0.0 +4.1474548187,5.04194857069,0.503725,0.0105875,0.0 +4.09730510216,5.08930986936,0.503725,0.0105875,0.0 +4.04715538561,5.13667116803,0.503725,0.0105875,0.0 +4.04715538561,5.18403246669,0.503725,0.0105875,0.0 +3.99700566906,5.23139376536,0.503725,0.0105875,0.0 +3.94685595252,5.27875506403,0.503725,0.0105875,0.0 +3.89670623597,5.3261163627,0.503725,0.0105875,0.0 +3.84655651942,5.37347766136,0.503725,0.0105875,0.0 +3.84655651942,5.42083896003,0.503725,0.0105875,0.0 +3.79640680288,5.4682002587,0.503725,0.0105875,0.0 +3.74625708633,5.51556155737,0.503725,0.0105875,0.0 +3.69610736978,5.56292285604,0.503725,0.0105875,0.0 +3.64595765324,5.6102841547,0.503725,0.0105875,0.0 +3.64595765324,5.65764545337,0.503725,0.0105875,0.0 +3.59580793669,5.70500675204,0.503725,0.0105875,0.0 +3.54565822014,5.75236805071,0.503725,0.0105875,0.0 +3.4955085036,5.79972934937,0.503725,0.0105875,0.0 +3.44535878705,5.84709064804,0.503725,0.0105875,0.0 +3.3952090705,5.89445194671,0.503725,0.0105875,0.0 +3.3952090705,5.94181324538,0.503725,0.0105875,0.0 +3.34505935396,5.98917454405,0.503725,0.0105875,0.0 +3.29490963741,6.03653584271,0.503725,0.0105875,0.0 +3.24475992086,6.08389714138,0.503725,0.0105875,0.0 +3.19461020431,6.13125844005,0.503725,0.0105875,0.0 +3.19461020431,6.17861973872,0.503725,0.0105875,0.0 +3.14446048777,6.22598103738,0.503725,0.0105875,0.0 +3.09431077122,6.27334233605,0.503725,0.0105875,0.0 +3.04416105467,6.32070363472,0.503725,0.0105875,0.0 +7.00598866187,1.63193506661,0.503725,0.0105875,1.0 +7.00598866187,1.67929636528,0.503725,0.0105875,1.0 +6.95583894533,1.72665766395,0.503725,0.0105875,1.0 +6.90568922878,1.77401896262,0.503725,0.0105875,1.0 +6.85553951223,1.82138026128,0.503725,0.0105875,1.0 +6.80538979569,1.86874155995,0.503725,0.0105875,1.0 +6.80538979569,1.91610285862,0.503725,0.0105875,1.0 +6.75524007914,1.96346415729,0.503725,0.0105875,1.0 +6.70509036259,2.01082545595,0.503725,0.0105875,1.0 +6.65494064604,2.05818675462,0.503725,0.0105875,1.0 +6.6047909295,2.10554805329,0.503725,0.0105875,1.0 +6.6047909295,2.15290935196,0.503725,0.0105875,1.0 +6.55464121295,2.20027065063,0.503725,0.0105875,1.0 +6.5044914964,2.24763194929,0.503725,0.0105875,1.0 +6.45434177986,2.29499324796,0.503725,0.0105875,1.0 +6.40419206331,2.34235454663,0.503725,0.0105875,1.0 +6.35404234676,2.3897158453,0.503725,0.0105875,1.0 +6.35404234676,2.43707714396,0.503725,0.0105875,1.0 +6.30389263022,2.48443844263,0.503725,0.0105875,1.0 +6.25374291367,2.5317997413,0.503725,0.0105875,1.0 +6.20359319712,2.57916103997,0.503725,0.0105875,1.0 +6.15344348058,2.62652233864,0.503725,0.0105875,1.0 +6.15344348058,2.6738836373,0.503725,0.0105875,1.0 +6.10329376403,2.72124493597,0.503725,0.0105875,1.0 +6.05314404748,2.76860623464,0.503725,0.0105875,1.0 +6.00299433094,2.81596753331,0.503725,0.0105875,1.0 +5.95284461439,2.86332883197,0.503725,0.0105875,1.0 +5.95284461439,2.91069013064,0.503725,0.0105875,1.0 +5.90269489784,2.95805142931,0.503725,0.0105875,1.0 +5.8525451813,3.00541272798,0.503725,0.0105875,1.0 +5.80239546475,3.05277402664,0.503725,0.0105875,1.0 +5.7522457482,3.10013532531,0.503725,0.0105875,1.0 +5.70209603166,3.14749662398,0.503725,0.0105875,1.0 +5.70209603166,3.19485792265,0.503725,0.0105875,1.0 +5.65194631511,3.24221922132,0.503725,0.0105875,1.0 +5.60179659856,3.28958051998,0.503725,0.0105875,1.0 +5.55164688201,3.33694181865,0.503725,0.0105875,1.0 +5.50149716547,3.38430311732,0.503725,0.0105875,1.0 +5.50149716547,3.43166441599,0.503725,0.0105875,1.0 +5.45134744892,3.47902571465,0.503725,0.0105875,1.0 +5.40119773237,3.52638701332,0.503725,0.0105875,1.0 +5.35104801583,3.57374831199,0.503725,0.0105875,1.0 +5.30089829928,3.62110961066,0.503725,0.0105875,1.0 +5.30089829928,3.66847090933,0.503725,0.0105875,1.0 +5.25074858273,3.71583220799,0.503725,0.0105875,1.0 +5.20059886619,3.76319350666,0.503725,0.0105875,1.0 +5.15044914964,3.81055480533,0.503725,0.0105875,1.0 +5.10029943309,3.857916104,0.503725,0.0105875,1.0 +5.10029943309,3.90527740266,0.503725,0.0105875,1.0 +5.05014971655,3.95263870133,0.503725,0.0105875,1.0 +5.0,4.0,0.503725,0.0105875,1.0 +4.94985028345,4.04736129867,0.503725,0.0105875,1.0 +4.89970056691,4.09472259734,0.503725,0.0105875,1.0 +4.84955085036,4.142083896,0.503725,0.0105875,1.0 +4.84955085036,4.18944519467,0.503725,0.0105875,1.0 +4.79940113381,4.23680649334,0.503725,0.0105875,1.0 +4.74925141727,4.28416779201,0.503725,0.0105875,1.0 +4.69910170072,4.33152909067,0.503725,0.0105875,1.0 +4.64895198417,4.37889038934,0.503725,0.0105875,1.0 +4.64895198417,4.42625168801,0.503725,0.0105875,1.0 +4.59880226763,4.47361298668,0.503725,0.0105875,1.0 +4.54865255108,4.52097428535,0.503725,0.0105875,1.0 +4.49850283453,4.56833558401,0.503725,0.0105875,1.0 +4.44835311799,4.61569688268,0.503725,0.0105875,1.0 +4.44835311799,4.66305818135,0.503725,0.0105875,1.0 +4.39820340144,4.71041948002,0.503725,0.0105875,1.0 +4.34805368489,4.75778077868,0.503725,0.0105875,1.0 +4.29790396834,4.80514207735,0.503725,0.0105875,1.0 +4.2477542518,4.85250337602,0.503725,0.0105875,1.0 +4.19760453525,4.89986467469,0.503725,0.0105875,1.0 +4.19760453525,4.94722597336,0.503725,0.0105875,1.0 +4.1474548187,4.99458727202,0.503725,0.0105875,1.0 +4.09730510216,5.04194857069,0.503725,0.0105875,1.0 +4.04715538561,5.08930986936,0.503725,0.0105875,1.0 +3.99700566906,5.13667116803,0.503725,0.0105875,1.0 +3.99700566906,5.18403246669,0.503725,0.0105875,1.0 +3.94685595252,5.23139376536,0.503725,0.0105875,1.0 +3.89670623597,5.27875506403,0.503725,0.0105875,1.0 +3.84655651942,5.3261163627,0.503725,0.0105875,1.0 +3.79640680288,5.37347766136,0.503725,0.0105875,1.0 +3.79640680288,5.42083896003,0.503725,0.0105875,1.0 +3.74625708633,5.4682002587,0.503725,0.0105875,1.0 +3.69610736978,5.51556155737,0.503725,0.0105875,1.0 +3.64595765324,5.56292285604,0.503725,0.0105875,1.0 +3.59580793669,5.6102841547,0.503725,0.0105875,1.0 +3.59580793669,5.65764545337,0.503725,0.0105875,1.0 +3.54565822014,5.70500675204,0.503725,0.0105875,1.0 +3.4955085036,5.75236805071,0.503725,0.0105875,1.0 +3.44535878705,5.79972934937,0.503725,0.0105875,1.0 +3.3952090705,5.84709064804,0.503725,0.0105875,1.0 +3.34505935396,5.89445194671,0.503725,0.0105875,1.0 +3.34505935396,5.94181324538,0.503725,0.0105875,1.0 +3.29490963741,5.98917454405,0.503725,0.0105875,1.0 +3.24475992086,6.03653584271,0.503725,0.0105875,1.0 +3.19461020431,6.08389714138,0.503725,0.0105875,1.0 +3.14446048777,6.13125844005,0.503725,0.0105875,1.0 +3.14446048777,6.17861973872,0.503725,0.0105875,1.0 +3.09431077122,6.22598103738,0.503725,0.0105875,1.0 +3.04416105467,6.27334233605,0.503725,0.0105875,1.0 +2.99401133813,6.32070363472,0.503725,0.0105875,1.0 From f9e14fa9dabb11c74d90da990f3f42b927972a43 Mon Sep 17 00:00:00 2001 From: alfoa Date: Mon, 20 Apr 2020 17:36:18 -0600 Subject: [PATCH 09/14] debug prints --- framework/PostProcessors/LimitSurfaceIntegral.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 078ad9420d..e054b199c6 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -212,6 +212,9 @@ def initialize(self, runInfo, inputs, initDict): for key in self.matrixDict: modifiedMatrixDict[key] = np.concatenate((self.matrixDict[key][indecesToModifyOnes], self.matrixDict[key][indecesToModifyOnes] * (1. + 2.e-16))) if key != self.target else res + print("DEBUG ****** key:", key) + for el in modifiedMatrixDict[key]: + print(el) self.errorModel.train(modifiedMatrixDict) for varName, distName in self.variableDist.items(): @@ -270,7 +273,12 @@ def run(self, input): tempDict[varName] = randomMatrix[:, index] pb = self.stat.run({'targets':{self.target:xarray.DataArray(self.functionS.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target] if self.errorModel: - boundError = abs(pb-self.stat.run({'targets':{self.target:xarray.DataArray(self.errorModel.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target]) + + print("DEBUG *****: EVALUATION") + eval = self.errorModel.evaluate(tempDict)[self.target] + for el in self.errorModel.evaluate(tempDict)[self.target]: + print(el) + boundError = abs(pb-self.stat.run({'targets':{self.target:xarray.DataArray(eval)}})[self.computationPrefix +"_"+self.target]) else: self.raiseAnError(NotImplemented, "quadrature not yet implemented") return pb, boundError From 2ff389edde5a85415f18e6825904c8dad45b5d8a Mon Sep 17 00:00:00 2001 From: alfoa Date: Mon, 20 Apr 2020 17:49:51 -0600 Subject: [PATCH 10/14] mkdirs --- framework/Databases.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/Databases.py b/framework/Databases.py index 882f6b17e7..37ad8cadef 100644 --- a/framework/Databases.py +++ b/framework/Databases.py @@ -92,8 +92,8 @@ def _handleInput(self, paramInput): self.raiseADebug('HDF5 Read Mode is "'+self.readMode+'".') if self.readMode == 'overwrite': # check if self.databaseDir exists or create in case not - if not os.path.exists(self.databaseDir): - os.mkdir(self.databaseDir) + if not os.path.isdir(self.databaseDir): + os.makedirs(self.databaseDir, exist_ok=True) # get full path fullpath = os.path.join(self.databaseDir,self.filename) if os.path.isfile(fullpath): From 01e1cd3be3e9fb852d2206f90dea4aa3f0403dfe Mon Sep 17 00:00:00 2001 From: alfoa Date: Mon, 20 Apr 2020 18:00:02 -0600 Subject: [PATCH 11/14] debug remove trailing --- framework/PostProcessors/LimitSurfaceIntegral.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index e054b199c6..e6e40922aa 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -273,7 +273,7 @@ def run(self, input): tempDict[varName] = randomMatrix[:, index] pb = self.stat.run({'targets':{self.target:xarray.DataArray(self.functionS.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target] if self.errorModel: - + print("DEBUG *****: EVALUATION") eval = self.errorModel.evaluate(tempDict)[self.target] for el in self.errorModel.evaluate(tempDict)[self.target]: From 6bbb559e90b33f388add828afc237cff58ac64f6 Mon Sep 17 00:00:00 2001 From: alfoa Date: Mon, 20 Apr 2020 19:28:39 -0600 Subject: [PATCH 12/14] more debug? --- framework/PostProcessors/LimitSurfaceIntegral.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index e6e40922aa..932a718054 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -276,8 +276,8 @@ def run(self, input): print("DEBUG *****: EVALUATION") eval = self.errorModel.evaluate(tempDict)[self.target] - for el in self.errorModel.evaluate(tempDict)[self.target]: - print(el) + print(len(eval)) + print(randomMatrix[:, 0].shape) boundError = abs(pb-self.stat.run({'targets':{self.target:xarray.DataArray(eval)}})[self.computationPrefix +"_"+self.target]) else: self.raiseAnError(NotImplemented, "quadrature not yet implemented") From eca987052feb9079a7e0089f0496f2defa3957fd Mon Sep 17 00:00:00 2001 From: alfoa Date: Tue, 21 Apr 2020 10:50:09 -0600 Subject: [PATCH 13/14] additional debug --- framework/PostProcessors/LimitSurfaceIntegral.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 932a718054..42bcdbdf9a 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -210,8 +210,9 @@ def initialize(self, runInfo, inputs, initDict): res = np.concatenate((np.ones(len(indecesToModifyOnes)), np.zeros(len(indecesToModifyOnes)))) modifiedMatrixDict = {} for key in self.matrixDict: + avg = np.average(self.matrixDict[key][indecesToModifyOnes]) modifiedMatrixDict[key] = np.concatenate((self.matrixDict[key][indecesToModifyOnes], self.matrixDict[key][indecesToModifyOnes] - * (1. + 2.e-16))) if key != self.target else res + * avg * (1. + 2.e-16))) if key != self.target else res print("DEBUG ****** key:", key) for el in modifiedMatrixDict[key]: print(el) From 8c4ebbfbcccf1178ca7d3a79ace8a9393a65f47b Mon Sep 17 00:00:00 2001 From: alfoa Date: Tue, 21 Apr 2020 11:21:27 -0600 Subject: [PATCH 14/14] removed debug printing --- .../PostProcessors/LimitSurfaceIntegral.py | 12 +- .../LimitSurfaceWeightedPb_dump.csv | 400 +++++++++--------- 2 files changed, 202 insertions(+), 210 deletions(-) diff --git a/framework/PostProcessors/LimitSurfaceIntegral.py b/framework/PostProcessors/LimitSurfaceIntegral.py index 42bcdbdf9a..2f64d6790c 100644 --- a/framework/PostProcessors/LimitSurfaceIntegral.py +++ b/framework/PostProcessors/LimitSurfaceIntegral.py @@ -212,10 +212,7 @@ def initialize(self, runInfo, inputs, initDict): for key in self.matrixDict: avg = np.average(self.matrixDict[key][indecesToModifyOnes]) modifiedMatrixDict[key] = np.concatenate((self.matrixDict[key][indecesToModifyOnes], self.matrixDict[key][indecesToModifyOnes] - * avg * (1. + 2.e-16))) if key != self.target else res - print("DEBUG ****** key:", key) - for el in modifiedMatrixDict[key]: - print(el) + + (self.matrixDict[key][indecesToModifyOnes]/avg * 1.e-14))) if key != self.target else res self.errorModel.train(modifiedMatrixDict) for varName, distName in self.variableDist.items(): @@ -274,12 +271,7 @@ def run(self, input): tempDict[varName] = randomMatrix[:, index] pb = self.stat.run({'targets':{self.target:xarray.DataArray(self.functionS.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target] if self.errorModel: - - print("DEBUG *****: EVALUATION") - eval = self.errorModel.evaluate(tempDict)[self.target] - print(len(eval)) - print(randomMatrix[:, 0].shape) - boundError = abs(pb-self.stat.run({'targets':{self.target:xarray.DataArray(eval)}})[self.computationPrefix +"_"+self.target]) + boundError = abs(pb-self.stat.run({'targets':{self.target:xarray.DataArray(self.errorModel.evaluate(tempDict)[self.target])}})[self.computationPrefix +"_"+self.target]) else: self.raiseAnError(NotImplemented, "quadrature not yet implemented") return pb, boundError diff --git a/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv index 7a3794d29b..75ba0c3b2e 100644 --- a/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv +++ b/tests/framework/PostProcessors/LimitSurface/gold/limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv @@ -1,201 +1,201 @@ y0,x0,EventProbability,EventProbability_err,goalFunctionForLimitSurface -7.05613837842,1.63193506661,0.503725,0.0105875,0.0 -7.05613837842,1.67929636528,0.503725,0.0105875,0.0 -7.00598866187,1.72665766395,0.503725,0.0105875,0.0 -6.95583894533,1.77401896262,0.503725,0.0105875,0.0 -6.90568922878,1.82138026128,0.503725,0.0105875,0.0 -6.85553951223,1.86874155995,0.503725,0.0105875,0.0 -6.85553951223,1.91610285862,0.503725,0.0105875,0.0 -6.80538979569,1.96346415729,0.503725,0.0105875,0.0 -6.75524007914,2.01082545595,0.503725,0.0105875,0.0 -6.70509036259,2.05818675462,0.503725,0.0105875,0.0 -6.65494064604,2.10554805329,0.503725,0.0105875,0.0 -6.65494064604,2.15290935196,0.503725,0.0105875,0.0 -6.6047909295,2.20027065063,0.503725,0.0105875,0.0 -6.55464121295,2.24763194929,0.503725,0.0105875,0.0 -6.5044914964,2.29499324796,0.503725,0.0105875,0.0 -6.45434177986,2.34235454663,0.503725,0.0105875,0.0 -6.40419206331,2.3897158453,0.503725,0.0105875,0.0 -6.40419206331,2.43707714396,0.503725,0.0105875,0.0 -6.35404234676,2.48443844263,0.503725,0.0105875,0.0 -6.30389263022,2.5317997413,0.503725,0.0105875,0.0 -6.25374291367,2.57916103997,0.503725,0.0105875,0.0 -6.20359319712,2.62652233864,0.503725,0.0105875,0.0 -6.20359319712,2.6738836373,0.503725,0.0105875,0.0 -6.15344348058,2.72124493597,0.503725,0.0105875,0.0 -6.10329376403,2.76860623464,0.503725,0.0105875,0.0 -6.05314404748,2.81596753331,0.503725,0.0105875,0.0 -6.00299433094,2.86332883197,0.503725,0.0105875,0.0 -6.00299433094,2.91069013064,0.503725,0.0105875,0.0 -5.95284461439,2.95805142931,0.503725,0.0105875,0.0 -5.90269489784,3.00541272798,0.503725,0.0105875,0.0 -5.8525451813,3.05277402664,0.503725,0.0105875,0.0 -5.80239546475,3.10013532531,0.503725,0.0105875,0.0 -5.7522457482,3.14749662398,0.503725,0.0105875,0.0 -5.7522457482,3.19485792265,0.503725,0.0105875,0.0 -5.70209603166,3.24221922132,0.503725,0.0105875,0.0 -5.65194631511,3.28958051998,0.503725,0.0105875,0.0 -5.60179659856,3.33694181865,0.503725,0.0105875,0.0 -5.55164688201,3.38430311732,0.503725,0.0105875,0.0 -5.55164688201,3.43166441599,0.503725,0.0105875,0.0 -5.50149716547,3.47902571465,0.503725,0.0105875,0.0 -5.45134744892,3.52638701332,0.503725,0.0105875,0.0 -5.40119773237,3.57374831199,0.503725,0.0105875,0.0 -5.35104801583,3.62110961066,0.503725,0.0105875,0.0 -5.35104801583,3.66847090933,0.503725,0.0105875,0.0 -5.30089829928,3.71583220799,0.503725,0.0105875,0.0 -5.25074858273,3.76319350666,0.503725,0.0105875,0.0 -5.20059886619,3.81055480533,0.503725,0.0105875,0.0 -5.15044914964,3.857916104,0.503725,0.0105875,0.0 -5.15044914964,3.90527740266,0.503725,0.0105875,0.0 -5.10029943309,3.95263870133,0.503725,0.0105875,0.0 -5.05014971655,4.0,0.503725,0.0105875,0.0 -5.0,4.04736129867,0.503725,0.0105875,0.0 -4.94985028345,4.09472259734,0.503725,0.0105875,0.0 -4.89970056691,4.142083896,0.503725,0.0105875,0.0 -4.89970056691,4.18944519467,0.503725,0.0105875,0.0 -4.84955085036,4.23680649334,0.503725,0.0105875,0.0 -4.79940113381,4.28416779201,0.503725,0.0105875,0.0 -4.74925141727,4.33152909067,0.503725,0.0105875,0.0 -4.69910170072,4.37889038934,0.503725,0.0105875,0.0 -4.69910170072,4.42625168801,0.503725,0.0105875,0.0 -4.64895198417,4.47361298668,0.503725,0.0105875,0.0 -4.59880226763,4.52097428535,0.503725,0.0105875,0.0 -4.54865255108,4.56833558401,0.503725,0.0105875,0.0 -4.49850283453,4.61569688268,0.503725,0.0105875,0.0 -4.49850283453,4.66305818135,0.503725,0.0105875,0.0 -4.44835311799,4.71041948002,0.503725,0.0105875,0.0 -4.39820340144,4.75778077868,0.503725,0.0105875,0.0 -4.34805368489,4.80514207735,0.503725,0.0105875,0.0 -4.29790396834,4.85250337602,0.503725,0.0105875,0.0 -4.2477542518,4.89986467469,0.503725,0.0105875,0.0 -4.2477542518,4.94722597336,0.503725,0.0105875,0.0 -4.19760453525,4.99458727202,0.503725,0.0105875,0.0 -4.1474548187,5.04194857069,0.503725,0.0105875,0.0 -4.09730510216,5.08930986936,0.503725,0.0105875,0.0 -4.04715538561,5.13667116803,0.503725,0.0105875,0.0 -4.04715538561,5.18403246669,0.503725,0.0105875,0.0 -3.99700566906,5.23139376536,0.503725,0.0105875,0.0 -3.94685595252,5.27875506403,0.503725,0.0105875,0.0 -3.89670623597,5.3261163627,0.503725,0.0105875,0.0 -3.84655651942,5.37347766136,0.503725,0.0105875,0.0 -3.84655651942,5.42083896003,0.503725,0.0105875,0.0 -3.79640680288,5.4682002587,0.503725,0.0105875,0.0 -3.74625708633,5.51556155737,0.503725,0.0105875,0.0 -3.69610736978,5.56292285604,0.503725,0.0105875,0.0 -3.64595765324,5.6102841547,0.503725,0.0105875,0.0 -3.64595765324,5.65764545337,0.503725,0.0105875,0.0 -3.59580793669,5.70500675204,0.503725,0.0105875,0.0 -3.54565822014,5.75236805071,0.503725,0.0105875,0.0 -3.4955085036,5.79972934937,0.503725,0.0105875,0.0 -3.44535878705,5.84709064804,0.503725,0.0105875,0.0 -3.3952090705,5.89445194671,0.503725,0.0105875,0.0 -3.3952090705,5.94181324538,0.503725,0.0105875,0.0 -3.34505935396,5.98917454405,0.503725,0.0105875,0.0 -3.29490963741,6.03653584271,0.503725,0.0105875,0.0 -3.24475992086,6.08389714138,0.503725,0.0105875,0.0 -3.19461020431,6.13125844005,0.503725,0.0105875,0.0 -3.19461020431,6.17861973872,0.503725,0.0105875,0.0 -3.14446048777,6.22598103738,0.503725,0.0105875,0.0 -3.09431077122,6.27334233605,0.503725,0.0105875,0.0 -3.04416105467,6.32070363472,0.503725,0.0105875,0.0 -7.00598866187,1.63193506661,0.503725,0.0105875,1.0 -7.00598866187,1.67929636528,0.503725,0.0105875,1.0 -6.95583894533,1.72665766395,0.503725,0.0105875,1.0 -6.90568922878,1.77401896262,0.503725,0.0105875,1.0 -6.85553951223,1.82138026128,0.503725,0.0105875,1.0 -6.80538979569,1.86874155995,0.503725,0.0105875,1.0 -6.80538979569,1.91610285862,0.503725,0.0105875,1.0 -6.75524007914,1.96346415729,0.503725,0.0105875,1.0 -6.70509036259,2.01082545595,0.503725,0.0105875,1.0 -6.65494064604,2.05818675462,0.503725,0.0105875,1.0 -6.6047909295,2.10554805329,0.503725,0.0105875,1.0 -6.6047909295,2.15290935196,0.503725,0.0105875,1.0 -6.55464121295,2.20027065063,0.503725,0.0105875,1.0 -6.5044914964,2.24763194929,0.503725,0.0105875,1.0 -6.45434177986,2.29499324796,0.503725,0.0105875,1.0 -6.40419206331,2.34235454663,0.503725,0.0105875,1.0 -6.35404234676,2.3897158453,0.503725,0.0105875,1.0 -6.35404234676,2.43707714396,0.503725,0.0105875,1.0 -6.30389263022,2.48443844263,0.503725,0.0105875,1.0 -6.25374291367,2.5317997413,0.503725,0.0105875,1.0 -6.20359319712,2.57916103997,0.503725,0.0105875,1.0 -6.15344348058,2.62652233864,0.503725,0.0105875,1.0 -6.15344348058,2.6738836373,0.503725,0.0105875,1.0 -6.10329376403,2.72124493597,0.503725,0.0105875,1.0 -6.05314404748,2.76860623464,0.503725,0.0105875,1.0 -6.00299433094,2.81596753331,0.503725,0.0105875,1.0 -5.95284461439,2.86332883197,0.503725,0.0105875,1.0 -5.95284461439,2.91069013064,0.503725,0.0105875,1.0 -5.90269489784,2.95805142931,0.503725,0.0105875,1.0 -5.8525451813,3.00541272798,0.503725,0.0105875,1.0 -5.80239546475,3.05277402664,0.503725,0.0105875,1.0 -5.7522457482,3.10013532531,0.503725,0.0105875,1.0 -5.70209603166,3.14749662398,0.503725,0.0105875,1.0 -5.70209603166,3.19485792265,0.503725,0.0105875,1.0 -5.65194631511,3.24221922132,0.503725,0.0105875,1.0 -5.60179659856,3.28958051998,0.503725,0.0105875,1.0 -5.55164688201,3.33694181865,0.503725,0.0105875,1.0 -5.50149716547,3.38430311732,0.503725,0.0105875,1.0 -5.50149716547,3.43166441599,0.503725,0.0105875,1.0 -5.45134744892,3.47902571465,0.503725,0.0105875,1.0 -5.40119773237,3.52638701332,0.503725,0.0105875,1.0 -5.35104801583,3.57374831199,0.503725,0.0105875,1.0 -5.30089829928,3.62110961066,0.503725,0.0105875,1.0 -5.30089829928,3.66847090933,0.503725,0.0105875,1.0 -5.25074858273,3.71583220799,0.503725,0.0105875,1.0 -5.20059886619,3.76319350666,0.503725,0.0105875,1.0 -5.15044914964,3.81055480533,0.503725,0.0105875,1.0 -5.10029943309,3.857916104,0.503725,0.0105875,1.0 -5.10029943309,3.90527740266,0.503725,0.0105875,1.0 -5.05014971655,3.95263870133,0.503725,0.0105875,1.0 -5.0,4.0,0.503725,0.0105875,1.0 -4.94985028345,4.04736129867,0.503725,0.0105875,1.0 -4.89970056691,4.09472259734,0.503725,0.0105875,1.0 -4.84955085036,4.142083896,0.503725,0.0105875,1.0 -4.84955085036,4.18944519467,0.503725,0.0105875,1.0 -4.79940113381,4.23680649334,0.503725,0.0105875,1.0 -4.74925141727,4.28416779201,0.503725,0.0105875,1.0 -4.69910170072,4.33152909067,0.503725,0.0105875,1.0 -4.64895198417,4.37889038934,0.503725,0.0105875,1.0 -4.64895198417,4.42625168801,0.503725,0.0105875,1.0 -4.59880226763,4.47361298668,0.503725,0.0105875,1.0 -4.54865255108,4.52097428535,0.503725,0.0105875,1.0 -4.49850283453,4.56833558401,0.503725,0.0105875,1.0 -4.44835311799,4.61569688268,0.503725,0.0105875,1.0 -4.44835311799,4.66305818135,0.503725,0.0105875,1.0 -4.39820340144,4.71041948002,0.503725,0.0105875,1.0 -4.34805368489,4.75778077868,0.503725,0.0105875,1.0 -4.29790396834,4.80514207735,0.503725,0.0105875,1.0 -4.2477542518,4.85250337602,0.503725,0.0105875,1.0 -4.19760453525,4.89986467469,0.503725,0.0105875,1.0 -4.19760453525,4.94722597336,0.503725,0.0105875,1.0 -4.1474548187,4.99458727202,0.503725,0.0105875,1.0 -4.09730510216,5.04194857069,0.503725,0.0105875,1.0 -4.04715538561,5.08930986936,0.503725,0.0105875,1.0 -3.99700566906,5.13667116803,0.503725,0.0105875,1.0 -3.99700566906,5.18403246669,0.503725,0.0105875,1.0 -3.94685595252,5.23139376536,0.503725,0.0105875,1.0 -3.89670623597,5.27875506403,0.503725,0.0105875,1.0 -3.84655651942,5.3261163627,0.503725,0.0105875,1.0 -3.79640680288,5.37347766136,0.503725,0.0105875,1.0 -3.79640680288,5.42083896003,0.503725,0.0105875,1.0 -3.74625708633,5.4682002587,0.503725,0.0105875,1.0 -3.69610736978,5.51556155737,0.503725,0.0105875,1.0 -3.64595765324,5.56292285604,0.503725,0.0105875,1.0 -3.59580793669,5.6102841547,0.503725,0.0105875,1.0 -3.59580793669,5.65764545337,0.503725,0.0105875,1.0 -3.54565822014,5.70500675204,0.503725,0.0105875,1.0 -3.4955085036,5.75236805071,0.503725,0.0105875,1.0 -3.44535878705,5.79972934937,0.503725,0.0105875,1.0 -3.3952090705,5.84709064804,0.503725,0.0105875,1.0 -3.34505935396,5.89445194671,0.503725,0.0105875,1.0 -3.34505935396,5.94181324538,0.503725,0.0105875,1.0 -3.29490963741,5.98917454405,0.503725,0.0105875,1.0 -3.24475992086,6.03653584271,0.503725,0.0105875,1.0 -3.19461020431,6.08389714138,0.503725,0.0105875,1.0 -3.14446048777,6.13125844005,0.503725,0.0105875,1.0 -3.14446048777,6.17861973872,0.503725,0.0105875,1.0 -3.09431077122,6.22598103738,0.503725,0.0105875,1.0 -3.04416105467,6.27334233605,0.503725,0.0105875,1.0 -2.99401133813,6.32070363472,0.503725,0.0105875,1.0 +7.05613837842,1.63193506661,0.503725,0.01371875,0.0 +7.05613837842,1.67929636528,0.503725,0.01371875,0.0 +7.00598866187,1.72665766395,0.503725,0.01371875,0.0 +6.95583894533,1.77401896262,0.503725,0.01371875,0.0 +6.90568922878,1.82138026128,0.503725,0.01371875,0.0 +6.85553951223,1.86874155995,0.503725,0.01371875,0.0 +6.85553951223,1.91610285862,0.503725,0.01371875,0.0 +6.80538979569,1.96346415729,0.503725,0.01371875,0.0 +6.75524007914,2.01082545595,0.503725,0.01371875,0.0 +6.70509036259,2.05818675462,0.503725,0.01371875,0.0 +6.65494064604,2.10554805329,0.503725,0.01371875,0.0 +6.65494064604,2.15290935196,0.503725,0.01371875,0.0 +6.6047909295,2.20027065063,0.503725,0.01371875,0.0 +6.55464121295,2.24763194929,0.503725,0.01371875,0.0 +6.5044914964,2.29499324796,0.503725,0.01371875,0.0 +6.45434177986,2.34235454663,0.503725,0.01371875,0.0 +6.40419206331,2.3897158453,0.503725,0.01371875,0.0 +6.40419206331,2.43707714396,0.503725,0.01371875,0.0 +6.35404234676,2.48443844263,0.503725,0.01371875,0.0 +6.30389263022,2.5317997413,0.503725,0.01371875,0.0 +6.25374291367,2.57916103997,0.503725,0.01371875,0.0 +6.20359319712,2.62652233864,0.503725,0.01371875,0.0 +6.20359319712,2.6738836373,0.503725,0.01371875,0.0 +6.15344348058,2.72124493597,0.503725,0.01371875,0.0 +6.10329376403,2.76860623464,0.503725,0.01371875,0.0 +6.05314404748,2.81596753331,0.503725,0.01371875,0.0 +6.00299433094,2.86332883197,0.503725,0.01371875,0.0 +6.00299433094,2.91069013064,0.503725,0.01371875,0.0 +5.95284461439,2.95805142931,0.503725,0.01371875,0.0 +5.90269489784,3.00541272798,0.503725,0.01371875,0.0 +5.8525451813,3.05277402664,0.503725,0.01371875,0.0 +5.80239546475,3.10013532531,0.503725,0.01371875,0.0 +5.7522457482,3.14749662398,0.503725,0.01371875,0.0 +5.7522457482,3.19485792265,0.503725,0.01371875,0.0 +5.70209603166,3.24221922132,0.503725,0.01371875,0.0 +5.65194631511,3.28958051998,0.503725,0.01371875,0.0 +5.60179659856,3.33694181865,0.503725,0.01371875,0.0 +5.55164688201,3.38430311732,0.503725,0.01371875,0.0 +5.55164688201,3.43166441599,0.503725,0.01371875,0.0 +5.50149716547,3.47902571465,0.503725,0.01371875,0.0 +5.45134744892,3.52638701332,0.503725,0.01371875,0.0 +5.40119773237,3.57374831199,0.503725,0.01371875,0.0 +5.35104801583,3.62110961066,0.503725,0.01371875,0.0 +5.35104801583,3.66847090933,0.503725,0.01371875,0.0 +5.30089829928,3.71583220799,0.503725,0.01371875,0.0 +5.25074858273,3.76319350666,0.503725,0.01371875,0.0 +5.20059886619,3.81055480533,0.503725,0.01371875,0.0 +5.15044914964,3.857916104,0.503725,0.01371875,0.0 +5.15044914964,3.90527740266,0.503725,0.01371875,0.0 +5.10029943309,3.95263870133,0.503725,0.01371875,0.0 +5.05014971655,4.0,0.503725,0.01371875,0.0 +5.0,4.04736129867,0.503725,0.01371875,0.0 +4.94985028345,4.09472259734,0.503725,0.01371875,0.0 +4.89970056691,4.142083896,0.503725,0.01371875,0.0 +4.89970056691,4.18944519467,0.503725,0.01371875,0.0 +4.84955085036,4.23680649334,0.503725,0.01371875,0.0 +4.79940113381,4.28416779201,0.503725,0.01371875,0.0 +4.74925141727,4.33152909067,0.503725,0.01371875,0.0 +4.69910170072,4.37889038934,0.503725,0.01371875,0.0 +4.69910170072,4.42625168801,0.503725,0.01371875,0.0 +4.64895198417,4.47361298668,0.503725,0.01371875,0.0 +4.59880226763,4.52097428535,0.503725,0.01371875,0.0 +4.54865255108,4.56833558401,0.503725,0.01371875,0.0 +4.49850283453,4.61569688268,0.503725,0.01371875,0.0 +4.49850283453,4.66305818135,0.503725,0.01371875,0.0 +4.44835311799,4.71041948002,0.503725,0.01371875,0.0 +4.39820340144,4.75778077868,0.503725,0.01371875,0.0 +4.34805368489,4.80514207735,0.503725,0.01371875,0.0 +4.29790396834,4.85250337602,0.503725,0.01371875,0.0 +4.2477542518,4.89986467469,0.503725,0.01371875,0.0 +4.2477542518,4.94722597336,0.503725,0.01371875,0.0 +4.19760453525,4.99458727202,0.503725,0.01371875,0.0 +4.1474548187,5.04194857069,0.503725,0.01371875,0.0 +4.09730510216,5.08930986936,0.503725,0.01371875,0.0 +4.04715538561,5.13667116803,0.503725,0.01371875,0.0 +4.04715538561,5.18403246669,0.503725,0.01371875,0.0 +3.99700566906,5.23139376536,0.503725,0.01371875,0.0 +3.94685595252,5.27875506403,0.503725,0.01371875,0.0 +3.89670623597,5.3261163627,0.503725,0.01371875,0.0 +3.84655651942,5.37347766136,0.503725,0.01371875,0.0 +3.84655651942,5.42083896003,0.503725,0.01371875,0.0 +3.79640680288,5.4682002587,0.503725,0.01371875,0.0 +3.74625708633,5.51556155737,0.503725,0.01371875,0.0 +3.69610736978,5.56292285604,0.503725,0.01371875,0.0 +3.64595765324,5.6102841547,0.503725,0.01371875,0.0 +3.64595765324,5.65764545337,0.503725,0.01371875,0.0 +3.59580793669,5.70500675204,0.503725,0.01371875,0.0 +3.54565822014,5.75236805071,0.503725,0.01371875,0.0 +3.4955085036,5.79972934937,0.503725,0.01371875,0.0 +3.44535878705,5.84709064804,0.503725,0.01371875,0.0 +3.3952090705,5.89445194671,0.503725,0.01371875,0.0 +3.3952090705,5.94181324538,0.503725,0.01371875,0.0 +3.34505935396,5.98917454405,0.503725,0.01371875,0.0 +3.29490963741,6.03653584271,0.503725,0.01371875,0.0 +3.24475992086,6.08389714138,0.503725,0.01371875,0.0 +3.19461020431,6.13125844005,0.503725,0.01371875,0.0 +3.19461020431,6.17861973872,0.503725,0.01371875,0.0 +3.14446048777,6.22598103738,0.503725,0.01371875,0.0 +3.09431077122,6.27334233605,0.503725,0.01371875,0.0 +3.04416105467,6.32070363472,0.503725,0.01371875,0.0 +7.00598866187,1.63193506661,0.503725,0.01371875,1.0 +7.00598866187,1.67929636528,0.503725,0.01371875,1.0 +6.95583894533,1.72665766395,0.503725,0.01371875,1.0 +6.90568922878,1.77401896262,0.503725,0.01371875,1.0 +6.85553951223,1.82138026128,0.503725,0.01371875,1.0 +6.80538979569,1.86874155995,0.503725,0.01371875,1.0 +6.80538979569,1.91610285862,0.503725,0.01371875,1.0 +6.75524007914,1.96346415729,0.503725,0.01371875,1.0 +6.70509036259,2.01082545595,0.503725,0.01371875,1.0 +6.65494064604,2.05818675462,0.503725,0.01371875,1.0 +6.6047909295,2.10554805329,0.503725,0.01371875,1.0 +6.6047909295,2.15290935196,0.503725,0.01371875,1.0 +6.55464121295,2.20027065063,0.503725,0.01371875,1.0 +6.5044914964,2.24763194929,0.503725,0.01371875,1.0 +6.45434177986,2.29499324796,0.503725,0.01371875,1.0 +6.40419206331,2.34235454663,0.503725,0.01371875,1.0 +6.35404234676,2.3897158453,0.503725,0.01371875,1.0 +6.35404234676,2.43707714396,0.503725,0.01371875,1.0 +6.30389263022,2.48443844263,0.503725,0.01371875,1.0 +6.25374291367,2.5317997413,0.503725,0.01371875,1.0 +6.20359319712,2.57916103997,0.503725,0.01371875,1.0 +6.15344348058,2.62652233864,0.503725,0.01371875,1.0 +6.15344348058,2.6738836373,0.503725,0.01371875,1.0 +6.10329376403,2.72124493597,0.503725,0.01371875,1.0 +6.05314404748,2.76860623464,0.503725,0.01371875,1.0 +6.00299433094,2.81596753331,0.503725,0.01371875,1.0 +5.95284461439,2.86332883197,0.503725,0.01371875,1.0 +5.95284461439,2.91069013064,0.503725,0.01371875,1.0 +5.90269489784,2.95805142931,0.503725,0.01371875,1.0 +5.8525451813,3.00541272798,0.503725,0.01371875,1.0 +5.80239546475,3.05277402664,0.503725,0.01371875,1.0 +5.7522457482,3.10013532531,0.503725,0.01371875,1.0 +5.70209603166,3.14749662398,0.503725,0.01371875,1.0 +5.70209603166,3.19485792265,0.503725,0.01371875,1.0 +5.65194631511,3.24221922132,0.503725,0.01371875,1.0 +5.60179659856,3.28958051998,0.503725,0.01371875,1.0 +5.55164688201,3.33694181865,0.503725,0.01371875,1.0 +5.50149716547,3.38430311732,0.503725,0.01371875,1.0 +5.50149716547,3.43166441599,0.503725,0.01371875,1.0 +5.45134744892,3.47902571465,0.503725,0.01371875,1.0 +5.40119773237,3.52638701332,0.503725,0.01371875,1.0 +5.35104801583,3.57374831199,0.503725,0.01371875,1.0 +5.30089829928,3.62110961066,0.503725,0.01371875,1.0 +5.30089829928,3.66847090933,0.503725,0.01371875,1.0 +5.25074858273,3.71583220799,0.503725,0.01371875,1.0 +5.20059886619,3.76319350666,0.503725,0.01371875,1.0 +5.15044914964,3.81055480533,0.503725,0.01371875,1.0 +5.10029943309,3.857916104,0.503725,0.01371875,1.0 +5.10029943309,3.90527740266,0.503725,0.01371875,1.0 +5.05014971655,3.95263870133,0.503725,0.01371875,1.0 +5.0,4.0,0.503725,0.01371875,1.0 +4.94985028345,4.04736129867,0.503725,0.01371875,1.0 +4.89970056691,4.09472259734,0.503725,0.01371875,1.0 +4.84955085036,4.142083896,0.503725,0.01371875,1.0 +4.84955085036,4.18944519467,0.503725,0.01371875,1.0 +4.79940113381,4.23680649334,0.503725,0.01371875,1.0 +4.74925141727,4.28416779201,0.503725,0.01371875,1.0 +4.69910170072,4.33152909067,0.503725,0.01371875,1.0 +4.64895198417,4.37889038934,0.503725,0.01371875,1.0 +4.64895198417,4.42625168801,0.503725,0.01371875,1.0 +4.59880226763,4.47361298668,0.503725,0.01371875,1.0 +4.54865255108,4.52097428535,0.503725,0.01371875,1.0 +4.49850283453,4.56833558401,0.503725,0.01371875,1.0 +4.44835311799,4.61569688268,0.503725,0.01371875,1.0 +4.44835311799,4.66305818135,0.503725,0.01371875,1.0 +4.39820340144,4.71041948002,0.503725,0.01371875,1.0 +4.34805368489,4.75778077868,0.503725,0.01371875,1.0 +4.29790396834,4.80514207735,0.503725,0.01371875,1.0 +4.2477542518,4.85250337602,0.503725,0.01371875,1.0 +4.19760453525,4.89986467469,0.503725,0.01371875,1.0 +4.19760453525,4.94722597336,0.503725,0.01371875,1.0 +4.1474548187,4.99458727202,0.503725,0.01371875,1.0 +4.09730510216,5.04194857069,0.503725,0.01371875,1.0 +4.04715538561,5.08930986936,0.503725,0.01371875,1.0 +3.99700566906,5.13667116803,0.503725,0.01371875,1.0 +3.99700566906,5.18403246669,0.503725,0.01371875,1.0 +3.94685595252,5.23139376536,0.503725,0.01371875,1.0 +3.89670623597,5.27875506403,0.503725,0.01371875,1.0 +3.84655651942,5.3261163627,0.503725,0.01371875,1.0 +3.79640680288,5.37347766136,0.503725,0.01371875,1.0 +3.79640680288,5.42083896003,0.503725,0.01371875,1.0 +3.74625708633,5.4682002587,0.503725,0.01371875,1.0 +3.69610736978,5.51556155737,0.503725,0.01371875,1.0 +3.64595765324,5.56292285604,0.503725,0.01371875,1.0 +3.59580793669,5.6102841547,0.503725,0.01371875,1.0 +3.59580793669,5.65764545337,0.503725,0.01371875,1.0 +3.54565822014,5.70500675204,0.503725,0.01371875,1.0 +3.4955085036,5.75236805071,0.503725,0.01371875,1.0 +3.44535878705,5.79972934937,0.503725,0.01371875,1.0 +3.3952090705,5.84709064804,0.503725,0.01371875,1.0 +3.34505935396,5.89445194671,0.503725,0.01371875,1.0 +3.34505935396,5.94181324538,0.503725,0.01371875,1.0 +3.29490963741,5.98917454405,0.503725,0.01371875,1.0 +3.24475992086,6.03653584271,0.503725,0.01371875,1.0 +3.19461020431,6.08389714138,0.503725,0.01371875,1.0 +3.14446048777,6.13125844005,0.503725,0.01371875,1.0 +3.14446048777,6.17861973872,0.503725,0.01371875,1.0 +3.09431077122,6.22598103738,0.503725,0.01371875,1.0 +3.04416105467,6.27334233605,0.503725,0.01371875,1.0 +2.99401133813,6.32070363472,0.503725,0.01371875,1.0