diff --git a/plugins/BayCal b/plugins/BayCal index 348b6e57de..276a7a5c43 160000 --- a/plugins/BayCal +++ b/plugins/BayCal @@ -1 +1 @@ -Subproject commit 348b6e57de060bc528be99b8d63f922142948d6e +Subproject commit 276a7a5c43df6c15dab07213de9ebf7255c8bd06 diff --git a/plugins/HERON b/plugins/HERON index febe0ba485..518a099dbe 160000 --- a/plugins/HERON +++ b/plugins/HERON @@ -1 +1 @@ -Subproject commit febe0ba48542b908393c59af0594c72d5e75af00 +Subproject commit 518a099dbefd81fd8bce10686f87987c5cc74c45 diff --git a/ravenframework/Models/EnsembleModel.py b/ravenframework/Models/EnsembleModel.py index 0c7450775b..6d2d53df91 100644 --- a/ravenframework/Models/EnsembleModel.py +++ b/ravenframework/Models/EnsembleModel.py @@ -549,6 +549,7 @@ def submit(self,myInput,samplerType,jobHandler,**kwargs): for index in range(nRuns): if batchMode: kw = kwargs['batchInfo']['batchRealizations'][index] + kw['batchRun'] = index + 1 else: kw = kwargs @@ -667,8 +668,11 @@ def _externalRun(self,inRun, jobHandler = None):#, jobHandler): else: self.raiseAnError(IOError,"No initial conditions provided for variable "+ initialConditionToSet) # set new identifiers - inputKwargs[modelIn]['prefix'] = modelIn+utils.returnIdSeparator()+identifier - inputKwargs[modelIn]['uniqueHandler'] = self.name+identifier + suffix = '' + if 'batchRun' in inputKwargs[modelIn]: + suffix = f"{utils.returnIdSeparator()}{inputKwargs[modelIn]['batchRun']}" + inputKwargs[modelIn]['prefix'] = modelIn+utils.returnIdSeparator()+identifier + suffix + inputKwargs[modelIn]['uniqueHandler'] = self.name + identifier + suffix if metadataToTransfer is not None: inputKwargs[modelIn]['metadataToTransfer'] = metadataToTransfer @@ -742,9 +746,11 @@ def __advanceModel(self, identifier, modelToExecute, origInputList, inputKwargs, @ Out, evaluation, dict, the evaluation dictionary with the "unprojected" data """ returnDict = {} - + suffix = '' + if 'batchRun' in inputKwargs: + suffix = f"{utils.returnIdSeparator()}{inputKwargs['batchRun']}" self.raiseADebug('Submitting model',modelToExecute['Instance'].name) - localIdentifier = modelToExecute['Instance'].name+utils.returnIdSeparator()+identifier + localIdentifier = f"{modelToExecute['Instance'].name}{utils.returnIdSeparator()}{identifier}{suffix}" if self.parallelStrategy == 1: # we evaluate the model directly try: @@ -763,7 +769,7 @@ def __advanceModel(self, identifier, modelToExecute, origInputList, inputKwargs, time.sleep(1.e-3) moveOn = True # get job that just finished to gather the results - finishedRun = jobHandler.getFinished(jobIdentifier = localIdentifier, uniqueHandler=self.name+identifier) + finishedRun = jobHandler.getFinished(jobIdentifier = localIdentifier, uniqueHandler=f"{self.name}{identifier}{suffix}") evaluation = finishedRun[0].getEvaluation() if isinstance(evaluation, rerror): if finishedRun[0].exceptionTrace is not None: @@ -774,7 +780,8 @@ def __advanceModel(self, identifier, modelToExecute, origInputList, inputKwargs, evaluation = None # the model failed for modelToRemove in list(set(self.orderList) - set([modelToExecute['Instance'].name])): - jobHandler.getFinished(jobIdentifier = modelToRemove + utils.returnIdSeparator() + identifier, uniqueHandler = self.name + identifier) + jobHandler.getFinished(jobIdentifier = f"{modelToRemove}{utils.returnIdSeparator()}{identifier}{suffix}", uniqueHandler = f"{self.name}{identifier}{suffix}") + else: # collect the target evaluation modelToExecute['Instance'].collectOutput(finishedRun[0],inRunTargetEvaluations) diff --git a/tests/framework/Optimizers/GeneticAlgorithms/continuous/unconstrained/test_ensembleModel_withGA_Code_and_Functions.xml b/tests/framework/Optimizers/GeneticAlgorithms/continuous/unconstrained/test_ensembleModel_withGA_Code_and_Functions.xml index 451d6f8583..16c9e6d553 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/continuous/unconstrained/test_ensembleModel_withGA_Code_and_Functions.xml +++ b/tests/framework/Optimizers/GeneticAlgorithms/continuous/unconstrained/test_ensembleModel_withGA_Code_and_Functions.xml @@ -18,7 +18,7 @@ optimize metaModelWithCodeAndFunctionsAndGenetic - 1 + 2 diff --git a/tests/framework/Optimizers/GeneticAlgorithms/gold/MaxwReplacementDiffDist/opt_export_0.csv b/tests/framework/Optimizers/GeneticAlgorithms/gold/MaxwReplacementDiffDist/opt_export_0.csv deleted file mode 100644 index 847763b610..0000000000 --- a/tests/framework/Optimizers/GeneticAlgorithms/gold/MaxwReplacementDiffDist/opt_export_0.csv +++ /dev/null @@ -1,192 +0,0 @@ -x1,x2,x3,ans,age,batchId,fitness,iteration,accepted,conv_objective -6.0,6.0,10.0,48.0,0.0,1.0,-0.0104166666667,0.0,first,0.0 -4.0,6.0,8.0,40.0,0.0,1.0,-0.0125,0.0,first,0.0 -2.0,2.0,8.0,30.0,0.0,1.0,-0.0166666666667,0.0,first,0.0 -3.0,5.0,8.0,37.0,0.0,1.0,-0.0135135135135,0.0,first,0.0 -6.0,1.0,9.0,35.0,0.0,1.0,-0.0142857142857,0.0,first,0.0 -2.0,2.0,10.0,36.0,0.0,1.0,-0.0138888888889,0.0,first,0.0 -6.0,6.0,8.0,42.0,0.0,1.0,-0.0119047619048,0.0,first,0.0 -3.0,5.0,9.0,40.0,0.0,1.0,-0.0125,0.0,first,0.0 -3.0,3.0,7.0,30.0,0.0,1.0,-0.0166666666667,0.0,first,0.0 -4.0,4.0,9.0,39.0,0.0,1.0,-0.0128205128205,0.0,first,0.0 -3.0,2.0,8.0,31.0,0.0,2.0,-0.0161290322581,1.0,accepted,0.0 -6.0,6.0,9.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -5.0,2.0,8.0,33.0,0.0,2.0,-0.0151515151515,1.0,accepted,0.0 -6.0,5.0,8.0,40.0,0.0,2.0,-0.0125,1.0,accepted,0.0 -6.0,2.0,8.0,34.0,0.0,2.0,-0.0147058823529,1.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,2.0,-0.0119047619048,1.0,accepted,0.0 -3.0,6.0,10.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -6.0,2.0,10.0,40.0,0.0,2.0,-0.0125,1.0,accepted,0.0 -5.0,6.0,9.0,44.0,0.0,2.0,-0.0113636363636,1.0,accepted,0.0 -3.0,5.0,8.0,37.0,0.0,2.0,-0.0135135135135,1.0,accepted,0.0 -3.0,6.0,9.0,42.0,0.0,2.0,-0.0119047619048,1.0,accepted,0.0 -3.0,6.0,10.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -6.0,6.0,9.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -3.0,6.0,10.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -3.0,6.0,8.0,39.0,0.0,2.0,-0.0128205128205,1.0,accepted,0.0 -6.0,5.0,9.0,43.0,0.0,2.0,-0.0116279069767,1.0,accepted,0.0 -3.0,6.0,10.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -5.0,5.0,10.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,2.0,-0.0104166666667,1.0,accepted,0.0 -3.0,6.0,10.0,45.0,0.0,2.0,-0.0111111111111,1.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,3.0,-0.0104166666667,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,8.0,42.0,0.0,3.0,-0.0119047619048,2.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,2.0,4.0,-0.0104166666667,3.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,5.0,-0.0104166666667,4.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,6.0,-0.0104166666667,5.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,7.0,-0.0104166666667,6.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,8.0,-0.0104166666667,7.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,9.0,-0.0104166666667,8.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,accepted,0.0 -6.0,6.0,10.0,48.0,0.0,10.0,-0.0104166666667,9.0,final,0.0 diff --git a/tests/framework/Optimizers/GeneticAlgorithms/gold/MaxwoReplacementDiffDist/opt_export_0.csv b/tests/framework/Optimizers/GeneticAlgorithms/gold/MaxwoReplacementDiffDist/opt_export_0.csv deleted file mode 100644 index d8c8f47063..0000000000 --- a/tests/framework/Optimizers/GeneticAlgorithms/gold/MaxwoReplacementDiffDist/opt_export_0.csv +++ /dev/null @@ -1,192 +0,0 @@ -x1,x2,x3,ans,age,batchId,fitness,iteration,accepted,conv_objective -5.0,6.0,2.0,23.0,0.0,1.0,-0.0217391304348,0.0,first,0.0 -2.0,6.0,3.0,23.0,0.0,1.0,-0.0217391304348,0.0,first,0.0 -6.0,1.0,8.0,32.0,0.0,1.0,-0.015625,0.0,first,0.0 -2.0,6.0,5.0,29.0,0.0,1.0,-0.0172413793103,0.0,first,0.0 -2.0,5.0,9.0,39.0,0.0,1.0,-0.0128205128205,0.0,first,0.0 -4.0,3.0,10.0,40.0,0.0,1.0,-0.0125,0.0,first,0.0 -5.0,1.0,1.0,10.0,0.0,1.0,-0.05,0.0,first,0.0 -3.0,5.0,3.0,22.0,0.0,1.0,-0.0227272727273,0.0,first,0.0 -6.0,1.0,7.0,29.0,0.0,1.0,-0.0172413793103,0.0,first,0.0 -6.0,4.0,1.0,17.0,0.0,1.0,-0.0294117647059,0.0,first,0.0 -1.0,2.0,10.0,35.0,0.0,2.0,-0.0142857142857,1.0,accepted,0.0 -1.0,4.0,9.0,36.0,0.0,2.0,-0.0138888888889,1.0,accepted,0.0 -1.0,4.0,10.0,39.0,0.0,2.0,-0.0128205128205,1.0,accepted,0.0 -2.0,5.0,9.0,39.0,0.0,2.0,-0.0128205128205,1.0,accepted,0.0 -5.0,4.0,10.0,43.0,0.0,2.0,-0.0116279069767,1.0,accepted,0.0 -1.0,6.0,10.0,43.0,0.0,2.0,-0.0116279069767,1.0,accepted,0.0 -2.0,4.0,10.0,40.0,0.0,2.0,-0.0125,1.0,accepted,0.0 -1.0,6.0,9.0,40.0,0.0,2.0,-0.0125,1.0,accepted,0.0 -6.0,5.0,4.0,28.0,0.0,2.0,-0.0178571428571,1.0,accepted,0.0 -3.0,1.0,8.0,29.0,0.0,2.0,-0.0172413793103,1.0,accepted,0.0 -5.0,1.0,9.0,34.0,0.0,2.0,-0.0147058823529,1.0,accepted,0.0 -1.0,6.0,10.0,43.0,0.0,2.0,-0.0116279069767,1.0,accepted,0.0 -2.0,1.0,9.0,31.0,0.0,2.0,-0.0161290322581,1.0,accepted,0.0 -1.0,6.0,9.0,40.0,0.0,2.0,-0.0125,1.0,accepted,0.0 -5.0,1.0,6.0,25.0,0.0,2.0,-0.02,1.0,accepted,0.0 -2.0,5.0,10.0,42.0,0.0,2.0,-0.0119047619048,1.0,accepted,0.0 -4.0,6.0,4.0,28.0,0.0,2.0,-0.0178571428571,1.0,accepted,0.0 -6.0,5.0,4.0,28.0,0.0,2.0,-0.0178571428571,1.0,accepted,0.0 -2.0,1.0,10.0,34.0,0.0,2.0,-0.0147058823529,1.0,accepted,0.0 -5.0,6.0,9.0,44.0,0.0,2.0,-0.0113636363636,1.0,accepted,0.0 -6.0,1.0,2.0,14.0,0.0,3.0,-0.0357142857143,2.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,3.0,-0.025,2.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,3.0,-0.025,2.0,accepted,0.0 -6.0,4.0,7.0,35.0,0.0,3.0,-0.0142857142857,2.0,accepted,0.0 -1.0,5.0,10.0,41.0,0.0,3.0,-0.0121951219512,2.0,accepted,0.0 -6.0,4.0,7.0,35.0,0.0,3.0,-0.0142857142857,2.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,3.0,-0.025,2.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,3.0,-0.0121951219512,2.0,accepted,0.0 -6.0,6.0,2.0,24.0,0.0,3.0,-0.0208333333333,2.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,3.0,-0.0113636363636,2.0,accepted,0.0 -6.0,5.0,2.0,22.0,0.0,3.0,-0.0227272727273,2.0,accepted,0.0 -6.0,4.0,3.0,23.0,0.0,3.0,-0.0217391304348,2.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,3.0,-0.025,2.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,3.0,-0.0121951219512,2.0,accepted,0.0 -6.0,4.0,5.0,29.0,0.0,3.0,-0.0172413793103,2.0,accepted,0.0 -6.0,5.0,4.0,28.0,0.0,3.0,-0.0178571428571,2.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,3.0,-0.025,2.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,3.0,-0.0121951219512,2.0,accepted,0.0 -6.0,5.0,4.0,28.0,0.0,3.0,-0.0178571428571,2.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,3.0,-0.0121951219512,2.0,accepted,0.0 -6.0,2.0,4.0,22.0,0.0,4.0,-0.0227272727273,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,4.0,-0.025,3.0,accepted,0.0 -5.0,6.0,10.0,47.0,0.0,4.0,-0.0106382978723,3.0,accepted,0.0 -6.0,3.0,2.0,18.0,0.0,4.0,-0.0277777777778,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,4.0,-0.025,3.0,accepted,0.0 -6.0,1.0,2.0,14.0,0.0,4.0,-0.0357142857143,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,3.0,10.0,42.0,0.0,4.0,-0.0119047619048,3.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,4.0,-0.025,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,4.0,-0.0113636363636,3.0,accepted,0.0 -6.0,3.0,2.0,18.0,0.0,4.0,-0.0277777777778,3.0,accepted,0.0 -6.0,2.0,10.0,40.0,0.0,4.0,-0.0125,3.0,accepted,0.0 -6.0,4.0,2.0,20.0,0.0,4.0,-0.025,3.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,5.0,-0.0113636363636,4.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,6.0,-0.0113636363636,5.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,5.0,9.0,43.0,0.0,7.0,-0.0116279069767,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,3.0,9.0,39.0,0.0,7.0,-0.0128205128205,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,5.0,10.0,46.0,0.0,7.0,-0.0108695652174,6.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,7.0,-0.0121951219512,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,7.0,-0.0113636363636,6.0,accepted,0.0 -6.0,2.0,9.0,37.0,0.0,7.0,-0.0135135135135,6.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,8.0,-0.0121951219512,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,5.0,9.0,43.0,0.0,8.0,-0.0116279069767,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,1.0,9.0,35.0,0.0,8.0,-0.0142857142857,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,2.0,9.0,37.0,0.0,8.0,-0.0135135135135,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,8.0,-0.0113636363636,7.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,3.0,10.0,42.0,0.0,9.0,-0.0119047619048,8.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,9.0,-0.0121951219512,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,2.0,10.0,40.0,0.0,9.0,-0.0125,8.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,9.0,-0.0121951219512,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,3.0,9.0,39.0,0.0,9.0,-0.0128205128205,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,9.0,-0.0113636363636,8.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,9.0,-0.0121951219512,8.0,accepted,0.0 -6.0,2.0,10.0,40.0,0.0,9.0,-0.0125,8.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,5.0,10.0,46.0,0.0,10.0,-0.0108695652174,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,3.0,9.0,39.0,0.0,10.0,-0.0128205128205,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,5.0,10.0,46.0,0.0,10.0,-0.0108695652174,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,10.0,-0.0121951219512,9.0,accepted,0.0 -6.0,5.0,10.0,46.0,0.0,10.0,-0.0108695652174,9.0,accepted,0.0 -6.0,4.0,10.0,44.0,0.0,10.0,-0.0113636363636,9.0,accepted,0.0 -6.0,5.0,10.0,46.0,0.0,10.0,-0.0108695652174,9.0,accepted,0.0 -6.0,6.0,9.0,45.0,0.0,10.0,-0.0111111111111,9.0,accepted,0.0 -6.0,5.0,10.0,46.0,0.0,10.0,-0.0108695652174,9.0,accepted,0.0 -6.0,4.0,9.0,41.0,0.0,10.0,-0.0121951219512,9.0,accepted,0.0 -5.0,6.0,10.0,47.0,0.0,10.0,-0.0106382978723,9.0,final,0.0 diff --git a/tests/framework/Optimizers/GeneticAlgorithms/gold/simpleKnapsack/PrintOptOut_1.csv b/tests/framework/Optimizers/GeneticAlgorithms/gold/simpleKnapsack/PrintOptOut_1.csv deleted file mode 100644 index 8f133488cb..0000000000 --- a/tests/framework/Optimizers/GeneticAlgorithms/gold/simpleKnapsack/PrintOptOut_1.csv +++ /dev/null @@ -1,135 +0,0 @@ -proj1,proj2,proj3,proj4,proj5,proj6,proj7,proj8,proj9,proj10,planValue,validPlan,ProbabilityWeight-proj8,ProbabilityWeight-proj3,ProbabilityWeight-proj2,ProbabilityWeight-proj7,ProbabilityWeight-proj9,ProbabilityWeight-proj1,ProbabilityWeight,ProbabilityWeight-proj6,ProbabilityWeight-proj4,ProbabilityWeight-proj10,PointProbability,prefix,ProbabilityWeight-proj5,batchId -0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,8,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,3,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,8,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,3,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,8,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,1,0.5,1 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,3,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,-2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -1.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,1.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,1.0,0.0,0.0,0.0,-1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,3,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,-2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,1.0,0.0,6,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,0.0,4,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,2,0.5,2 -0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,1.0,0.0,1.0,0.0,0.0,0,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,8,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,0.0,1.0,0.0,0.0,0.0,-1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,1.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,4,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,1.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,8,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,3,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,1.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,3,0.5,3 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,4,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,4,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,8,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,0.0,1.0,1.0,0.0,1.0,0.0,0.0,-1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,1.0,0,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,1.0,2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,1.0,2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,1.0,0.0,0.0,0.0,0.0,1.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,1.0,0.0,0.0,0.0,-1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,1.0,-1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,1.0,-1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,1.0,0,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,4,0.5,4 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,8,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,4,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,1.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,11,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,1.0,0.0,0.0,0.0,0.0,0.0,3,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,5,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,1.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,1.0,11,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,2,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,0.0,1.0,1.0,0.0,0.0,0.0,0.0,1.0,2,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,1.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,1.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,7,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0,0.0,0.0,5,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,1.0,1.0,0.0,0.0,0.0,0.0,1,1.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,1.0,0.0,0.0,0.0,0.0,4,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,1.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 -0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,6,0.0,0.5,0.5,0.5,0.5,0.5,0.5,1,0.5,0.5,0.5,0.0009765625,5,0.5,5 diff --git a/tests/framework/Optimizers/GeneticAlgorithms/gold/simpleKnapsack/PrintOptOut_export_1.csv b/tests/framework/Optimizers/GeneticAlgorithms/gold/simpleKnapsack/PrintOptOut_export_1.csv deleted file mode 100644 index 46dbd37daf..0000000000 --- a/tests/framework/Optimizers/GeneticAlgorithms/gold/simpleKnapsack/PrintOptOut_export_1.csv +++ /dev/null @@ -1,2 +0,0 @@ -trajID,proj1,proj2,proj3,proj4,proj5,proj6,proj7,proj8,proj9,proj10,planValue -0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,7 diff --git a/tests/framework/Optimizers/GeneticAlgorithms/tests b/tests/framework/Optimizers/GeneticAlgorithms/tests index aa68675636..1e172bb00d 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/tests +++ b/tests/framework/Optimizers/GeneticAlgorithms/tests @@ -389,7 +389,7 @@ type = 'RavenFramework' input = 'continuous/unconstrained/test_ensembleModel_withGA_Code_and_Functions.xml' [./csv] - type = OrderedCSV + type = UnorderedCsv output = 'continuous/unconstrained/metaModelWithCodeAndFunctionsAndGenetic/opt_export.csv' rel_err = 0.001 [../]