From d2f4ec31e936e0296c439988335bffd13a9ddaba Mon Sep 17 00:00:00 2001 From: alfoa Date: Mon, 21 Oct 2024 12:04:51 -0600 Subject: [PATCH 01/12] Closes #2386 --- ravenframework/Models/Code.py | 1 + ravenframework/Steps/MultiRun.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ravenframework/Models/Code.py b/ravenframework/Models/Code.py index 1ca05d36e7..9dec0950a4 100644 --- a/ravenframework/Models/Code.py +++ b/ravenframework/Models/Code.py @@ -529,6 +529,7 @@ def evaluateSample(self, myInput, samplerType, kwargs): sampleDirectory = os.path.join(os.getcwd(),metaData['subDirectory']) localenv = dict(os.environ) localenv['PWD'] = str(sampleDirectory) + os.makedirs(os.path.dirname(os.path.join(sampleDirectory,codeLogFile)), exist_ok=True) outFileObject = open(os.path.join(sampleDirectory,codeLogFile), 'w', bufferSize) found = False diff --git a/ravenframework/Steps/MultiRun.py b/ravenframework/Steps/MultiRun.py index 321c3ad72d..1c010bda17 100644 --- a/ravenframework/Steps/MultiRun.py +++ b/ravenframework/Steps/MultiRun.py @@ -267,6 +267,12 @@ def _localTakeAstepRun(self, inDictionary): # END while loop that runs the step iterations (collection and submission-for-DET) # if any collected runs failed, let the sampler treat them appropriately, and any other closing-out actions sampler.finalizeSampler(self.failedRuns) + for myLambda, outIndex in self._outputCollectionLambda: + if isinstance(outputs[outIndex], OutStreamEntity): + myLambda([None,outputs[outIndex]]) + self.raiseAMessage(f'Just collected job {finishedJob.identifier} and sent to output "{inDictionary["Output"][outIndex].name}"') + + def _addNewRuns(self, sampler, model, inputs, outputs, jobHandler, inDictionary, verbose=True): """ From 254f49ad7d29d48ca18040b73cfc16325d9f9c0b Mon Sep 17 00:00:00 2001 From: alfoa Date: Mon, 21 Oct 2024 12:41:14 -0600 Subject: [PATCH 02/12] regolded GA that did not print final solution (when the optimization is stopped not for a convergence but for reaching the limit) --- .../unconstrained/testGAMaxwoRepConvAHDp.xml | 3 + .../ensemble_withGA_HDSM/opt_export.csv | 381 +++++++++--------- .../opt_export.csv | 17 +- 3 files changed, 214 insertions(+), 187 deletions(-) diff --git a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml index e9897c8c2c..5e3ee21bb3 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml +++ b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml @@ -11,6 +11,9 @@ The objective variable is ans. The problem in unconstrained, it is a maximization problem, and the sampling is from discrete variables without replacement. The convergence criterion used is the (p-Average Hausdorff Distance between populations) AHDp. + + Modified writeSteps to ``final'' to makes sure the Outstream is executed and the final solution is always written. Closes #2386 + This test uses myLocalSum's analytic objective function. diff --git a/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/ensemble_withGA_HDSM/opt_export.csv b/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/ensemble_withGA_HDSM/opt_export.csv index 4034219b4d..88fce8379a 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/ensemble_withGA_HDSM/opt_export.csv +++ b/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/ensemble_withGA_HDSM/opt_export.csv @@ -1,181 +1,202 @@ leftTemperature,rightTemperature,k,solution,age,batchId,fitness,iteration,accepted,AHDp,AHD,HDSM,conv_HDSM -949.448137276,1455.85158126,0.0287044374464,1230.78338428,0,1,-0.0287044374464,0,first,,,,False -1640.85717414,720.121745258,0.0291901264505,1129.33749141,0,1,-0.0291901264505,0,first,,,,False -1378.3927262,1435.62919715,0.0248859058211,1410.19076473,0,1,-0.0248859058211,0,first,,,,False -1218.39018369,1216.2201939,0.0283920190685,1217.18463379,0,1,-0.0283920190685,0,first,,,,False -687.222366265,1034.99930914,0.0386040413401,880.431779113,0,1,-0.0386040413401,0,first,,,,False -687.193428582,619.969904637,0.0488386505991,649.847025606,0,1,-0.0488386505991,0,first,,,,False -569.700333306,1051.09866554,0.0406875487761,837.143851329,0,1,-0.0406875487761,0,first,,,,False -1539.41137861,900.450333674,0.0283367627581,1184.43302006,0,1,-0.0283367627581,0,first,,,,False -1221.33801382,671.440177171,0.0355433136861,915.839215682,0,1,-0.0355433136861,0,first,,,,False -1349.68709416,1281.0661681,0.0264645020077,1311.5643574,0,1,-0.0264645020077,0,first,,,,False -524.701398524,567.693891765,0.0566036919125,548.586116992,0,1,-0.0566036919125,0,first,,,,False -1663.89181669,1366.39852591,0.0232493774308,1498.61776523,0,1,-0.0232493774308,0,first,,,,False -1498.93116388,1626.26325729,0.0225972719233,1569.67121531,0,1,-0.0225972719233,0,first,,,,False -754.806934263,500.934517663,0.0504972639646,613.766703308,0,1,-0.0504972639646,0,first,,,,False -718.18996049,1690.65387733,0.0286662962224,1258.447692,0,1,-0.0286662962224,0,first,,,,False -720.085411943,1240.97780901,0.034449771729,1009.47007699,0,1,-0.034449771729,0,first,,,,False -865.090689241,1233.98379505,0.0324330133849,1070.03130403,0,1,-0.0324330133849,0,first,,,,False -1129.70772391,508.479570227,0.0403145171226,784.58097186,0,1,-0.0403145171226,0,first,,,,False -1018.33402536,527.674914158,0.0423739869456,745.745630243,0,1,-0.0423739869456,0,first,,,,False -849.474968098,1129.72959425,0.0341704707937,1005.17198266,0,1,-0.0341704707937,0,first,,,,False -1233.98379505,1539.41137861,0.0252193826348,1403.66578515,0,2,-0.0252193826348,1,accepted,236.889972517,,0.752091298921,False -900.450333674,865.090689241,0.0377777811804,880.806087775,0,2,-0.0377777811804,1,accepted,236.889972517,,0.752091298921,False -1539.41137861,1129.72959425,0.0261174832677,1311.8103871,0,2,-0.0261174832677,1,accepted,236.889972517,,0.752091298921,False -900.450333674,849.474968098,0.0380715220788,872.130686124,0,2,-0.0380715220788,1,accepted,236.889972517,,0.752091298921,False -1216.2201939,1539.41137861,0.0253680164538,1395.77085163,0,2,-0.0253680164538,1,accepted,236.889972517,,0.752091298921,False -900.450333674,1218.39018369,0.0321633427379,1077.08358375,0,2,-0.0321633427379,1,accepted,236.889972517,,0.752091298921,False -500.934517663,1539.41137861,0.0332616151915,1077.86610685,0,2,-0.0332616151915,1,accepted,236.889972517,,0.752091298921,False -900.450333674,754.806934263,0.0399549084591,819.537334233,0,2,-0.0399549084591,1,accepted,236.889972517,,0.752091298921,False -1129.72959425,865.090689241,0.033933655722,982.707980358,0,2,-0.033933655722,1,accepted,236.889972517,,0.752091298921,False -1233.98379505,849.474968098,0.0326492795747,1020.36777959,0,2,-0.0326492795747,1,accepted,236.889972517,,0.752091298921,False -1216.2201939,865.090689241,0.0326792519669,1021.14824671,0,2,-0.0326792519669,1,accepted,236.889972517,,0.752091298921,False -1233.98379505,1218.39018369,0.0282059672328,1225.32067762,0,2,-0.0282059672328,1,accepted,236.889972517,,0.752091298921,False -500.934517663,865.090689241,0.0470689572836,703.243502177,0,2,-0.0470689572836,1,accepted,236.889972517,,0.752091298921,False -1233.98379505,754.806934263,0.0340247048729,967.774429094,0,2,-0.0340247048729,1,accepted,236.889972517,,0.752091298921,False -1216.2201939,849.474968098,0.03289882562,1012.47284658,0,2,-0.03289882562,1,accepted,236.889972517,,0.752091298921,False -1129.72959425,1218.39018369,0.0293341345448,1178.98547329,0,2,-0.0293341345448,1,accepted,236.889972517,,0.752091298921,False -500.934517663,849.474968098,0.0475258266046,694.568101239,0,2,-0.0475258266046,1,accepted,236.889972517,,0.752091298921,False -1129.72959425,754.806934263,0.0356800120814,921.439228499,0,2,-0.0356800120814,1,accepted,236.889972517,,0.752091298921,False -1218.39018369,500.934517663,0.038660588595,819.803702674,0,2,-0.038660588595,1,accepted,236.889972517,,0.752091298921,False -1216.2201939,754.806934263,0.034295806474,959.879494281,0,2,-0.034295806474,1,accepted,236.889972517,,0.752091298921,False -1690.65387733,1539.41137861,0.0219179489586,1606.63026451,0,3,-0.0219179489586,2,accepted,168.58493636,,0.742834842626,False -1129.72959425,718.18996049,0.0363002854959,901.096464604,0,3,-0.0363002854959,2,accepted,168.58493636,,0.742834842626,False -1435.62919715,1539.41137861,0.0236466392783,1493.2859637,0,3,-0.0236466392783,2,accepted,168.58493636,,0.742834842626,False -1129.72959425,1378.3927262,0.0276375872853,1267.87577834,0,3,-0.0276375872853,2,accepted,168.58493636,,0.742834842626,False -849.474968098,1539.41137861,0.0288824070794,1232.77297306,0,3,-0.0288824070794,2,accepted,168.58493636,,0.742834842626,False -1129.72959425,1233.98379505,0.0291596855404,1187.64859468,0,3,-0.0291596855404,2,accepted,168.58493636,,0.742834842626,False -1218.39018369,1539.41137861,0.0253497655737,1396.73529135,0,3,-0.0253497655737,2,accepted,168.58493636,,0.742834842626,False -1129.72959425,1129.72959425,0.0303670682133,1129.72959452,0,3,-0.0303670682133,2,accepted,168.58493636,,0.742834842626,False -1435.62919715,718.18996049,0.0316969547881,1037.0518434,0,3,-0.0316969547881,2,accepted,168.58493636,,0.742834842626,False -1690.65387733,1378.3927262,0.0229785815411,1517.1754595,0,3,-0.0229785815411,2,accepted,168.58493636,,0.742834842626,False -849.474968098,718.18996049,0.0418714579492,776.53885275,0,3,-0.0418714579492,2,accepted,168.58493636,,0.742834842626,False -1690.65387733,1233.98379505,0.0240210800808,1436.94827619,0,3,-0.0240210800808,2,accepted,168.58493636,,0.742834842626,False -1218.39018369,718.18996049,0.0348340286787,940.501170728,0,3,-0.0348340286787,2,accepted,168.58493636,,0.742834842626,False -1690.65387733,1129.72959425,0.0248344852258,1379.0292749,0,3,-0.0248344852258,2,accepted,168.58493636,,0.742834842626,False -1435.62919715,1378.3927262,0.0248859058211,1403.83115806,0,3,-0.0248859058211,2,accepted,168.58493636,,0.742834842626,False -1233.98379505,849.474968098,0.0326492795747,1020.36777959,0,3,-0.0326492795747,2,accepted,168.58493636,,0.742834842626,False -1435.62919715,1378.3927262,0.0248859058211,1403.83115806,0,3,-0.0248859058211,2,accepted,168.58493636,,0.742834842626,False -1218.39018369,1129.72959425,0.0293341345448,1169.13430076,0,3,-0.0293341345448,2,accepted,168.58493636,,0.742834842626,False -849.474968098,1233.98379505,0.0326492795747,1063.09098282,0,3,-0.0326492795747,2,accepted,168.58493636,,0.742834842626,False -1218.39018369,1129.72959425,0.0293341345448,1169.13430076,0,3,-0.0293341345448,2,accepted,168.58493636,,0.742834842626,False -1129.72959425,1129.72959425,0.0303670682133,1129.72959452,2,4,-0.0303670682133,3,accepted,197.979648839,,0.671566881753,False -1378.3927262,1690.65387733,0.0229785815411,1551.87114343,2,4,-0.0229785815411,3,accepted,197.979648839,,0.671566881753,False -1435.62919715,1129.72959425,0.0270773843835,1265.68497347,2,4,-0.0270773843835,3,accepted,197.979648839,,0.671566881753,False -1378.3927262,1378.3927262,0.0253583083803,1378.39272549,2,4,-0.0253583083803,3,accepted,197.979648839,,0.671566881753,False -1129.72959425,1378.3927262,0.0276375872853,1267.87577834,2,4,-0.0276375872853,3,accepted,197.979648839,,0.671566881753,False -1539.41137861,1218.39018369,0.0253497655737,1361.06627049,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False -1378.3927262,1129.72959425,0.0276375872853,1240.24653901,2,4,-0.0276375872853,3,accepted,197.979648839,,0.671566881753,False -1366.39852591,1663.89181669,0.0232493774308,1531.67257231,2,4,-0.0232493774308,3,accepted,197.979648839,,0.671566881753,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,2,4,-0.0225900037116,3,accepted,197.979648839,,0.671566881753,False -1129.72959425,1378.3927262,0.0276375872853,1267.87577834,2,4,-0.0276375872853,3,accepted,197.979648839,,0.671566881753,False -1129.72959425,1690.65387733,0.0248344852258,1441.35419374,2,4,-0.0248344852258,3,accepted,197.979648839,,0.671566881753,False -1539.41137861,1218.39018369,0.0253497655737,1361.06627049,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False -1366.39852591,1690.65387733,0.0230617103732,1546.54038822,2,4,-0.0230617103732,3,accepted,197.979648839,,0.671566881753,False -1129.72959425,1663.89181669,0.0250522497374,1426.48638414,2,4,-0.0250522497374,3,accepted,197.979648839,,0.671566881753,False -1378.3927262,1435.62919715,0.0248859058211,1410.19076473,2,4,-0.0248859058211,3,accepted,197.979648839,,0.671566881753,False -1539.41137861,1218.39018369,0.0253497655737,1361.06627049,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False -1366.39852591,1378.3927262,0.0254595848503,1373.06197026,2,4,-0.0254595848503,3,accepted,197.979648839,,0.671566881753,False -1435.62919715,1663.89181669,0.022770042192,1562.44176344,2,4,-0.022770042192,3,accepted,197.979648839,,0.671566881753,False -1539.41137861,1218.39018369,0.0253497655737,1361.06627049,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False -1366.39852591,1663.89181669,0.0232493774308,1531.67257231,2,4,-0.0232493774308,3,accepted,197.979648839,,0.671566881753,False -1690.65387733,1366.39852591,0.0230617103732,1510.51201491,2,5,-0.0230617103732,4,accepted,140.893512694,,0.684722561146,False -1435.62919715,1378.3927262,0.0248859058211,1403.83115806,2,5,-0.0248859058211,4,accepted,140.893512694,,0.684722561146,False -1663.89181669,1366.39852591,0.0232493774308,1498.61776523,2,5,-0.0232493774308,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1366.39852591,0.0230617103732,1510.51201491,2,5,-0.0230617103732,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False -1539.41137861,1366.39852591,0.0241640109541,1443.29312663,2,5,-0.0241640109541,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,2,5,-0.0210071821403,4,accepted,140.893512694,,0.684722561146,False -1663.89181669,1435.62919715,0.022770042192,1537.07925424,2,5,-0.022770042192,4,accepted,140.893512694,,0.684722561146,False -1378.3927262,1435.62919715,0.0248859058211,1410.19076473,2,5,-0.0248859058211,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False -1378.3927262,1435.62919715,0.0248859058211,1410.19076473,2,5,-0.0248859058211,4,accepted,140.893512694,,0.684722561146,False -1539.41137861,1435.62919715,0.0236466392783,1481.75461039,2,5,-0.0236466392783,4,accepted,140.893512694,,0.684722561146,False -1378.3927262,1690.65387733,0.0229785815411,1551.87114343,2,5,-0.0229785815411,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False -1663.89181669,1435.62919715,0.022770042192,1537.07925424,2,5,-0.022770042192,4,accepted,140.893512694,,0.684722561146,False -1539.41137861,1435.62919715,0.0236466392783,1481.75461039,2,5,-0.0236466392783,4,accepted,140.893512694,,0.684722561146,False -1663.89181669,1690.65387733,0.0211627879736,1678.75963184,2,5,-0.0211627879736,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,2,5,-0.0219179489586,4,accepted,140.893512694,,0.684722561146,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1539.41137861,0.0219179489586,1606.63026451,1,6,-0.0219179489586,5,accepted,109.538903011,,0.479834643387,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1366.39852591,0.0230617103732,1510.51201491,1,6,-0.0230617103732,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1378.3927262,0.0229785815411,1517.1754595,1,6,-0.0229785815411,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,1,6,-0.0210071821403,5,accepted,109.538903011,,0.479834643387,False -1435.62919715,1539.41137861,0.0236466392783,1493.2859637,1,6,-0.0236466392783,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,1,6,-0.0210071821403,5,accepted,109.538903011,,0.479834643387,False -1435.62919715,1366.39852591,0.0249834368019,1397.16771345,1,6,-0.0249834368019,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,1,6,-0.0210071821403,5,accepted,109.538903011,,0.479834643387,False -1378.3927262,1435.62919715,0.0248859058211,1410.19076473,1,6,-0.0248859058211,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1539.41137861,0.0219179489586,1606.63026451,1,6,-0.0219179489586,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1366.39852591,0.0230617103732,1510.51201491,1,6,-0.0230617103732,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1539.41137861,0.0219179489586,1606.63026451,1,6,-0.0219179489586,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1378.3927262,0.0229785815411,1517.1754595,1,6,-0.0229785815411,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1366.39852591,0.0230617103732,1510.51201491,1,6,-0.0230617103732,5,accepted,109.538903011,,0.479834643387,False -1690.65387733,1378.3927262,0.0229785815411,1517.1754595,1,6,-0.0229785815411,5,accepted,109.538903011,,0.479834643387,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,1,7,-0.0210071821403,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1435.62919715,0.0244307822444,1435.62919629,1,7,-0.0244307822444,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1690.65387733,0.0225900037116,1577.30957479,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,1,7,-0.0210071821403,6,accepted,118.371970783,,0.292893218813,False -1435.62919715,1435.62919715,0.0244307822444,1435.62919629,1,7,-0.0244307822444,6,accepted,118.371970783,,0.292893218813,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,0,8,-0.0225900037116,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,0,8,-0.0225900037116,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1539.41137861,0.0219179489586,1606.63026451,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1435.62919715,0.0225900037116,1548.97350118,0,8,-0.0225900037116,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1435.62919715,1539.41137861,0.0236466392783,1493.2859637,0,8,-0.0236466392783,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1539.41137861,0.0219179489586,1606.63026451,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1539.41137861,0.0219179489586,1606.63026451,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False -1539.41137861,1690.65387733,0.0219179489586,1623.43498632,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False -1690.65387733,1663.89181669,0.0211627879736,1675.78606561,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1663.89181669,0.0211627879736,1675.78606561,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1663.89181669,0.0211627879736,1675.78606561,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1663.89181669,0.0211627879736,1675.78606561,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False -1690.65387733,1690.65387733,0.0210071821403,1690.6538681,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +949.448137276,1455.85158126,0.0287044374464,1230.7833839,0,1,-0.0287044374464,0,first,,,,False +1640.85717414,720.121745258,0.0291901264505,1129.33749143,0,1,-0.0291901264505,0,first,,,,False +1378.3927262,1435.62919715,0.0248859058211,1410.19076535,0,1,-0.0248859058211,0,first,,,,False +1218.39018369,1216.2201939,0.0283920190685,1217.18463383,0,1,-0.0283920190685,0,first,,,,False +687.222366265,1034.99930914,0.0386040413401,880.431778973,0,1,-0.0386040413401,0,first,,,,False +687.193428582,619.969904637,0.0488386505991,649.847025615,0,1,-0.0488386505991,0,first,,,,False +569.700333306,1051.09866554,0.0406875487761,837.143850181,0,1,-0.0406875487761,0,first,,,,False +1539.41137861,900.450333674,0.0283367627581,1184.43301788,0,1,-0.0283367627581,0,first,,,,False +1221.33801382,671.440177171,0.0355433136861,915.83921568,0,1,-0.0355433136861,0,first,,,,False +1349.68709416,1281.0661681,0.0264645020077,1311.56435772,0,1,-0.0264645020077,0,first,,,,False +524.701398524,567.693891765,0.0566036919125,548.586116484,0,1,-0.0566036919125,0,first,,,,False +1663.89181669,1366.39852591,0.0232493774308,1498.61776576,0,1,-0.0232493774308,0,first,,,,False +1498.93116388,1626.26325729,0.0225972719233,1569.67121544,0,1,-0.0225972719233,0,first,,,,False +754.806934263,500.934517663,0.0504972639646,613.766702819,0,1,-0.0504972639646,0,first,,,,False +718.18996049,1690.65387733,0.0286662962224,1258.44769162,0,1,-0.0286662962224,0,first,,,,False +720.085411943,1240.97780901,0.034449771729,1009.47007697,0,1,-0.034449771729,0,first,,,,False +865.090689241,1233.98379505,0.0324330133849,1070.03130364,0,1,-0.0324330133849,0,first,,,,False +1129.70772391,508.479570227,0.0403145171226,784.580971838,0,1,-0.0403145171226,0,first,,,,False +1018.33402536,527.674914158,0.0423739869456,745.745630706,0,1,-0.0423739869456,0,first,,,,False +849.474968098,1129.72959425,0.0341704707937,1005.17198262,0,1,-0.0341704707937,0,first,,,,False +1233.98379505,1539.41137861,0.0252193826348,1403.66578937,0,2,-0.0252193826348,1,accepted,236.889972517,,0.752091298921,False +900.450333674,865.090689241,0.0377777811804,880.806086759,0,2,-0.0377777811804,1,accepted,236.889972517,,0.752091298921,False +1539.41137861,1129.72959425,0.0261174832677,1311.81038645,0,2,-0.0261174832677,1,accepted,236.889972517,,0.752091298921,False +900.450333674,849.474968098,0.0380715220788,872.13068626,0,2,-0.0380715220788,1,accepted,236.889972517,,0.752091298921,False +1216.2201939,1539.41137861,0.0253680164538,1395.77085131,0,2,-0.0253680164538,1,accepted,236.889972517,,0.752091298921,False +900.450333674,1218.39018369,0.0321633427379,1077.08358388,0,2,-0.0321633427379,1,accepted,236.889972517,,0.752091298921,False +500.934517663,1539.41137861,0.0332616151915,1077.86610744,0,2,-0.0332616151915,1,accepted,236.889972517,,0.752091298921,False +900.450333674,754.806934263,0.0399549084591,819.537333998,0,2,-0.0399549084591,1,accepted,236.889972517,,0.752091298921,False +1129.72959425,865.090689241,0.033933655722,982.707980405,0,2,-0.033933655722,1,accepted,236.889972517,,0.752091298921,False +1233.98379505,849.474968098,0.0326492795747,1020.36777851,0,2,-0.0326492795747,1,accepted,236.889972517,,0.752091298921,False +1216.2201939,865.090689241,0.0326792519669,1021.14824685,0,2,-0.0326792519669,1,accepted,236.889972517,,0.752091298921,False +1233.98379505,1218.39018369,0.0282059672328,1225.32067736,0,2,-0.0282059672328,1,accepted,236.889972517,,0.752091298921,False +500.934517663,865.090689241,0.0470689572836,703.243501874,0,2,-0.0470689572836,1,accepted,236.889972517,,0.752091298921,False +1233.98379505,754.806934263,0.0340247048729,967.774427577,0,2,-0.0340247048729,1,accepted,236.889972517,,0.752091298921,False +1216.2201939,849.474968098,0.03289882562,1012.47284652,0,2,-0.03289882562,1,accepted,236.889972517,,0.752091298921,False +1129.72959425,1218.39018369,0.0293341345448,1178.98547711,0,2,-0.0293341345448,1,accepted,236.889972517,,0.752091298921,False +500.934517663,849.474968098,0.0475258266046,694.568101238,0,2,-0.0475258266046,1,accepted,236.889972517,,0.752091298921,False +1129.72959425,754.806934263,0.0356800120814,921.439226983,0,2,-0.0356800120814,1,accepted,236.889972517,,0.752091298921,False +1218.39018369,500.934517663,0.038660588595,819.803702566,0,2,-0.038660588595,1,accepted,236.889972517,,0.752091298921,False +1216.2201939,754.806934263,0.034295806474,959.879494106,0,2,-0.034295806474,1,accepted,236.889972517,,0.752091298921,False +1690.65387733,1539.41137861,0.0219179489586,1606.63026775,0,3,-0.0219179489586,2,accepted,168.58493636,,0.742834842626,False +1129.72959425,718.18996049,0.0363002854959,901.096465333,0,3,-0.0363002854959,2,accepted,168.58493636,,0.742834842626,False +1435.62919715,1539.41137861,0.0236466392783,1493.28596409,0,3,-0.0236466392783,2,accepted,168.58493636,,0.742834842626,False +1129.72959425,1378.3927262,0.0276375872853,1267.87577762,0,3,-0.0276375872853,2,accepted,168.58493636,,0.742834842626,False +849.474968098,1539.41137861,0.0288824070794,1232.77297394,0,3,-0.0288824070794,2,accepted,168.58493636,,0.742834842626,False +1129.72959425,1233.98379505,0.0291596855404,1187.64858504,0,3,-0.0291596855404,2,accepted,168.58493636,,0.742834842626,False +1218.39018369,1539.41137861,0.0253497655737,1396.73529101,0,3,-0.0253497655737,2,accepted,168.58493636,,0.742834842626,False +1129.72959425,1129.72959425,0.0303670682133,1129.72959425,0,3,-0.0303670682133,2,accepted,168.58493636,,0.742834842626,False +1435.62919715,718.18996049,0.0316969547881,1037.05184332,0,3,-0.0316969547881,2,accepted,168.58493636,,0.742834842626,False +1690.65387733,1378.3927262,0.0229785815411,1517.17546019,0,3,-0.0229785815411,2,accepted,168.58493636,,0.742834842626,False +849.474968098,718.18996049,0.0418714579492,776.53885276,0,3,-0.0418714579492,2,accepted,168.58493636,,0.742834842626,False +1690.65387733,1233.98379505,0.0240210800808,1436.94827502,0,3,-0.0240210800808,2,accepted,168.58493636,,0.742834842626,False +1218.39018369,718.18996049,0.0348340286787,940.501171786,0,3,-0.0348340286787,2,accepted,168.58493636,,0.742834842626,False +1690.65387733,1129.72959425,0.0248344852258,1379.02927467,0,3,-0.0248344852258,2,accepted,168.58493636,,0.742834842626,False +1435.62919715,1378.3927262,0.0248859058211,1403.83115652,0,3,-0.0248859058211,2,accepted,168.58493636,,0.742834842626,False +1233.98379505,849.474968098,0.0326492795747,1020.36777851,0,3,-0.0326492795747,2,accepted,168.58493636,,0.742834842626,False +1435.62919715,1378.3927262,0.0248859058211,1403.83115652,0,3,-0.0248859058211,2,accepted,168.58493636,,0.742834842626,False +1218.39018369,1129.72959425,0.0293341345448,1169.13430015,0,3,-0.0293341345448,2,accepted,168.58493636,,0.742834842626,False +849.474968098,1233.98379505,0.0326492795747,1063.09098307,0,3,-0.0326492795747,2,accepted,168.58493636,,0.742834842626,False +1218.39018369,1129.72959425,0.0293341345448,1169.13430015,0,3,-0.0293341345448,2,accepted,168.58493636,,0.742834842626,False +1129.72959425,1129.72959425,0.0303670682133,1129.72959425,2,4,-0.0303670682133,3,accepted,197.979648839,,0.671566881753,False +1378.3927262,1690.65387733,0.0229785815411,1551.87114358,2,4,-0.0229785815411,3,accepted,197.979648839,,0.671566881753,False +1435.62919715,1129.72959425,0.0270773843835,1265.6849733,2,4,-0.0270773843835,3,accepted,197.979648839,,0.671566881753,False +1378.3927262,1378.3927262,0.0253583083803,1378.39272563,2,4,-0.0253583083803,3,accepted,197.979648839,,0.671566881753,False +1129.72959425,1378.3927262,0.0276375872853,1267.87577762,2,4,-0.0276375872853,3,accepted,197.979648839,,0.671566881753,False +1539.41137861,1218.39018369,0.0253497655737,1361.06627062,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False +1378.3927262,1129.72959425,0.0276375872853,1240.24654176,2,4,-0.0276375872853,3,accepted,197.979648839,,0.671566881753,False +1366.39852591,1663.89181669,0.0232493774308,1531.67257582,2,4,-0.0232493774308,3,accepted,197.979648839,,0.671566881753,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,2,4,-0.0225900037116,3,accepted,197.979648839,,0.671566881753,False +1129.72959425,1378.3927262,0.0276375872853,1267.87577762,2,4,-0.0276375872853,3,accepted,197.979648839,,0.671566881753,False +1129.72959425,1690.65387733,0.0248344852258,1441.35419559,2,4,-0.0248344852258,3,accepted,197.979648839,,0.671566881753,False +1539.41137861,1218.39018369,0.0253497655737,1361.06627062,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False +1366.39852591,1690.65387733,0.0230617103732,1546.54038708,2,4,-0.0230617103732,3,accepted,197.979648839,,0.671566881753,False +1129.72959425,1663.89181669,0.0250522497374,1426.48638489,2,4,-0.0250522497374,3,accepted,197.979648839,,0.671566881753,False +1378.3927262,1435.62919715,0.0248859058211,1410.19076535,2,4,-0.0248859058211,3,accepted,197.979648839,,0.671566881753,False +1539.41137861,1218.39018369,0.0253497655737,1361.06627062,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False +1366.39852591,1378.3927262,0.0254595848503,1373.06197069,2,4,-0.0254595848503,3,accepted,197.979648839,,0.671566881753,False +1435.62919715,1663.89181669,0.022770042192,1562.44176181,2,4,-0.022770042192,3,accepted,197.979648839,,0.671566881753,False +1539.41137861,1218.39018369,0.0253497655737,1361.06627062,2,4,-0.0253497655737,3,accepted,197.979648839,,0.671566881753,False +1366.39852591,1663.89181669,0.0232493774308,1531.67257582,2,4,-0.0232493774308,3,accepted,197.979648839,,0.671566881753,False +1690.65387733,1366.39852591,0.0230617103732,1510.51201059,2,5,-0.0230617103732,4,accepted,140.893512694,,0.684722561146,False +1435.62919715,1378.3927262,0.0248859058211,1403.83115652,2,5,-0.0248859058211,4,accepted,140.893512694,,0.684722561146,False +1663.89181669,1366.39852591,0.0232493774308,1498.61776576,2,5,-0.0232493774308,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1366.39852591,0.0230617103732,1510.51201059,2,5,-0.0230617103732,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False +1539.41137861,1366.39852591,0.0241640109541,1443.29312728,2,5,-0.0241640109541,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,2,5,-0.0210071821403,4,accepted,140.893512694,,0.684722561146,False +1663.89181669,1435.62919715,0.022770042192,1537.07924922,2,5,-0.022770042192,4,accepted,140.893512694,,0.684722561146,False +1378.3927262,1435.62919715,0.0248859058211,1410.19076535,2,5,-0.0248859058211,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False +1378.3927262,1435.62919715,0.0248859058211,1410.19076535,2,5,-0.0248859058211,4,accepted,140.893512694,,0.684722561146,False +1539.41137861,1435.62919715,0.0236466392783,1481.7546112,2,5,-0.0236466392783,4,accepted,140.893512694,,0.684722561146,False +1378.3927262,1690.65387733,0.0229785815411,1551.87114358,2,5,-0.0229785815411,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False +1663.89181669,1435.62919715,0.022770042192,1537.07924922,2,5,-0.022770042192,4,accepted,140.893512694,,0.684722561146,False +1539.41137861,1435.62919715,0.0236466392783,1481.7546112,2,5,-0.0236466392783,4,accepted,140.893512694,,0.684722561146,False +1663.89181669,1690.65387733,0.0211627879736,1678.75962675,2,5,-0.0211627879736,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,2,5,-0.0225900037116,4,accepted,140.893512694,,0.684722561146,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,2,5,-0.0219179489586,4,accepted,140.893512694,,0.684722561146,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1539.41137861,0.0219179489586,1606.63026775,1,6,-0.0219179489586,5,accepted,109.538903011,,0.479834643387,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1366.39852591,0.0230617103732,1510.51201059,1,6,-0.0230617103732,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,1,6,-0.0225900037116,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1378.3927262,0.0229785815411,1517.17546019,1,6,-0.0229785815411,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,6,-0.0210071821403,5,accepted,109.538903011,,0.479834643387,False +1435.62919715,1539.41137861,0.0236466392783,1493.28596409,1,6,-0.0236466392783,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,6,-0.0210071821403,5,accepted,109.538903011,,0.479834643387,False +1435.62919715,1366.39852591,0.0249834368019,1397.16771227,1,6,-0.0249834368019,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,6,-0.0210071821403,5,accepted,109.538903011,,0.479834643387,False +1378.3927262,1435.62919715,0.0248859058211,1410.19076535,1,6,-0.0248859058211,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1539.41137861,0.0219179489586,1606.63026775,1,6,-0.0219179489586,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1366.39852591,0.0230617103732,1510.51201059,1,6,-0.0230617103732,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1539.41137861,0.0219179489586,1606.63026775,1,6,-0.0219179489586,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1378.3927262,0.0229785815411,1517.17546019,1,6,-0.0229785815411,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1366.39852591,0.0230617103732,1510.51201059,1,6,-0.0230617103732,5,accepted,109.538903011,,0.479834643387,False +1690.65387733,1378.3927262,0.0229785815411,1517.17546019,1,6,-0.0229785815411,5,accepted,109.538903011,,0.479834643387,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,7,-0.0210071821403,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1435.62919715,0.0244307822444,1435.62919584,1,7,-0.0244307822444,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1690.65387733,0.0225900037116,1577.30957346,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,7,-0.0210071821403,6,accepted,118.371970783,,0.292893218813,False +1435.62919715,1435.62919715,0.0244307822444,1435.62919584,1,7,-0.0244307822444,6,accepted,118.371970783,,0.292893218813,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,1,7,-0.0219179489586,6,accepted,118.371970783,,0.292893218813,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,1,7,-0.0225900037116,6,accepted,118.371970783,,0.292893218813,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,0,8,-0.0225900037116,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,0,8,-0.0225900037116,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1539.41137861,0.0219179489586,1606.63026775,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1435.62919715,0.0225900037116,1548.9734991,0,8,-0.0225900037116,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1435.62919715,1539.41137861,0.0236466392783,1493.28596409,0,8,-0.0236466392783,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1539.41137861,0.0219179489586,1606.63026775,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1539.41137861,0.0219179489586,1606.63026775,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False +1539.41137861,1690.65387733,0.0219179489586,1623.43498699,0,8,-0.0219179489586,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,8,-0.0210071821403,7,accepted,69.8397639037,,0.580650012503,False +1690.65387733,1663.89181669,0.0211627879736,1675.78606447,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1663.89181669,0.0211627879736,1675.78606447,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1663.89181669,0.0211627879736,1675.78606447,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1663.89181669,0.0211627879736,1675.78606447,0,9,-0.0211627879736,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,0,9,-0.0210071821403,8,accepted,81.4225770116,,0.292893218813,False +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,accepted,0.0,,1.0,True +1690.65387733,1690.65387733,0.0210071821403,1690.65387602,1,10,-0.0210071821403,9,final,0.0,,1.0,True diff --git a/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/metaModelWithCodeAndFunctionsAndGenetic/opt_export.csv b/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/metaModelWithCodeAndFunctionsAndGenetic/opt_export.csv index a6eabfb1da..8e484633b0 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/metaModelWithCodeAndFunctionsAndGenetic/opt_export.csv +++ b/tests/framework/Optimizers/GeneticAlgorithms/gold/continuous/unconstrained/metaModelWithCodeAndFunctionsAndGenetic/opt_export.csv @@ -1,22 +1,22 @@ trajID,sigma-A,sigma-B,decay_A,decay_B,sum,age,batchId,fitness,iteration,accepted,AHDp,conv_AHDp -0,812.997460787,464.508307042,1.255650268e-08,0.000100012556503,3.15760954156,0,1,-3.15760954156,0,first,,False 0,759.507928453,912.545952926,8.14640085566e-08,0.000100081464009,2.90476176926,0,1,-2.90476176926,0,first,,False -0,912.545952926,812.997460787,1.255650268e-08,0.000100012556503,3.15873736407,0,2,-3.15873736407,1,accepted,299.428022512,False +0,812.997460787,464.508307042,1.255650268e-08,0.000100012556503,3.15760954156,0,1,-3.15760954156,0,first,,False 0,464.508307042,759.507928453,8.14640085566e-08,0.000100081464009,2.83929690449,0,2,-2.83929690449,1,accepted,299.428022512,False +0,912.545952926,812.997460787,1.255650268e-08,0.000100012556503,3.15873736407,0,2,-3.15873736407,1,accepted,299.428022512,False 0,794.044539517,912.545952926,5.18057476338e-08,0.000100051805748,2.98393998882,1,3,-2.98393998882,2,accepted,261.653404312,False 0,794.044539517,759.507928453,7.83557135608e-08,0.000100078355714,2.9174761674,1,3,-2.9174761674,2,accepted,261.653404312,False 0,912.545952926,464.508307042,8.14640085566e-08,0.000100081464009,2.93136915288,2,4,-2.93136915288,3,accepted,379.964041465,False 0,759.507928453,759.507928453,8.14640085566e-08,0.000100081464009,2.90491165751,2,4,-2.90491165751,3,accepted,379.964041465,False 0,464.508307042,912.545952926,8.14640085566e-08,0.000100081464009,2.83915821533,3,5,-2.83915821533,4,accepted,154.98621892,False 0,794.044539517,759.507928453,7.83557135608e-08,0.000100078355714,2.9174761674,3,5,-2.9174761674,4,accepted,154.98621892,False -0,912.545952926,464.508307042,8.14640085566e-08,0.000100081464009,2.93136915288,3,6,-2.93136915288,5,accepted,484.155218746,False 0,759.507928453,464.508307042,8.14640085566e-08,0.000100081464009,2.90520071484,3,6,-2.90520071484,5,accepted,484.155218746,False -0,912.545952926,464.508307042,8.14640085566e-08,0.000100081464009,2.93136915288,4,7,-2.93136915288,6,accepted,484.155218746,False +0,912.545952926,464.508307042,8.14640085566e-08,0.000100081464009,2.93136915288,3,6,-2.93136915288,5,accepted,484.155218746,False 0,759.507928453,464.508307042,8.14640085566e-08,0.000100081464009,2.90520071484,4,7,-2.90520071484,6,accepted,484.155218746,False +0,912.545952926,464.508307042,8.14640085566e-08,0.000100081464009,2.93136915288,4,7,-2.93136915288,6,accepted,484.155218746,False 0,794.044539517,759.507928453,5.18057476338e-08,0.000100051805748,2.98410104597,5,8,-2.98410104597,7,accepted,329.536232476,False 0,794.044539517,912.545952926,5.18057476338e-08,0.000100051805748,2.98393998882,5,8,-2.98393998882,7,accepted,329.536232476,False -0,794.044539517,759.507928453,5.18057476338e-08,0.000100051805748,2.98410104597,6,9,-2.98410104597,8,accepted,261.553081047,False 0,464.508307042,912.545952926,8.14640085566e-08,0.000100081464009,2.83915821533,6,9,-2.83915821533,8,accepted,261.553081047,False +0,794.044539517,759.507928453,5.18057476338e-08,0.000100051805748,2.98410104597,6,9,-2.98410104597,8,accepted,261.553081047,False 0,794.044539517,912.545952926,5.18057476338e-08,0.000100051805748,2.98393998882,4,10,-2.98393998882,9,accepted,329.536232476,False 0,794.044539517,912.545952926,5.18057476338e-08,0.000100051805748,2.98393998882,4,10,-2.98393998882,9,accepted,329.536232476,False 0,464.508307042,794.044539517,9.21291357633e-08,0.000100092129136,2.81925891819,5,11,-2.81925891819,10,accepted,118.501413408,False @@ -29,11 +29,14 @@ trajID,sigma-A,sigma-B,decay_A,decay_B,sum,age,batchId,fitness,iteration,accepte 0,912.545952926,794.044539517,5.18057476338e-08,0.000100051805748,3.00110960171,2,14,-3.00110960171,13,accepted,448.037645884,False 0,912.545952926,794.044539517,5.18057476338e-08,0.000100051805748,3.00110960171,3,15,-3.00110960171,14,accepted,448.037645884,False 0,912.545952926,794.044539517,5.18057476338e-08,0.000100051805748,3.00110960171,3,15,-3.00110960171,14,accepted,448.037645884,False -0,794.044539517,464.508307042,9.21291357633e-08,0.000100092129136,2.89183632446,4,16,-2.89183632446,15,accepted,369.891914497,False 0,464.508307042,794.044539517,9.21291357633e-08,0.000100092129136,2.81925891819,4,16,-2.81925891819,15,accepted,369.891914497,False +0,794.044539517,464.508307042,9.21291357633e-08,0.000100092129136,2.89183632446,4,16,-2.89183632446,15,accepted,369.891914497,False 0,794.044539517,464.508307042,9.21291357633e-08,0.000100092129136,2.89183632446,3,17,-2.89183632446,16,accepted,466.03460926,False 0,794.044539517,464.508307042,9.21291357633e-08,0.000100092129136,2.89183632446,3,17,-2.89183632446,16,accepted,466.03460926,False 0,794.044539517,464.508307042,9.21291357633e-08,0.000100092129136,2.89183632446,4,18,-2.89183632446,17,accepted,466.03460926,False 0,794.044539517,464.508307042,9.21291357633e-08,0.000100092129136,2.89183632446,4,18,-2.89183632446,17,accepted,466.03460926,False -0,464.508307042,912.545952926,8.14640085566e-08,0.000100081464009,2.83915821533,5,19,-2.83915821533,18,accepted,94.054634152,False 0,464.508307042,794.044539517,9.21291357633e-08,0.000100092129136,2.81925891819,5,19,-2.81925891819,18,accepted,94.054634152,False +0,464.508307042,912.545952926,8.14640085566e-08,0.000100081464009,2.83915821533,5,19,-2.83915821533,18,accepted,94.054634152,False +0,464.508307042,794.044539517,9.21291357633e-08,0.000100092129136,2.81925891819,3,20,-2.81925891819,19,accepted,94.054634152,False +0,464.508307042,912.545952926,8.14640085566e-08,0.000100081464009,2.83915821533,3,20,-2.83915821533,19,accepted,94.054634152,False +0,464.508307042,794.044539517,9.21291357633e-08,0.000100092129136,2.81925891819,1,20,-2.81925891819,19,final,94.054634152,False From 90536b080228f8c32e8628c5f961349620fa0455 Mon Sep 17 00:00:00 2001 From: Andrea Alfonsi - NuCube Date: Mon, 21 Oct 2024 12:43:11 -0600 Subject: [PATCH 03/12] Update ravenframework/Steps/MultiRun.py --- ravenframework/Steps/MultiRun.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ravenframework/Steps/MultiRun.py b/ravenframework/Steps/MultiRun.py index 1c010bda17..b65c8bc5f1 100644 --- a/ravenframework/Steps/MultiRun.py +++ b/ravenframework/Steps/MultiRun.py @@ -273,7 +273,6 @@ def _localTakeAstepRun(self, inDictionary): self.raiseAMessage(f'Just collected job {finishedJob.identifier} and sent to output "{inDictionary["Output"][outIndex].name}"') - def _addNewRuns(self, sampler, model, inputs, outputs, jobHandler, inDictionary, verbose=True): """ Checks for open spaces and adds new runs to jobHandler queue (via model.submit currently) From 2b68e5ccf5648da25287f0f38939022d6d14693f Mon Sep 17 00:00:00 2001 From: alfoa Date: Wed, 23 Oct 2024 08:51:21 -0600 Subject: [PATCH 04/12] if the printing is done, don't print --- ravenframework/OutStreams/PrintInterfaces/FilePrint.py | 2 ++ ravenframework/Steps/MultiRun.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ravenframework/OutStreams/PrintInterfaces/FilePrint.py b/ravenframework/OutStreams/PrintInterfaces/FilePrint.py index c9827f1307..cf568e9098 100644 --- a/ravenframework/OutStreams/PrintInterfaces/FilePrint.py +++ b/ravenframework/OutStreams/PrintInterfaces/FilePrint.py @@ -148,6 +148,8 @@ def run(self): if self.options['type'] == 'csv': filename = dictOptions['filenameroot'] rlzIndex = self.indexPrinted.get(filename,0) + if rlzIndex >= len(self.sourceData[index]): + continue dictOptions['firstIndex'] = rlzIndex # clusterLabel lets the user print a point set as if it were a history, with input decided by clusterLabel if 'clusterLabel' in self.options: diff --git a/ravenframework/Steps/MultiRun.py b/ravenframework/Steps/MultiRun.py index 1c010bda17..f1fa27a4c2 100644 --- a/ravenframework/Steps/MultiRun.py +++ b/ravenframework/Steps/MultiRun.py @@ -270,7 +270,7 @@ def _localTakeAstepRun(self, inDictionary): for myLambda, outIndex in self._outputCollectionLambda: if isinstance(outputs[outIndex], OutStreamEntity): myLambda([None,outputs[outIndex]]) - self.raiseAMessage(f'Just collected job {finishedJob.identifier} and sent to output "{inDictionary["Output"][outIndex].name}"') + self.raiseAMessage(f'Finalized output "{inDictionary["Output"][outIndex].name}"') From 39c5a3912502e4fec692460cb8d48becaf79c751 Mon Sep 17 00:00:00 2001 From: alfoa Date: Wed, 23 Oct 2024 10:06:29 -0600 Subject: [PATCH 05/12] xml --- ravenframework/OutStreams/PrintInterfaces/FilePrint.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ravenframework/OutStreams/PrintInterfaces/FilePrint.py b/ravenframework/OutStreams/PrintInterfaces/FilePrint.py index cf568e9098..438af43368 100644 --- a/ravenframework/OutStreams/PrintInterfaces/FilePrint.py +++ b/ravenframework/OutStreams/PrintInterfaces/FilePrint.py @@ -148,7 +148,7 @@ def run(self): if self.options['type'] == 'csv': filename = dictOptions['filenameroot'] rlzIndex = self.indexPrinted.get(filename,0) - if rlzIndex >= len(self.sourceData[index]): + if rlzIndex and rlzIndex >= len(self.sourceData[index]): continue dictOptions['firstIndex'] = rlzIndex # clusterLabel lets the user print a point set as if it were a history, with input decided by clusterLabel From e8b15fd74a5a20ce9d028f2effd27cf4f7bc4777 Mon Sep 17 00:00:00 2001 From: Andrea Alfonsi - NuCube Date: Wed, 23 Oct 2024 14:22:56 -0600 Subject: [PATCH 06/12] Update tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml --- .../discrete/unconstrained/testGAMaxwoRepConvAHDp.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml index 5e3ee21bb3..146cc0b4b7 100644 --- a/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml +++ b/tests/framework/Optimizers/GeneticAlgorithms/discrete/unconstrained/testGAMaxwoRepConvAHDp.xml @@ -12,7 +12,7 @@ The convergence criterion used is the (p-Average Hausdorff Distance between populations) AHDp. - Modified writeSteps to ``final'' to makes sure the Outstream is executed and the final solution is always written. Closes #2386 + Modified writeSteps to ``final'' to make sure the Outstream is executed and the final solution is always written. Closes #2386 This test uses myLocalSum's analytic objective function. From 5fe59322aacd065a8f693b09c9d7bcee4618f3ae Mon Sep 17 00:00:00 2001 From: alfoa Date: Fri, 25 Oct 2024 15:41:12 -0600 Subject: [PATCH 07/12] test pinned library --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index 6f998d46ea..f92bb28e43 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -68,7 +68,7 @@ Note all install methods after "main" take 2.6 - + 5.1 2.22 From d9c9dcc83b7c9ae50e174a8b1f689507f80c0983 Mon Sep 17 00:00:00 2001 From: alfoa Date: Mon, 28 Oct 2024 08:15:43 -0600 Subject: [PATCH 08/12] trying with 5.1.0 --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index f92bb28e43..c002bfa7cf 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -68,7 +68,7 @@ Note all install methods after "main" take 2.6 - 5.1 + 5.1.0 2.22 From 57d648c181e427da076e79099ee9cd0d8464d270 Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 31 Oct 2024 16:48:24 -0600 Subject: [PATCH 09/12] trying version of ray and redis that worked on windows --- dependencies.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.xml b/dependencies.xml index c002bfa7cf..84ec819d92 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -66,9 +66,9 @@ Note all install methods after "main" take - 2.6 + 2.6.3 - 5.1.0 + 5.0.8 2.22 From 50828f1176f3d22922c95c7e2789b4e4119cd6ae Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 31 Oct 2024 16:50:03 -0600 Subject: [PATCH 10/12] trying version of ray and redis that worked on windows --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index 84ec819d92..0cf127b3db 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -68,7 +68,7 @@ Note all install methods after "main" take 2.6.3 - 5.0.8 + 5.2.0 2.22 From e63c1e22992ebf43724df301fe5f761731750e2c Mon Sep 17 00:00:00 2001 From: alfoa Date: Wed, 6 Nov 2024 14:55:16 -0700 Subject: [PATCH 11/12] changed approach to fix the issue. This is much cleaner and less confusing --- .../OutStreams/PrintInterfaces/FilePrint.py | 2 -- ravenframework/Steps/MultiRun.py | 21 ++++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ravenframework/OutStreams/PrintInterfaces/FilePrint.py b/ravenframework/OutStreams/PrintInterfaces/FilePrint.py index 438af43368..c9827f1307 100644 --- a/ravenframework/OutStreams/PrintInterfaces/FilePrint.py +++ b/ravenframework/OutStreams/PrintInterfaces/FilePrint.py @@ -148,8 +148,6 @@ def run(self): if self.options['type'] == 'csv': filename = dictOptions['filenameroot'] rlzIndex = self.indexPrinted.get(filename,0) - if rlzIndex and rlzIndex >= len(self.sourceData[index]): - continue dictOptions['firstIndex'] = rlzIndex # clusterLabel lets the user print a point set as if it were a history, with input decided by clusterLabel if 'clusterLabel' in self.options: diff --git a/ravenframework/Steps/MultiRun.py b/ravenframework/Steps/MultiRun.py index 83479f1096..15aa5807f1 100644 --- a/ravenframework/Steps/MultiRun.py +++ b/ravenframework/Steps/MultiRun.py @@ -44,9 +44,10 @@ def __init__(self): @ Out, None """ super().__init__() - self._samplerInitDict = {} # dictionary that gets sent to the initialization of the sampler - self.counter = 0 # counter of the runs already performed - self._outputCollectionLambda = None # lambda function list to collect the output without checking the type + self._samplerInitDict = {} # dict that gets sent to the initialization of the sampler + self.counter = 0 # counter of the runs already performed + self._outputCollectionLambda = None # lambda function list to collect the output (Dataobjects/Databases) without checking the type + self._outStreamCollectionLambda = None # lambda function list to collect the outstreams self.printTag = 'STEP MULTIRUN' def _localInputAndCheckParam(self, paramInput): @@ -100,6 +101,7 @@ def _localInitializeStep(self, inDictionary): self._initializeSampler(inDictionary) #generate lambda function list to collect the output without checking the type self._outputCollectionLambda = [] + self._outStreamCollectionLambda = [] # set up output collection lambdas for outIndex, output in enumerate(inDictionary['Output']): if not isinstance(output, OutStreamEntity): @@ -108,7 +110,7 @@ def _localInitializeStep(self, inDictionary): else: self._outputCollectionLambda.append( (lambda x: inDictionary['Model'].collectOutput(x[0],x[1]), outIndex) ) else: - self._outputCollectionLambda.append((lambda x: x[1].addOutput(), outIndex)) + self._outStreamCollectionLambda.append((lambda x: x.addOutput(), outIndex)) self._registerMetadata(inDictionary) self.raiseADebug(f'Generating input batch of size {inDictionary["jobHandler"].runInfoDict["batchSize"]}') # set up and run the first batch of samples @@ -227,6 +229,11 @@ def _localTakeAstepRun(self, inDictionary): for finishedJob in finishedJobList: # finalize actual sampler sampler.finalizeActualSampling(finishedJob,model,inputs) + # collect all the outstreams. + for myLambda, outIndex in self._outStreamCollectionLambda: + myLambda(outputs[outIndex]) + self.raiseAMessage(f'Just collected OutStream "{inDictionary["Output"][outIndex].name}"') + for finishedJob in finishedJobList: finishedJob.trackTime('step_finished') @@ -267,10 +274,7 @@ def _localTakeAstepRun(self, inDictionary): # END while loop that runs the step iterations (collection and submission-for-DET) # if any collected runs failed, let the sampler treat them appropriately, and any other closing-out actions sampler.finalizeSampler(self.failedRuns) - for myLambda, outIndex in self._outputCollectionLambda: - if isinstance(outputs[outIndex], OutStreamEntity): - myLambda([None,outputs[outIndex]]) - self.raiseAMessage(f'Finalized output "{inDictionary["Output"][outIndex].name}"') + def _addNewRuns(self, sampler, model, inputs, outputs, jobHandler, inDictionary, verbose=True): @@ -355,3 +359,4 @@ def flushStep(self): self._samplerInitDict = {} self.counter = 0 self._outputCollectionLambda = None + self._outStreamCollectionLambda = None From 3164cbc5de083e6715708db80348cdcbc793ab72 Mon Sep 17 00:00:00 2001 From: Andrea Alfonsi - NuCube Date: Wed, 6 Nov 2024 14:59:14 -0700 Subject: [PATCH 12/12] Apply suggestions from code review --- dependencies.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.xml b/dependencies.xml index 0cf127b3db..6f998d46ea 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -66,9 +66,9 @@ Note all install methods after "main" take - 2.6.3 + 2.6 - 5.2.0 + 2.22