diff --git a/developer_tools/XSDSchemas/Optimizers.xsd b/developer_tools/XSDSchemas/Optimizers.xsd index b13f2ca3ab..25e0f1973c 100644 --- a/developer_tools/XSDSchemas/Optimizers.xsd +++ b/developer_tools/XSDSchemas/Optimizers.xsd @@ -78,6 +78,7 @@ + diff --git a/ravenframework/Optimizers/GradientDescent.py b/ravenframework/Optimizers/GradientDescent.py index 452f579f4e..fba00fdfc2 100644 --- a/ravenframework/Optimizers/GradientDescent.py +++ b/ravenframework/Optimizers/GradientDescent.py @@ -67,6 +67,12 @@ class GradientDescent(RavenSampled): # TODO change in input space? 'objective': r"""provides the maximum relative change in the objective function for convergence.""", 'stepSize': r"""provides the maximum size in relative step size for convergence.""", + 'iterationLimit': r"""provides the maximum number of iterations at which the optimizer will terminate regardless of the status of any convergence criteria. + Note that for Gradient Descent this counts only the optimization sweeps not the gradient evaluations. + It is important to differentiate this from sampler'sinit node as the latter counts every model evaluation, + hence, if n variables we will have 2n gradient evaluation if using centeral difference, number of iteration will be /(2n). If is less than the the GA will honor this lower limit. + I.e., the termination (given all other covergence criteria are not met) will occur at min{, ceil(/gradient evaluations per variable/\# of variables) +1} + For instance: if the \# of Variables is 2, and we perform 2 evaluations per variable for gradients, and if = 20, and is 10, the termination will occur at min{ceiling(20/(2*2))+1,10} = 6.""" } ########################## @@ -149,7 +155,6 @@ def getInputSpecification(cls): descr=r"""provides the number of consecutive times a functional constraint boundary can be explored for an acceptable sampling point before aborting search. Only apples if using a \xmlNode{Constraint}. \default{500}""")) - for name, descr in cls.convergenceOptions.items(): conv.addSub(InputData.parameterInputFactory(name, contentType=InputTypes.FloatType, descr=descr)) terminate = InputData.parameterInputFactory('terminateFollowers', contentType=InputTypes.BoolType, @@ -265,6 +270,8 @@ def handleInput(self, paramInput): elif sub.getName() == 'terminateFollowers': self._terminateFollowers = sub.value self._followerProximity = sub.parameterValues.get('proximity', 1e-2) + elif sub.getName() == 'iterationLimit': + self._convergenceCriteria['iterationLimit'] = sub.value elif sub.getName() == 'constraintExplorationLimit': self._functionalConstraintExplorationLimit = sub.value else: @@ -619,6 +626,7 @@ def _checkAcceptability(self, traj, opt, optVal, info): # if this is an opt point rerun, accept it without checking. elif self._acceptRerun[traj]: acceptable = 'rerun' + self.incrementIteration self._acceptRerun[traj] = False self._stepRecommendations[traj] = 'shrink' # FIXME how much do we really want this? # check if same point @@ -790,6 +798,13 @@ def _checkConvGradient(self, traj): return converged + def _checkConvIterationLimit(self,traj): + converged = self.getIteration(traj) >= self._convergenceCriteria['iterationLimit'] + self.raiseADebug(self.convFormat.format(name='iterationLimit', + conv=str(converged), + got=int(self.getIteration(traj)), + req=int(self._convergenceCriteria['iterationLimit']))) + return converged def _checkConvStepSize(self, traj): """ Checks the step size for convergence diff --git a/ravenframework/Optimizers/RavenSampled.py b/ravenframework/Optimizers/RavenSampled.py index f5f20ab459..bd8bf09414 100644 --- a/ravenframework/Optimizers/RavenSampled.py +++ b/ravenframework/Optimizers/RavenSampled.py @@ -231,7 +231,7 @@ def localGenerateInput(self, model, inp): self.inputInfo['batchMode'] = False for _ in range(self.batch): inputInfo = {'SampledVarsPb':{}, 'batchMode':self.inputInfo['batchMode']} # ,'prefix': str(self.batchId)+'_'+str(i) - if self.counter == self.limit + 1: + if self.getIteration(all(self._activeTraj)) == self.limit + 1: break # get point from stack point, info = self._submissionQueue.popleft() @@ -560,6 +560,8 @@ def _resolveNewOptPoint(self, traj, rlz, optVal, info): # nothing else to do but wait for the grad points to be collected elif acceptable == 'rejected': self._rejectOptPoint(traj, info, old) + if self.printTag == 'GradientDescent': + self.__stepCounter[traj] -= 1 elif acceptable == 'rerun': # update the most recently obtained opt value for the rerun point # NOTE we do this because if we got "lucky" in an opt point evaluation, we can get stuck diff --git a/tests/framework/Optimizers/GradientDescent/converge_iterationLimit.xml b/tests/framework/Optimizers/GradientDescent/converge_iterationLimit.xml new file mode 100644 index 0000000000..dbf597073b --- /dev/null +++ b/tests/framework/Optimizers/GradientDescent/converge_iterationLimit.xml @@ -0,0 +1,112 @@ + + + + framework/Optimizers.ConvergeObjective + talbpaul + 2020-01-29 + Optimizer + + Extending on the Basic test, this test converges on change in objective function instead of + number of samples. + + + This test uses Beale's function, which is documented in the analytic tests documentation under + the Optimizer functions section. + + + + + ConvergeIterationLimit + optimize, print + + + + + placeholder + beale + opter + opt_export + optOut + + + opt_export + opt_export + + + + + + -4.5 + 4.5 + + + + + + ans + + beale_dist + -2 + + + beale_dist + -2 + + optOut + + 100 + 42 + every + + + + + + + 1.25 + 1.5 + + + + + + + 10 + 1e-4 + 1e-4 + 1e-12 + + + + + + + x,y,ans + + + + + + + x,y + ans + + + trajID + x,y,ans,stepSize,iteration,accepted,conv_iterationLimit,conv_gradient,conv_samePoint,conv_objective + + + + + + csv + optOut + + + csv + opt_export + trajID + + + + diff --git a/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_cd_0.csv b/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_cd_0.csv index f990916cdd..ce0acc3165 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_cd_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_cd_0.csv @@ -8,38 +8,38 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 2.1431640625,0.5,1.15860859692,0.1220703125,6.0,accepted,0.0 3.51645507813,0.5,0.420926728435,0.152587890625,7.0,accepted,0.0 1.79984130859,0.5,2.27310108344,0.190734863281,8.0,rejected,0.0 -3.51645507813,0.5,0.420926728435,0.190734863281,9.0,rerun,0.0 -2.37204589844,0.5,0.622296276884,0.127156575521,10.0,rejected,0.0 -3.51645507813,0.5,0.420926728435,0.127156575521,11.0,rerun,0.0 -2.753515625,0.5,0.0958782696724,0.0847710503472,12.0,accepted,0.0 -3.70718994141,0.5,0.789248108373,0.105963812934,13.0,rejected,0.0 -2.753515625,0.5,0.0958782696724,0.105963812934,14.0,rerun,0.0 -3.3892985026,0.5,0.239170089642,0.070642541956,15.0,rejected,0.0 -2.753515625,0.5,0.0958782696724,0.070642541956,16.0,rerun,0.0 -3.17737087674,0.5,0.049648487802,0.0470950279707,17.0,accepted,0.0 -2.64755181207,0.5,0.196034253796,0.0588687849633,18.0,rejected,0.0 -3.17737087674,0.5,0.049648487802,0.0588687849633,19.0,rerun,0.0 -2.82415816696,0.5,0.0487961777355,0.0392458566422,20.0,accepted,0.0 -3.26567405418,0.5,0.111388328275,0.0490573208028,21.0,rejected,0.0 -2.82415816696,0.5,0.0487961777355,0.0490573208028,22.0,rerun,0.0 -3.11850209177,0.5,0.0221612081439,0.0327048805352,23.0,accepted,0.0 -2.75057218575,0.5,0.0981818388529,0.040881100669,24.0,rejected,0.0 -3.11850209177,0.5,0.0221612081439,0.040881100669,25.0,rerun,0.0 -2.87321548776,0.5,0.0253672744839,0.0272540671127,26.0,rejected,0.0 -3.11850209177,0.5,0.0221612081439,0.0272540671127,27.0,rerun,0.0 -2.9549776891,0.5,0.00319887275602,0.0181693780751,28.0,accepted,0.0 -3.15938319244,0.5,0.0400891125832,0.0227117225939,29.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0227117225939,30.0,rerun,0.0 -3.09124802466,0.5,0.0131397875381,0.0151411483959,31.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0151411483959,32.0,rerun,0.0 -3.04582457947,0.5,0.00331389219477,0.0100940989306,33.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0100940989306,34.0,rerun,0.0 -3.01554228268,0.5,0.000381215900671,0.00672939928708,35.0,accepted,0.0 -2.9398365407,0.5,0.0057122472706,0.00841174910885,36.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00841174910885,37.0,rerun,0.0 -2.96507178803,0.5,0.00192528092425,0.00560783273923,38.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00560783273923,39.0,rerun,0.0 -2.98189528625,0.5,0.000517278854294,0.00373855515949,40.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00373855515949,41.0,rerun,0.0 -2.99311095172,0.5,7.4896212526e-05,0.00249237010632,42.0,accepted,0.0 -2.99311095172,0.5,7.4896212526e-05,0.00249237010632,42.0,final,0.0 +3.51645507813,0.5,0.420926728435,0.190734863281,8.0,rerun,0.0 +2.37204589844,0.5,0.622296276884,0.127156575521,9.0,rejected,0.0 +3.51645507813,0.5,0.420926728435,0.127156575521,9.0,rerun,0.0 +2.753515625,0.5,0.0958782696724,0.0847710503472,10.0,accepted,0.0 +3.70718994141,0.5,0.789248108373,0.105963812934,11.0,rejected,0.0 +2.753515625,0.5,0.0958782696724,0.105963812934,11.0,rerun,0.0 +3.3892985026,0.5,0.239170089642,0.070642541956,12.0,rejected,0.0 +2.753515625,0.5,0.0958782696724,0.070642541956,12.0,rerun,0.0 +3.17737087674,0.5,0.049648487802,0.0470950279707,13.0,accepted,0.0 +2.64755181207,0.5,0.196034253796,0.0588687849633,14.0,rejected,0.0 +3.17737087674,0.5,0.049648487802,0.0588687849633,14.0,rerun,0.0 +2.82415816696,0.5,0.0487961777355,0.0392458566422,15.0,accepted,0.0 +3.26567405418,0.5,0.111388328275,0.0490573208028,16.0,rejected,0.0 +2.82415816696,0.5,0.0487961777355,0.0490573208028,16.0,rerun,0.0 +3.11850209177,0.5,0.0221612081439,0.0327048805352,17.0,accepted,0.0 +2.75057218575,0.5,0.0981818388529,0.040881100669,18.0,rejected,0.0 +3.11850209177,0.5,0.0221612081439,0.040881100669,18.0,rerun,0.0 +2.87321548776,0.5,0.0253672744839,0.0272540671127,19.0,rejected,0.0 +3.11850209177,0.5,0.0221612081439,0.0272540671127,19.0,rerun,0.0 +2.9549776891,0.5,0.00319887275602,0.0181693780751,20.0,accepted,0.0 +3.15938319244,0.5,0.0400891125832,0.0227117225939,21.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0227117225939,21.0,rerun,0.0 +3.09124802466,0.5,0.0131397875381,0.0151411483959,22.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0151411483959,22.0,rerun,0.0 +3.04582457947,0.5,0.00331389219477,0.0100940989306,23.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0100940989306,23.0,rerun,0.0 +3.01554228268,0.5,0.000381215900671,0.00672939928708,24.0,accepted,0.0 +2.9398365407,0.5,0.0057122472706,0.00841174910885,25.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00841174910885,25.0,rerun,0.0 +2.96507178803,0.5,0.00192528092425,0.00560783273923,26.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00560783273923,26.0,rerun,0.0 +2.98189528625,0.5,0.000517278854294,0.00373855515949,27.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00373855515949,27.0,rerun,0.0 +2.99311095172,0.5,7.4896212526e-05,0.00249237010632,28.0,accepted,0.0 +2.99311095172,0.5,7.4896212526e-05,0.00249237010632,28.0,final,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_fd_0.csv b/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_fd_0.csv index 9e4db26b37..92efbe3e6c 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_fd_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_fd_0.csv @@ -8,55 +8,55 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 2.1431640625,0.5,1.15860859692,0.1220703125,6.0,accepted,0.0 3.51645507813,0.5,0.420926728435,0.152587890625,7.0,accepted,0.0 1.79984130859,0.5,2.27310108344,0.190734863281,8.0,rejected,0.0 -3.51645507813,0.5,0.420926728435,0.190734863281,9.0,rerun,0.0 -2.37204589844,0.5,0.622296276884,0.127156575521,10.0,rejected,0.0 -3.51645507813,0.5,0.420926728435,0.127156575521,11.0,rerun,0.0 -2.753515625,0.5,0.0958782696724,0.0847710503472,12.0,accepted,0.0 -3.70718994141,0.5,0.789248108373,0.105963812934,13.0,rejected,0.0 -2.753515625,0.5,0.0958782696724,0.105963812934,14.0,rerun,0.0 -3.3892985026,0.5,0.239170089642,0.070642541956,15.0,rejected,0.0 -2.753515625,0.5,0.0958782696724,0.070642541956,16.0,rerun,0.0 -3.17737087674,0.5,0.049648487802,0.0470950279707,17.0,accepted,0.0 -2.64755181207,0.5,0.196034253796,0.0588687849633,18.0,rejected,0.0 -3.17737087674,0.5,0.049648487802,0.0588687849633,19.0,rerun,0.0 -2.82415816696,0.5,0.0487961777355,0.0392458566422,20.0,accepted,0.0 -3.26567405418,0.5,0.111388328275,0.0490573208028,21.0,rejected,0.0 -2.82415816696,0.5,0.0487961777355,0.0490573208028,22.0,rerun,0.0 -3.11850209177,0.5,0.0221612081439,0.0327048805352,23.0,accepted,0.0 -2.75057218575,0.5,0.0981818388529,0.040881100669,24.0,rejected,0.0 -3.11850209177,0.5,0.0221612081439,0.040881100669,25.0,rerun,0.0 -2.87321548776,0.5,0.0253672744839,0.0272540671127,26.0,rejected,0.0 -3.11850209177,0.5,0.0221612081439,0.0272540671127,27.0,rerun,0.0 -2.9549776891,0.5,0.00319887275602,0.0181693780751,28.0,accepted,0.0 -3.15938319244,0.5,0.0400891125832,0.0227117225939,29.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0227117225939,30.0,rerun,0.0 -3.09124802466,0.5,0.0131397875381,0.0151411483959,31.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0151411483959,32.0,rerun,0.0 -3.04582457947,0.5,0.00331389219477,0.0100940989306,33.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0100940989306,34.0,rerun,0.0 -3.01554228268,0.5,0.000381215900671,0.00672939928708,35.0,accepted,0.0 -2.9398365407,0.5,0.0057122472706,0.00841174910885,36.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00841174910885,37.0,rerun,0.0 -2.96507178803,0.5,0.00192528092425,0.00560783273923,38.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00560783273923,39.0,rerun,0.0 -2.98189528625,0.5,0.000517278854294,0.00373855515949,40.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00373855515949,41.0,rerun,0.0 -2.99311095172,0.5,7.4896212526e-05,0.00249237010632,42.0,accepted,0.0 -3.02115011542,0.5,0.000705938525141,0.00311546263291,43.0,rejected,0.0 -2.99311095172,0.5,7.4896212526e-05,0.00311546263291,44.0,rerun,0.0 -3.01180372752,0.5,0.000219876973787,0.0020769750886,45.0,rejected,0.0 -2.99311095172,0.5,7.4896212526e-05,0.0020769750886,46.0,rerun,0.0 -3.00557280226,0.5,4.90104472268e-05,0.00138465005907,47.0,accepted,0.0 -2.98999548909,0.5,0.000157954907688,0.00173081257384,48.0,rejected,0.0 -3.00557280226,0.5,4.90104472268e-05,0.00173081257384,49.0,rerun,0.0 -2.99518792681,0.5,3.65431388261e-05,0.00115387504922,50.0,accepted,0.0 -3.00816902112,0.5,0.00010531286727,0.00144234381153,51.0,rejected,0.0 -2.99518792681,0.5,3.65431388261e-05,0.00144234381153,52.0,rerun,0.0 -3.00384198968,0.5,2.32945211855e-05,0.00096156254102,53.0,accepted,0.0 -2.99302441109,0.5,7.67897327798e-05,0.00120195317628,54.0,rejected,0.0 -3.00384198968,0.5,2.32945211855e-05,0.00120195317628,55.0,rerun,0.0 -2.99663027062,0.5,1.79197294222e-05,0.000801302117517,56.0,accepted,0.0 -3.00564491945,0.5,5.0287135476e-05,0.0010016276469,57.0,rejected,0.0 -2.99663027062,0.5,1.79197294222e-05,0.0010016276469,58.0,rerun,0.0 -3.00264003651,0.5,1.09992041806e-05,0.000667751764597,59.0,accepted,0.0 -3.00264003651,0.5,1.09992041806e-05,0.000834689705747,60.0,final,0.0 +3.51645507813,0.5,0.420926728435,0.190734863281,8.0,rerun,0.0 +2.37204589844,0.5,0.622296276884,0.127156575521,9.0,rejected,0.0 +3.51645507813,0.5,0.420926728435,0.127156575521,9.0,rerun,0.0 +2.753515625,0.5,0.0958782696724,0.0847710503472,10.0,accepted,0.0 +3.70718994141,0.5,0.789248108373,0.105963812934,11.0,rejected,0.0 +2.753515625,0.5,0.0958782696724,0.105963812934,11.0,rerun,0.0 +3.3892985026,0.5,0.239170089642,0.070642541956,12.0,rejected,0.0 +2.753515625,0.5,0.0958782696724,0.070642541956,12.0,rerun,0.0 +3.17737087674,0.5,0.049648487802,0.0470950279707,13.0,accepted,0.0 +2.64755181207,0.5,0.196034253796,0.0588687849633,14.0,rejected,0.0 +3.17737087674,0.5,0.049648487802,0.0588687849633,14.0,rerun,0.0 +2.82415816696,0.5,0.0487961777355,0.0392458566422,15.0,accepted,0.0 +3.26567405418,0.5,0.111388328275,0.0490573208028,16.0,rejected,0.0 +2.82415816696,0.5,0.0487961777355,0.0490573208028,16.0,rerun,0.0 +3.11850209177,0.5,0.0221612081439,0.0327048805352,17.0,accepted,0.0 +2.75057218575,0.5,0.0981818388529,0.040881100669,18.0,rejected,0.0 +3.11850209177,0.5,0.0221612081439,0.040881100669,18.0,rerun,0.0 +2.87321548776,0.5,0.0253672744839,0.0272540671127,19.0,rejected,0.0 +3.11850209177,0.5,0.0221612081439,0.0272540671127,19.0,rerun,0.0 +2.9549776891,0.5,0.00319887275602,0.0181693780751,20.0,accepted,0.0 +3.15938319244,0.5,0.0400891125832,0.0227117225939,21.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0227117225939,21.0,rerun,0.0 +3.09124802466,0.5,0.0131397875381,0.0151411483959,22.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0151411483959,22.0,rerun,0.0 +3.04582457947,0.5,0.00331389219477,0.0100940989306,23.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0100940989306,23.0,rerun,0.0 +3.01554228268,0.5,0.000381215900671,0.00672939928708,24.0,accepted,0.0 +2.9398365407,0.5,0.0057122472706,0.00841174910885,25.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00841174910885,25.0,rerun,0.0 +2.96507178803,0.5,0.00192528092425,0.00560783273923,26.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00560783273923,26.0,rerun,0.0 +2.98189528625,0.5,0.000517278854294,0.00373855515949,27.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00373855515949,27.0,rerun,0.0 +2.99311095172,0.5,7.4896212526e-05,0.00249237010632,28.0,accepted,0.0 +3.02115011542,0.5,0.000705938525141,0.00311546263291,29.0,rejected,0.0 +2.99311095172,0.5,7.4896212526e-05,0.00311546263291,29.0,rerun,0.0 +3.01180372752,0.5,0.000219876973787,0.0020769750886,30.0,rejected,0.0 +2.99311095172,0.5,7.4896212526e-05,0.0020769750886,30.0,rerun,0.0 +3.00557280226,0.5,4.90104472268e-05,0.00138465005907,31.0,accepted,0.0 +2.98999548909,0.5,0.000157954907688,0.00173081257384,32.0,rejected,0.0 +3.00557280226,0.5,4.90104472268e-05,0.00173081257384,32.0,rerun,0.0 +2.99518792681,0.5,3.65431388261e-05,0.00115387504922,33.0,accepted,0.0 +3.00816902112,0.5,0.00010531286727,0.00144234381153,34.0,rejected,0.0 +2.99518792681,0.5,3.65431388261e-05,0.00144234381153,34.0,rerun,0.0 +3.00384198968,0.5,2.32945211855e-05,0.00096156254102,35.0,accepted,0.0 +2.99302441109,0.5,7.67897327798e-05,0.00120195317628,36.0,rejected,0.0 +3.00384198968,0.5,2.32945211855e-05,0.00120195317628,36.0,rerun,0.0 +2.99663027062,0.5,1.79197294222e-05,0.000801302117517,37.0,accepted,0.0 +3.00564491945,0.5,5.0287135476e-05,0.0010016276469,38.0,rejected,0.0 +2.99663027062,0.5,1.79197294222e-05,0.0010016276469,38.0,rerun,0.0 +3.00264003651,0.5,1.09992041806e-05,0.000667751764597,39.0,accepted,0.0 +3.00264003651,0.5,1.09992041806e-05,0.000834689705747,40.0,final,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_spsa_0.csv b/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_spsa_0.csv index 9e4db26b37..92efbe3e6c 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_spsa_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/1variable/opt_export_spsa_0.csv @@ -8,55 +8,55 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 2.1431640625,0.5,1.15860859692,0.1220703125,6.0,accepted,0.0 3.51645507813,0.5,0.420926728435,0.152587890625,7.0,accepted,0.0 1.79984130859,0.5,2.27310108344,0.190734863281,8.0,rejected,0.0 -3.51645507813,0.5,0.420926728435,0.190734863281,9.0,rerun,0.0 -2.37204589844,0.5,0.622296276884,0.127156575521,10.0,rejected,0.0 -3.51645507813,0.5,0.420926728435,0.127156575521,11.0,rerun,0.0 -2.753515625,0.5,0.0958782696724,0.0847710503472,12.0,accepted,0.0 -3.70718994141,0.5,0.789248108373,0.105963812934,13.0,rejected,0.0 -2.753515625,0.5,0.0958782696724,0.105963812934,14.0,rerun,0.0 -3.3892985026,0.5,0.239170089642,0.070642541956,15.0,rejected,0.0 -2.753515625,0.5,0.0958782696724,0.070642541956,16.0,rerun,0.0 -3.17737087674,0.5,0.049648487802,0.0470950279707,17.0,accepted,0.0 -2.64755181207,0.5,0.196034253796,0.0588687849633,18.0,rejected,0.0 -3.17737087674,0.5,0.049648487802,0.0588687849633,19.0,rerun,0.0 -2.82415816696,0.5,0.0487961777355,0.0392458566422,20.0,accepted,0.0 -3.26567405418,0.5,0.111388328275,0.0490573208028,21.0,rejected,0.0 -2.82415816696,0.5,0.0487961777355,0.0490573208028,22.0,rerun,0.0 -3.11850209177,0.5,0.0221612081439,0.0327048805352,23.0,accepted,0.0 -2.75057218575,0.5,0.0981818388529,0.040881100669,24.0,rejected,0.0 -3.11850209177,0.5,0.0221612081439,0.040881100669,25.0,rerun,0.0 -2.87321548776,0.5,0.0253672744839,0.0272540671127,26.0,rejected,0.0 -3.11850209177,0.5,0.0221612081439,0.0272540671127,27.0,rerun,0.0 -2.9549776891,0.5,0.00319887275602,0.0181693780751,28.0,accepted,0.0 -3.15938319244,0.5,0.0400891125832,0.0227117225939,29.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0227117225939,30.0,rerun,0.0 -3.09124802466,0.5,0.0131397875381,0.0151411483959,31.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0151411483959,32.0,rerun,0.0 -3.04582457947,0.5,0.00331389219477,0.0100940989306,33.0,rejected,0.0 -2.9549776891,0.5,0.00319887275602,0.0100940989306,34.0,rerun,0.0 -3.01554228268,0.5,0.000381215900671,0.00672939928708,35.0,accepted,0.0 -2.9398365407,0.5,0.0057122472706,0.00841174910885,36.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00841174910885,37.0,rerun,0.0 -2.96507178803,0.5,0.00192528092425,0.00560783273923,38.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00560783273923,39.0,rerun,0.0 -2.98189528625,0.5,0.000517278854294,0.00373855515949,40.0,rejected,0.0 -3.01554228268,0.5,0.000381215900671,0.00373855515949,41.0,rerun,0.0 -2.99311095172,0.5,7.4896212526e-05,0.00249237010632,42.0,accepted,0.0 -3.02115011542,0.5,0.000705938525141,0.00311546263291,43.0,rejected,0.0 -2.99311095172,0.5,7.4896212526e-05,0.00311546263291,44.0,rerun,0.0 -3.01180372752,0.5,0.000219876973787,0.0020769750886,45.0,rejected,0.0 -2.99311095172,0.5,7.4896212526e-05,0.0020769750886,46.0,rerun,0.0 -3.00557280226,0.5,4.90104472268e-05,0.00138465005907,47.0,accepted,0.0 -2.98999548909,0.5,0.000157954907688,0.00173081257384,48.0,rejected,0.0 -3.00557280226,0.5,4.90104472268e-05,0.00173081257384,49.0,rerun,0.0 -2.99518792681,0.5,3.65431388261e-05,0.00115387504922,50.0,accepted,0.0 -3.00816902112,0.5,0.00010531286727,0.00144234381153,51.0,rejected,0.0 -2.99518792681,0.5,3.65431388261e-05,0.00144234381153,52.0,rerun,0.0 -3.00384198968,0.5,2.32945211855e-05,0.00096156254102,53.0,accepted,0.0 -2.99302441109,0.5,7.67897327798e-05,0.00120195317628,54.0,rejected,0.0 -3.00384198968,0.5,2.32945211855e-05,0.00120195317628,55.0,rerun,0.0 -2.99663027062,0.5,1.79197294222e-05,0.000801302117517,56.0,accepted,0.0 -3.00564491945,0.5,5.0287135476e-05,0.0010016276469,57.0,rejected,0.0 -2.99663027062,0.5,1.79197294222e-05,0.0010016276469,58.0,rerun,0.0 -3.00264003651,0.5,1.09992041806e-05,0.000667751764597,59.0,accepted,0.0 -3.00264003651,0.5,1.09992041806e-05,0.000834689705747,60.0,final,0.0 +3.51645507813,0.5,0.420926728435,0.190734863281,8.0,rerun,0.0 +2.37204589844,0.5,0.622296276884,0.127156575521,9.0,rejected,0.0 +3.51645507813,0.5,0.420926728435,0.127156575521,9.0,rerun,0.0 +2.753515625,0.5,0.0958782696724,0.0847710503472,10.0,accepted,0.0 +3.70718994141,0.5,0.789248108373,0.105963812934,11.0,rejected,0.0 +2.753515625,0.5,0.0958782696724,0.105963812934,11.0,rerun,0.0 +3.3892985026,0.5,0.239170089642,0.070642541956,12.0,rejected,0.0 +2.753515625,0.5,0.0958782696724,0.070642541956,12.0,rerun,0.0 +3.17737087674,0.5,0.049648487802,0.0470950279707,13.0,accepted,0.0 +2.64755181207,0.5,0.196034253796,0.0588687849633,14.0,rejected,0.0 +3.17737087674,0.5,0.049648487802,0.0588687849633,14.0,rerun,0.0 +2.82415816696,0.5,0.0487961777355,0.0392458566422,15.0,accepted,0.0 +3.26567405418,0.5,0.111388328275,0.0490573208028,16.0,rejected,0.0 +2.82415816696,0.5,0.0487961777355,0.0490573208028,16.0,rerun,0.0 +3.11850209177,0.5,0.0221612081439,0.0327048805352,17.0,accepted,0.0 +2.75057218575,0.5,0.0981818388529,0.040881100669,18.0,rejected,0.0 +3.11850209177,0.5,0.0221612081439,0.040881100669,18.0,rerun,0.0 +2.87321548776,0.5,0.0253672744839,0.0272540671127,19.0,rejected,0.0 +3.11850209177,0.5,0.0221612081439,0.0272540671127,19.0,rerun,0.0 +2.9549776891,0.5,0.00319887275602,0.0181693780751,20.0,accepted,0.0 +3.15938319244,0.5,0.0400891125832,0.0227117225939,21.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0227117225939,21.0,rerun,0.0 +3.09124802466,0.5,0.0131397875381,0.0151411483959,22.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0151411483959,22.0,rerun,0.0 +3.04582457947,0.5,0.00331389219477,0.0100940989306,23.0,rejected,0.0 +2.9549776891,0.5,0.00319887275602,0.0100940989306,23.0,rerun,0.0 +3.01554228268,0.5,0.000381215900671,0.00672939928708,24.0,accepted,0.0 +2.9398365407,0.5,0.0057122472706,0.00841174910885,25.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00841174910885,25.0,rerun,0.0 +2.96507178803,0.5,0.00192528092425,0.00560783273923,26.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00560783273923,26.0,rerun,0.0 +2.98189528625,0.5,0.000517278854294,0.00373855515949,27.0,rejected,0.0 +3.01554228268,0.5,0.000381215900671,0.00373855515949,27.0,rerun,0.0 +2.99311095172,0.5,7.4896212526e-05,0.00249237010632,28.0,accepted,0.0 +3.02115011542,0.5,0.000705938525141,0.00311546263291,29.0,rejected,0.0 +2.99311095172,0.5,7.4896212526e-05,0.00311546263291,29.0,rerun,0.0 +3.01180372752,0.5,0.000219876973787,0.0020769750886,30.0,rejected,0.0 +2.99311095172,0.5,7.4896212526e-05,0.0020769750886,30.0,rerun,0.0 +3.00557280226,0.5,4.90104472268e-05,0.00138465005907,31.0,accepted,0.0 +2.98999548909,0.5,0.000157954907688,0.00173081257384,32.0,rejected,0.0 +3.00557280226,0.5,4.90104472268e-05,0.00173081257384,32.0,rerun,0.0 +2.99518792681,0.5,3.65431388261e-05,0.00115387504922,33.0,accepted,0.0 +3.00816902112,0.5,0.00010531286727,0.00144234381153,34.0,rejected,0.0 +2.99518792681,0.5,3.65431388261e-05,0.00144234381153,34.0,rerun,0.0 +3.00384198968,0.5,2.32945211855e-05,0.00096156254102,35.0,accepted,0.0 +2.99302441109,0.5,7.67897327798e-05,0.00120195317628,36.0,rejected,0.0 +3.00384198968,0.5,2.32945211855e-05,0.00120195317628,36.0,rerun,0.0 +2.99663027062,0.5,1.79197294222e-05,0.000801302117517,37.0,accepted,0.0 +3.00564491945,0.5,5.0287135476e-05,0.0010016276469,38.0,rejected,0.0 +2.99663027062,0.5,1.79197294222e-05,0.0010016276469,38.0,rerun,0.0 +3.00264003651,0.5,1.09992041806e-05,0.000667751764597,39.0,accepted,0.0 +3.00264003651,0.5,1.09992041806e-05,0.000834689705747,40.0,final,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/Basic/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/Basic/opt_export_0.csv index a3c14cfdd9..06a388c777 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/Basic/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/Basic/opt_export_0.csv @@ -7,38 +7,38 @@ x,y,func,const,ans,aux_ans,stepSize,iteration,accepted,conv_gradient 1.23358144803,-0.145439315804,4.22814213223,3.14,3.01990062781,1.08814213223,0.130867578459,5.0,accepted,0.0 2.6986739362,-0.0620703524431,5.77660358376,3.14,2.0640619099,2.63660358376,0.163051396235,6.0,accepted,0.0 1.7952574268,1.5333511983,6.4686086251,3.14,81.2197052519,3.3286086251,0.203716436728,7.0,rejected,0.0 -2.6986739362,-0.0620703524431,5.77660358376,3.14,2.0640619099,2.63660358376,0.203716436728,8.0,rerun,0.0 -2.1071506516,1.0075623514,6.25471300301,3.14,14.6513640883,3.11471300301,0.135810957819,9.0,rejected,0.0 -2.6986739362,-0.0620703524431,5.77660358376,3.14,2.0640619099,2.63660358376,0.135810957819,10.0,rerun,0.0 -2.2982778586,0.647640269243,6.08591812785,3.14,2.2193394575,2.94591812785,0.0905406385459,11.0,rejected,0.0 -2.6986739362,-0.0620703524431,5.77660358376,3.14,2.0640619099,2.63660358376,0.0905406385459,12.0,rerun,0.0 -2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0603604256973,13.0,accepted,0.0 -2.73935159855,-0.193966559427,5.68538503912,3.14,3.3026249344,2.54538503912,0.0754490879958,14.0,rejected,0.0 -2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0754490879958,15.0,rerun,0.0 -2.65217854187,0.0157223085471,5.80790085042,3.14,1.39512500367,2.66790085042,0.0502993919972,16.0,rejected,0.0 -2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0502993919972,17.0,rerun,0.0 -2.57435570864,0.145308057513,5.85966376616,3.14,0.566720647988,2.71966376616,0.0335329279982,18.0,rejected,0.0 -2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0335329279982,19.0,rerun,0.0 -2.53170619372,0.23650119913,5.90820739285,3.14,0.223152036915,2.76820739285,0.0223552853321,20.0,rejected,0.0 -2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0223552853321,21.0,rerun,0.0 -2.49887281286,0.295021127603,5.93389394046,3.14,0.105657997798,2.79389394046,0.0149035235547,22.0,accepted,0.0 -2.4904680161,0.462471654459,6.09293967056,3.14,0.256459637347,2.95293967056,0.0186290359958,23.0,rejected,0.0 -2.49887281286,0.295021127603,5.93389394046,3.14,0.105657997798,2.79389394046,0.0186290359958,24.0,rerun,0.0 -2.49305314774,0.406643736668,6.0396968844,3.14,0.118808446685,2.8996968844,0.0124193573305,25.0,rejected,0.0 -2.49887281286,0.295021127603,5.93389394046,3.14,0.105657997798,2.79389394046,0.0124193573305,26.0,rerun,0.0 -2.49509401848,0.36944139653,6.00453541501,3.14,0.079876658151,2.86453541501,0.0082795715537,27.0,accepted,0.0 -2.56459362239,0.307426672113,6.0120202945,3.14,0.0996875631353,2.8720202945,0.0103494623159,28.0,rejected,0.0 -2.49509401848,0.36944139653,6.00453541501,3.14,0.079876658151,2.86453541501,0.0103494623159,29.0,rerun,0.0 -2.54139709763,0.32806466165,6.00946175928,3.14,0.0734851786742,2.86946175928,0.00689964154392,30.0,accepted,0.0 -2.54369708324,0.405651541563,6.08934862481,3.14,0.0787844861168,2.94934862481,0.00862455142398,31.0,rejected,0.0 -2.54139709763,0.32806466165,6.00946175928,3.14,0.0734851786742,2.86946175928,0.00862455142398,32.0,rerun,0.0 -2.5427669421,0.379793835891,6.06256077799,3.14,0.0604894232541,2.92256077799,0.00574970094932,33.0,accepted,0.0 -2.5925082872,0.338443785458,6.07095207266,3.14,0.0660262750688,2.93095207266,0.00718711817723,34.0,rejected,0.0 -2.5427669421,0.379793835891,6.06256077799,3.14,0.0604894232541,2.92256077799,0.00718711817723,35.0,rerun,0.0 -2.57538850329,0.351590967546,6.06697947083,3.14,0.0550136051699,2.92697947083,0.00479141211815,36.0,accepted,0.0 -2.58226316361,0.405051902693,6.1273150663,3.14,0.0556156283883,2.9873150663,0.00598901519275,37.0,rejected,0.0 -2.57538850329,0.351590967546,6.06697947083,3.14,0.0550136051699,2.92697947083,0.00598901519275,38.0,rerun,0.0 -2.58010336695,0.387214400395,6.10731776734,3.14,0.0476931261698,2.96731776734,0.00399267679517,39.0,accepted,0.0 -2.61683719642,0.361364610093,6.11820180652,3.14,0.047273164752,2.97820180652,0.00499083838033,40.0,accepted,0.0 -2.61620130686,0.398585297682,6.15478660454,3.14,0.0382727627184,3.01478660454,0.00413623545083,41.0,accepted,0.0 -2.61620130686,0.398585297682,6.15478660454,3.14,0.0382727627184,3.01478660454,0.00325702132016,42.0,final,0.0 +2.6986739362,-0.0620703524431,5.77660358376,3.14,2.0640619099,2.63660358376,0.203716436728,7.0,rerun,0.0 +2.1071506516,1.0075623514,6.25471300301,3.14,14.6513640883,3.11471300301,0.135810957819,8.0,rejected,0.0 +2.6986739362,-0.0620703524431,5.77660358376,3.14,2.0640619099,2.63660358376,0.135810957819,8.0,rerun,0.0 +2.2982778586,0.647640269243,6.08591812785,3.14,2.2193394575,2.94591812785,0.0905406385459,9.0,rejected,0.0 +2.6986739362,-0.0620703524431,5.77660358376,3.14,2.0640619099,2.63660358376,0.0905406385459,9.0,rerun,0.0 +2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0603604256973,10.0,accepted,0.0 +2.73935159855,-0.193966559427,5.68538503912,3.14,3.3026249344,2.54538503912,0.0754490879958,11.0,rejected,0.0 +2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0754490879958,11.0,rerun,0.0 +2.65217854187,0.0157223085471,5.80790085042,3.14,1.39512500367,2.66790085042,0.0502993919972,12.0,rejected,0.0 +2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0502993919972,12.0,rerun,0.0 +2.57435570864,0.145308057513,5.85966376616,3.14,0.566720647988,2.71966376616,0.0335329279982,13.0,rejected,0.0 +2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0335329279982,13.0,rerun,0.0 +2.53170619372,0.23650119913,5.90820739285,3.14,0.223152036915,2.76820739285,0.0223552853321,14.0,rejected,0.0 +2.43796304958,0.414525591535,5.99248864112,3.14,0.1887133043,2.85248864112,0.0223552853321,14.0,rerun,0.0 +2.49887281286,0.295021127603,5.93389394046,3.14,0.105657997798,2.79389394046,0.0149035235547,15.0,accepted,0.0 +2.4904680161,0.462471654459,6.09293967056,3.14,0.256459637347,2.95293967056,0.0186290359958,16.0,rejected,0.0 +2.49887281286,0.295021127603,5.93389394046,3.14,0.105657997798,2.79389394046,0.0186290359958,16.0,rerun,0.0 +2.49305314774,0.406643736668,6.0396968844,3.14,0.118808446685,2.8996968844,0.0124193573305,17.0,rejected,0.0 +2.49887281286,0.295021127603,5.93389394046,3.14,0.105657997798,2.79389394046,0.0124193573305,17.0,rerun,0.0 +2.49509401848,0.36944139653,6.00453541501,3.14,0.079876658151,2.86453541501,0.0082795715537,18.0,accepted,0.0 +2.56459362239,0.307426672113,6.0120202945,3.14,0.0996875631353,2.8720202945,0.0103494623159,19.0,rejected,0.0 +2.49509401848,0.36944139653,6.00453541501,3.14,0.079876658151,2.86453541501,0.0103494623159,19.0,rerun,0.0 +2.54139709763,0.32806466165,6.00946175928,3.14,0.0734851786742,2.86946175928,0.00689964154392,20.0,accepted,0.0 +2.54369708324,0.405651541563,6.08934862481,3.14,0.0787844861168,2.94934862481,0.00862455142398,21.0,rejected,0.0 +2.54139709763,0.32806466165,6.00946175928,3.14,0.0734851786742,2.86946175928,0.00862455142398,21.0,rerun,0.0 +2.5427669421,0.379793835891,6.06256077799,3.14,0.0604894232541,2.92256077799,0.00574970094932,22.0,accepted,0.0 +2.5925082872,0.338443785458,6.07095207266,3.14,0.0660262750688,2.93095207266,0.00718711817723,23.0,rejected,0.0 +2.5427669421,0.379793835891,6.06256077799,3.14,0.0604894232541,2.92256077799,0.00718711817723,23.0,rerun,0.0 +2.57538850329,0.351590967546,6.06697947083,3.14,0.0550136051699,2.92697947083,0.00479141211815,24.0,accepted,0.0 +2.58226316361,0.405051902693,6.1273150663,3.14,0.0556156283883,2.9873150663,0.00598901519275,25.0,rejected,0.0 +2.57538850329,0.351590967546,6.06697947083,3.14,0.0550136051699,2.92697947083,0.00598901519275,25.0,rerun,0.0 +2.58010336695,0.387214400395,6.10731776734,3.14,0.0476931261698,2.96731776734,0.00399267679517,26.0,accepted,0.0 +2.61683719642,0.361364610093,6.11820180652,3.14,0.047273164752,2.97820180652,0.00499083838033,27.0,accepted,0.0 +2.61620130686,0.398585297682,6.15478660454,3.14,0.0382727627184,3.01478660454,0.00413623545083,28.0,accepted,0.0 +2.61620130686,0.398585297682,6.15478660454,3.14,0.0382727627184,3.01478660454,0.00325702132016,29.0,final,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/CentralDiff/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/CentralDiff/opt_export_0.csv index ff9fe29f59..ec61bccb84 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/CentralDiff/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/CentralDiff/opt_export_0.csv @@ -7,10 +7,10 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 1.23511287888,-0.148469682534,3.01320956274,0.130852194079,5.0,accepted,0.0 2.6991285848,-0.0501154528606,1.98183305084,0.163035084526,6.0,accepted,1.0 1.81546113869,1.55577950688,88.0733511947,0.203662962234,7.0,rejected,0.0 -2.6991285848,-0.0501154528606,1.98183305084,0.203662962234,8.0,rerun,0.0 -2.11003167865,1.02048928926,15.4478976752,0.135775308156,9.0,rejected,0.0 -2.6991285848,-0.0501154528606,1.98183305084,0.135775308156,10.0,rerun,0.0 -2.30638213156,0.663612687568,2.43001788498,0.0905168721038,11.0,rejected,0.0 -2.6991285848,-0.0501154528606,1.98183305084,0.0905168721038,12.0,rerun,0.0 -2.43729311867,0.425700832643,0.215946634197,0.0603445814026,13.0,accepted,1.0 -2.43729311867,0.425700832643,0.215946634197,0.0603445814026,13.0,final,1.0 +2.6991285848,-0.0501154528606,1.98183305084,0.203662962234,7.0,rerun,0.0 +2.11003167865,1.02048928926,15.4478976752,0.135775308156,8.0,rejected,0.0 +2.6991285848,-0.0501154528606,1.98183305084,0.135775308156,8.0,rerun,0.0 +2.30638213156,0.663612687568,2.43001788498,0.0905168721038,9.0,rejected,0.0 +2.6991285848,-0.0501154528606,1.98183305084,0.0905168721038,9.0,rerun,0.0 +2.43729311867,0.425700832643,0.215946634197,0.0603445814026,10.0,accepted,1.0 +2.43729311867,0.425700832643,0.215946634197,0.0603445814026,10.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/ConstrainFunction/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/ConstrainFunction/opt_export_0.csv index f5c09bed16..42acaebf43 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/ConstrainFunction/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/ConstrainFunction/opt_export_0.csv @@ -11,200 +11,200 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient,rejectReason 0.882244116084,0.118293568824,1.01245558577,0.240002051012,9.0,accepted,0.0,None 0.327571928986,-0.00602809351558,0.191648473665,0.284216955365,10.0,accepted,0.0,None -0.223559987107,-0.131654626733,0.0162690858073,0.282634222443,11.0,rejected,0.0,implicitConstraintsViolation -0.327571928986,-0.00602809351558,0.191648473665,0.282634222443,12.0,rerun,0.0,None --0.17487037025,-0.113846487159,0.00579729754801,0.256940202221,13.0,accepted,0.0,None -0.434410265587,-0.018814431971,0.292185428421,0.308323687348,14.0,rejected,0.0,noImprovement --0.17487037025,-0.113846487159,0.00579729754801,0.308323687348,15.0,rerun,0.0,None --0.166310710531,-0.111987526654,0.00454081112638,0.280294261225,16.0,accepted,0.0,None --0.165989615605,-0.111918811655,0.00449668743899,0.336245961301,17.0,accepted,0.0,None -0.228052947808,-0.0250941379338,0.113229624737,0.40349481502,18.0,rejected,0.0,noImprovement --0.165989615605,-0.111918811655,0.00449668743899,0.40349481502,19.0,rerun,0.0,None --0.165814982465,-0.111879024829,0.00447272314769,0.3668134682,20.0,accepted,0.0,None -0.263737460742,-0.0157647365392,0.139400519957,0.440174122227,21.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.440174122227,22.0,rerun,0.0,None -0.224001977483,-0.0214943074235,0.11114042518,0.400158292933,23.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.400158292933,24.0,rerun,0.0,None -0.221728178911,0.503876305377,0.468175613302,0.363780266303,25.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.363780266303,26.0,rerun,0.0,None -0.188649899784,0.446537754104,0.382022281306,0.330709333003,27.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.330709333003,28.0,rerun,0.0,None -0.158221721394,0.394628145419,0.31133545964,0.300644848184,29.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.300644848184,30.0,rerun,0.0,None -0.293685062236,-0.407954661179,0.249824001569,0.273313498349,31.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.273313498349,32.0,rerun,0.0,None -0.320199093328,-0.00827712282523,0.184980364231,0.248466816681,33.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.248466816681,34.0,rerun,0.0,None -0.276272361801,-0.0189062668209,0.148157083817,0.225878924256,35.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.225878924256,36.0,rerun,0.0,None -0.236293539539,-0.0283676315574,0.118224540944,0.205344476596,37.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.205344476596,38.0,rerun,0.0,None -0.199911808633,-0.03680026428,0.0939412995523,0.186676796906,39.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.186676796906,40.0,rerun,0.0,None -0.117151789714,-0.299310491271,0.0868795717067,0.169706179005,41.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.169706179005,42.0,rerun,0.0,None -0.0910991260901,-0.282766037834,0.069922300578,0.15427834455,43.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.15427834455,44.0,rerun,0.0,None --0.165909177807,0.168627040356,0.0765045065296,0.1402530405,45.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.1402530405,46.0,rerun,0.0,None -0.046034029326,-0.253822026088,0.0449871534312,0.127502764091,47.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.127502764091,48.0,rerun,0.0,None -0.0265853808583,-0.241200715585,0.0359615007287,0.115911603719,49.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.115911603719,50.0,rerun,0.0,None --0.185616057231,0.0979370686048,0.0465091923836,0.105374185199,51.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.105374185199,52.0,rerun,0.0,None --0.192921599124,0.0777831488243,0.0402412715896,0.0957947138174,53.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0957947138174,54.0,rerun,0.0,None --0.0216201664942,-0.209571464239,0.0181493040758,0.0870861034704,55.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0870861034704,56.0,rerun,0.0,None --0.0353674356788,-0.201625762567,0.0145051639881,0.079169184973,57.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.079169184973,58.0,rerun,0.0,None --0.0870325038818,-0.232349719766,0.0176846042778,0.0719719863391,59.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0719719863391,60.0,rerun,0.0,None --0.0944553464032,-0.221567946737,0.0148095088574,0.0654290784901,61.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0654290784901,62.0,rerun,0.0,None --0.100713655967,-0.211446918385,0.0124209249224,0.0594809804456,63.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0594809804456,64.0,rerun,0.0,None --0.106973613794,-0.202617760996,0.0105790361612,0.0540736185869,65.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0540736185869,66.0,rerun,0.0,None --0.112122652546,-0.194238630865,0.00902787825206,0.049157835079,67.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.049157835079,68.0,rerun,0.0,None --0.117104840693,-0.186817185151,0.00782979921269,0.0446889409809,69.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0446889409809,70.0,rerun,0.0,None --0.121516905321,-0.179994137781,0.00686203929397,0.0406263099826,71.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0406263099826,72.0,rerun,0.0,None --0.125764124525,-0.173944453335,0.0061315722916,0.0369330090751,73.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0369330090751,74.0,rerun,0.0,None --0.129256927083,-0.168206242002,0.00550805923031,0.0335754627956,75.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.0335754627956,76.0,rerun,0.0,None --0.132600869953,-0.163098874344,0.00504428466517,0.030523147996,77.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.030523147996,78.0,rerun,0.0,None --0.135637286065,-0.158453512301,0.00468682925837,0.02774831636,79.0,rejected,0.0,noImprovement --0.165814982465,-0.111879024829,0.00447272314769,0.02774831636,80.0,rerun,0.0,None --0.138394739689,-0.1542285532,0.0044148920179,0.0252257421454,81.0,accepted,0.0,None --0.136205474414,-0.151142338079,0.0039263751217,0.0302708902717,82.0,accepted,0.0,None --0.135151940956,-0.149650496168,0.00370083072274,0.0292214717002,83.0,accepted,0.0,None --0.134524748349,-0.148751932054,0.00356870912758,0.035065751759,84.0,accepted,0.0,None --0.134336957929,-0.148482107877,0.00352954146404,0.0420787863274,85.0,accepted,0.0,None --0.134222688713,-0.148321335208,0.00350614385898,0.0504945350763,86.0,accepted,0.0,None --0.134114719945,-0.148369795557,0.00350345123915,0.0605929022282,87.0,accepted,0.0,None --0.0194792584279,-0.199610773865,0.0164058960932,0.0627832121175,88.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0627832121175,89.0,rerun,0.0,None --0.0349732858314,-0.204951542941,0.0152432999213,0.0570756473796,90.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0570756473796,91.0,rerun,0.0,None --0.0439745303325,-0.19978739406,0.0130963772647,0.0518869521633,92.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0518869521633,93.0,rerun,0.0,None --0.0521594746889,-0.195096200987,0.0113320033042,0.047169956512,94.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.047169956512,95.0,rerun,0.0,None --0.0617753788268,-0.194439389504,0.0103799199536,0.0428817786473,96.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0428817786473,97.0,rerun,0.0,None --0.187740229088,-0.0917735268766,0.00776602266045,0.0389834351339,98.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0389834351339,99.0,rerun,0.0,None --0.182873188238,-0.0969262286205,0.00687741339919,0.0354394864854,100.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0354394864854,101.0,rerun,0.0,None --0.17844722684,-0.101609198167,0.00615655691758,0.0322177149867,102.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0322177149867,103.0,rerun,0.0,None --0.0854735751236,-0.181009980984,0.00677363403873,0.0292888318061,104.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0292888318061,105.0,rerun,0.0,None --0.0902594103805,-0.178577943712,0.00626937232412,0.0266262107328,106.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0266262107328,107.0,rerun,0.0,None --0.167461729696,-0.113275206841,0.00472731609025,0.0242056461207,108.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0242056461207,109.0,rerun,0.0,None --0.164457747175,-0.116491837918,0.00442678188882,0.022005132837,110.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.022005132837,111.0,rerun,0.0,None --0.1616796232,-0.119371126793,0.00417961647137,0.0200046662155,112.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0200046662155,113.0,rerun,0.0,None --0.159155622011,-0.121990175288,0.00398295542473,0.0181860601959,114.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0181860601959,115.0,rerun,0.0,None --0.156880935006,-0.124389992098,0.00383031248173,0.0165327819963,116.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0165327819963,117.0,rerun,0.0,None --0.156849687791,-0.128705080776,0.00405586866421,0.0150298018148,118.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0150298018148,119.0,rerun,0.0,None --0.15478395767,-0.130494036757,0.00393116829571,0.0136634561953,120.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0136634561953,121.0,rerun,0.0,None --0.152905833411,-0.13212014338,0.00383073081961,0.0124213238139,122.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0124213238139,123.0,rerun,0.0,None --0.151198292391,-0.133598242606,0.00375010704989,0.0112921125581,124.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.0112921125581,125.0,rerun,0.0,None --0.149648428395,-0.134944798974,0.00368610541745,0.010265556871,126.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.010265556871,127.0,rerun,0.0,None --0.148243798166,-0.136173965714,0.00363601985701,0.00933232442816,128.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.00933232442816,129.0,rerun,0.0,None --0.14695550295,-0.137278237825,0.0035944862726,0.00848393129833,130.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.00848393129833,131.0,rerun,0.0,None --0.145784638075,-0.138282486444,0.00356178185194,0.00771266481666,132.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.00771266481666,133.0,rerun,0.0,None --0.144724023107,-0.139199846213,0.00353686618603,0.00701151346969,134.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.00701151346969,135.0,rerun,0.0,None --0.143759778001,-0.14003375218,0.00351761948434,0.00637410315427,136.0,rejected,0.0,noImprovement --0.134114719945,-0.148369795557,0.00350345123915,0.00637410315427,137.0,rerun,0.0,None --0.142883150465,-0.140791801,0.00350293562263,0.00579463923115,138.0,accepted,0.0,None --0.142567846609,-0.140492704276,0.00345168066457,0.00695356707696,139.0,accepted,0.0,None --0.142489860494,-0.140418526131,0.00343904549934,0.00688832435693,140.0,accepted,0.0,None --0.142536295745,-0.140298006193,0.0034332657589,0.00826598784994,141.0,accepted,0.0,None --0.129727601601,-0.15255206011,0.00364544931878,0.00886318908575,142.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00886318908575,143.0,rerun,0.0,None --0.130891985148,-0.151438010059,0.00360018362524,0.00805744462341,144.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00805744462341,145.0,rerun,0.0,None --0.152481043177,-0.129540611133,0.00362690759904,0.00732494965764,146.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00732494965764,147.0,rerun,0.0,None --0.132912990526,-0.14950471709,0.00353398195952,0.00665904514331,148.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00665904514331,149.0,rerun,0.0,None --0.13379108308,-0.148671135587,0.00351071673503,0.00605367740301,150.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00605367740301,151.0,rerun,0.0,None --0.134773089327,-0.148100554939,0.00352283112672,0.00550334309365,152.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00550334309365,153.0,rerun,0.0,None --0.135478180719,-0.14739058092,0.00350456846709,0.00500303917604,154.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00500303917604,155.0,rerun,0.0,None --0.136119848517,-0.146745822275,0.00348981535709,0.00454821743276,156.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00454821743276,157.0,rerun,0.0,None --0.136703179242,-0.146159674433,0.00347783891029,0.0041347431207,158.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.0041347431207,159.0,rerun,0.0,None --0.137233987812,-0.145627318144,0.00346822200939,0.00375885738245,160.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00375885738245,161.0,rerun,0.0,None --0.137715563185,-0.145142384869,0.00346029861805,0.00341714307495,162.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00341714307495,163.0,rerun,0.0,None --0.138154665929,-0.144702836802,0.0034541221503,0.0031064937045,164.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.0031064937045,165.0,rerun,0.0,None --0.138552428175,-0.144301832829,0.0034489421102,0.00282408518591,166.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00282408518591,167.0,rerun,0.0,None --0.138914430167,-0.143937681631,0.00344485274235,0.00256735016901,168.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00256735016901,169.0,rerun,0.0,None --0.139243775513,-0.143606886467,0.00344163446388,0.0023339546991,170.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.0023339546991,171.0,rerun,0.0,None --0.139543028008,-0.143306011976,0.00343906173725,0.00212177699918,172.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00212177699918,173.0,rerun,0.0,None --0.139815147035,-0.143032560665,0.00343704721078,0.00192888818108,174.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00192888818108,175.0,rerun,0.0,None --0.140062646486,-0.142784086493,0.00343549370051,0.00175353471007,176.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00175353471007,177.0,rerun,0.0,None --0.140287417934,-0.14255797396,0.0034342571914,0.0015941224637,178.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.0015941224637,179.0,rerun,0.0,None --0.140491961995,-0.142352622469,0.00343334361622,0.00144920223973,180.0,rejected,0.0,noImprovement --0.142536295745,-0.140298006193,0.0034332657589,0.00144920223973,181.0,rerun,0.0,None --0.140678080915,-0.142166108177,0.00343268694567,0.00131745658157,182.0,accepted,0.0,None --0.14081689445,-0.142025453035,0.00343215757533,0.00158094789486,183.0,accepted,0.0,None --0.142854322626,-0.13999780278,0.00343631719496,0.00143722642017,184.0,rejected,0.0,noImprovement --0.14081689445,-0.142025453035,0.00343215757533,0.00143722642017,185.0,rerun,0.0,None --0.142669102807,-0.14018213555,0.00343525635168,0.00130656947288,186.0,rejected,0.0,noImprovement --0.14081689445,-0.142025453035,0.00343215757533,0.00130656947288,187.0,rerun,0.0,None --0.142500720997,-0.140349710638,0.00343441043386,0.00118779042989,188.0,rejected,0.0,noImprovement --0.14081689445,-0.142025453035,0.00343215757533,0.00118779042989,189.0,rerun,0.0,None --0.142347574039,-0.140501978696,0.0034337273053,0.00107980948172,190.0,rejected,0.0,noImprovement --0.14081689445,-0.142025453035,0.00343215757533,0.00107980948172,191.0,rerun,0.0,None --0.142208355997,-0.140640410705,0.00343318829827,0.000981644983383,192.0,rejected,0.0,noImprovement --0.14081689445,-0.142025453035,0.00343215757533,0.000981644983383,193.0,rerun,0.0,None --0.140894983124,-0.141945793209,0.00343184921261,0.000892404530348,194.0,accepted,0.0,None --0.142410188112,-0.140432118748,0.0034333802822,0.00107087073572,195.0,rejected,0.0,noImprovement --0.140894983124,-0.141945793209,0.00343184921261,0.00107087073572,196.0,rerun,0.0,None --0.142272440422,-0.140569723734,0.00343286170303,0.000973518850654,197.0,rejected,0.0,noImprovement --0.140894983124,-0.141945793209,0.00343184921261,0.000973518850654,198.0,rerun,0.0,None --0.1421470984,-0.140694702219,0.00343243669219,0.000885017136958,199.0,rejected,0.0,noImprovement --0.140894983124,-0.141945793209,0.00343184921261,0.000885017136958,200.0,rerun,0.0,None --0.142033297094,-0.140808465142,0.00343212889179,0.000804561033599,201.0,rejected,0.0,noImprovement --0.140894983124,-0.141945793209,0.00343184921261,0.000804561033599,202.0,rerun,0.0,None --0.141929888028,-0.140911932695,0.00343190174684,0.000731419121453,203.0,rejected,0.0,noImprovement --0.140894983124,-0.141945793209,0.00343184921261,0.000731419121453,204.0,rerun,0.0,None --0.141835761268,-0.141005875475,0.00343171274436,0.000664926474048,205.0,accepted,0.0,None --0.140711784314,-0.142138716404,0.00343312080224,0.000797911768695,206.0,rejected,0.0,noImprovement --0.141835761268,-0.141005875475,0.00343171274436,0.000797911768695,207.0,rerun,0.0,None --0.141835761268,-0.141005875475,0.00343171274436,0.000797911768695,207.0,final,0.0,None +0.327571928986,-0.00602809351558,0.191648473665,0.282634222443,11.0,rerun,0.0,None +-0.17487037025,-0.113846487159,0.00579729754801,0.256940202221,12.0,accepted,0.0,None +0.434410265587,-0.018814431971,0.292185428421,0.308323687348,13.0,rejected,0.0,noImprovement +-0.17487037025,-0.113846487159,0.00579729754801,0.308323687348,13.0,rerun,0.0,None +-0.166310710531,-0.111987526654,0.00454081112638,0.280294261225,14.0,accepted,0.0,None +-0.165989615605,-0.111918811655,0.00449668743899,0.336245961301,15.0,accepted,0.0,None +0.228052947808,-0.0250941379338,0.113229624737,0.40349481502,16.0,rejected,0.0,noImprovement +-0.165989615605,-0.111918811655,0.00449668743899,0.40349481502,16.0,rerun,0.0,None +-0.165814982465,-0.111879024829,0.00447272314769,0.3668134682,17.0,accepted,0.0,None +0.263737460742,-0.0157647365392,0.139400519957,0.440174122227,18.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.440174122227,18.0,rerun,0.0,None +0.224001977483,-0.0214943074235,0.11114042518,0.400158292933,19.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.400158292933,19.0,rerun,0.0,None +0.221728178911,0.503876305377,0.468175613302,0.363780266303,20.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.363780266303,20.0,rerun,0.0,None +0.188649899784,0.446537754104,0.382022281306,0.330709333003,21.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.330709333003,21.0,rerun,0.0,None +0.158221721394,0.394628145419,0.31133545964,0.300644848184,22.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.300644848184,22.0,rerun,0.0,None +0.293685062236,-0.407954661179,0.249824001569,0.273313498349,23.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.273313498349,23.0,rerun,0.0,None +0.320199093328,-0.00827712282523,0.184980364231,0.248466816681,24.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.248466816681,24.0,rerun,0.0,None +0.276272361801,-0.0189062668209,0.148157083817,0.225878924256,25.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.225878924256,25.0,rerun,0.0,None +0.236293539539,-0.0283676315574,0.118224540944,0.205344476596,26.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.205344476596,26.0,rerun,0.0,None +0.199911808633,-0.03680026428,0.0939412995523,0.186676796906,27.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.186676796906,27.0,rerun,0.0,None +0.117151789714,-0.299310491271,0.0868795717067,0.169706179005,28.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.169706179005,28.0,rerun,0.0,None +0.0910991260901,-0.282766037834,0.069922300578,0.15427834455,29.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.15427834455,29.0,rerun,0.0,None +-0.165909177807,0.168627040356,0.0765045065296,0.1402530405,30.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.1402530405,30.0,rerun,0.0,None +0.046034029326,-0.253822026088,0.0449871534312,0.127502764091,31.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.127502764091,31.0,rerun,0.0,None +0.0265853808583,-0.241200715585,0.0359615007287,0.115911603719,32.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.115911603719,32.0,rerun,0.0,None +-0.185616057231,0.0979370686048,0.0465091923836,0.105374185199,33.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.105374185199,33.0,rerun,0.0,None +-0.192921599124,0.0777831488243,0.0402412715896,0.0957947138174,34.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0957947138174,34.0,rerun,0.0,None +-0.0216201664942,-0.209571464239,0.0181493040758,0.0870861034704,35.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0870861034704,35.0,rerun,0.0,None +-0.0353674356788,-0.201625762567,0.0145051639881,0.079169184973,36.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.079169184973,36.0,rerun,0.0,None +-0.0870325038818,-0.232349719766,0.0176846042778,0.0719719863391,37.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0719719863391,37.0,rerun,0.0,None +-0.0944553464032,-0.221567946737,0.0148095088574,0.0654290784901,38.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0654290784901,38.0,rerun,0.0,None +-0.100713655967,-0.211446918385,0.0124209249224,0.0594809804456,39.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0594809804456,39.0,rerun,0.0,None +-0.106973613794,-0.202617760996,0.0105790361612,0.0540736185869,40.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0540736185869,40.0,rerun,0.0,None +-0.112122652546,-0.194238630865,0.00902787825206,0.049157835079,41.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.049157835079,41.0,rerun,0.0,None +-0.117104840693,-0.186817185151,0.00782979921269,0.0446889409809,42.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0446889409809,42.0,rerun,0.0,None +-0.121516905321,-0.179994137781,0.00686203929397,0.0406263099826,43.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0406263099826,43.0,rerun,0.0,None +-0.125764124525,-0.173944453335,0.0061315722916,0.0369330090751,44.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0369330090751,44.0,rerun,0.0,None +-0.129256927083,-0.168206242002,0.00550805923031,0.0335754627956,45.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.0335754627956,45.0,rerun,0.0,None +-0.132600869953,-0.163098874344,0.00504428466517,0.030523147996,46.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.030523147996,46.0,rerun,0.0,None +-0.135637286065,-0.158453512301,0.00468682925837,0.02774831636,47.0,rejected,0.0,noImprovement +-0.165814982465,-0.111879024829,0.00447272314769,0.02774831636,47.0,rerun,0.0,None +-0.138394739689,-0.1542285532,0.0044148920179,0.0252257421454,48.0,accepted,0.0,None +-0.136205474414,-0.151142338079,0.0039263751217,0.0302708902717,49.0,accepted,0.0,None +-0.135151940956,-0.149650496168,0.00370083072274,0.0292214717002,50.0,accepted,0.0,None +-0.134524748349,-0.148751932054,0.00356870912758,0.035065751759,51.0,accepted,0.0,None +-0.134336957929,-0.148482107877,0.00352954146404,0.0420787863274,52.0,accepted,0.0,None +-0.134222688713,-0.148321335208,0.00350614385898,0.0504945350763,53.0,accepted,0.0,None +-0.134114719945,-0.148369795557,0.00350345123915,0.0605929022282,54.0,accepted,0.0,None +-0.0194792584279,-0.199610773865,0.0164058960932,0.0627832121175,55.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0627832121175,55.0,rerun,0.0,None +-0.0349732858314,-0.204951542941,0.0152432999213,0.0570756473796,56.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0570756473796,56.0,rerun,0.0,None +-0.0439745303325,-0.19978739406,0.0130963772647,0.0518869521633,57.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0518869521633,57.0,rerun,0.0,None +-0.0521594746889,-0.195096200987,0.0113320033042,0.047169956512,58.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.047169956512,58.0,rerun,0.0,None +-0.0617753788268,-0.194439389504,0.0103799199536,0.0428817786473,59.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0428817786473,59.0,rerun,0.0,None +-0.187740229088,-0.0917735268766,0.00776602266045,0.0389834351339,60.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0389834351339,60.0,rerun,0.0,None +-0.182873188238,-0.0969262286205,0.00687741339919,0.0354394864854,61.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0354394864854,61.0,rerun,0.0,None +-0.17844722684,-0.101609198167,0.00615655691758,0.0322177149867,62.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0322177149867,62.0,rerun,0.0,None +-0.0854735751236,-0.181009980984,0.00677363403873,0.0292888318061,63.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0292888318061,63.0,rerun,0.0,None +-0.0902594103805,-0.178577943712,0.00626937232412,0.0266262107328,64.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0266262107328,64.0,rerun,0.0,None +-0.167461729696,-0.113275206841,0.00472731609025,0.0242056461207,65.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0242056461207,65.0,rerun,0.0,None +-0.164457747175,-0.116491837918,0.00442678188882,0.022005132837,66.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.022005132837,66.0,rerun,0.0,None +-0.1616796232,-0.119371126793,0.00417961647137,0.0200046662155,67.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0200046662155,67.0,rerun,0.0,None +-0.159155622011,-0.121990175288,0.00398295542473,0.0181860601959,68.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0181860601959,68.0,rerun,0.0,None +-0.156880935006,-0.124389992098,0.00383031248173,0.0165327819963,69.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0165327819963,69.0,rerun,0.0,None +-0.156849687791,-0.128705080776,0.00405586866421,0.0150298018148,70.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0150298018148,70.0,rerun,0.0,None +-0.15478395767,-0.130494036757,0.00393116829571,0.0136634561953,71.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0136634561953,71.0,rerun,0.0,None +-0.152905833411,-0.13212014338,0.00383073081961,0.0124213238139,72.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0124213238139,72.0,rerun,0.0,None +-0.151198292391,-0.133598242606,0.00375010704989,0.0112921125581,73.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.0112921125581,73.0,rerun,0.0,None +-0.149648428395,-0.134944798974,0.00368610541745,0.010265556871,74.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.010265556871,74.0,rerun,0.0,None +-0.148243798166,-0.136173965714,0.00363601985701,0.00933232442816,75.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.00933232442816,75.0,rerun,0.0,None +-0.14695550295,-0.137278237825,0.0035944862726,0.00848393129833,76.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.00848393129833,76.0,rerun,0.0,None +-0.145784638075,-0.138282486444,0.00356178185194,0.00771266481666,77.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.00771266481666,77.0,rerun,0.0,None +-0.144724023107,-0.139199846213,0.00353686618603,0.00701151346969,78.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.00701151346969,78.0,rerun,0.0,None +-0.143759778001,-0.14003375218,0.00351761948434,0.00637410315427,79.0,rejected,0.0,noImprovement +-0.134114719945,-0.148369795557,0.00350345123915,0.00637410315427,79.0,rerun,0.0,None +-0.142883150465,-0.140791801,0.00350293562263,0.00579463923115,80.0,accepted,0.0,None +-0.142567846609,-0.140492704276,0.00345168066457,0.00695356707696,81.0,accepted,0.0,None +-0.142489860494,-0.140418526131,0.00343904549934,0.00688832435693,82.0,accepted,0.0,None +-0.142536295745,-0.140298006193,0.0034332657589,0.00826598784994,83.0,accepted,0.0,None +-0.129727601601,-0.15255206011,0.00364544931878,0.00886318908575,84.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00886318908575,84.0,rerun,0.0,None +-0.130891985148,-0.151438010059,0.00360018362524,0.00805744462341,85.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00805744462341,85.0,rerun,0.0,None +-0.152481043177,-0.129540611133,0.00362690759904,0.00732494965764,86.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00732494965764,86.0,rerun,0.0,None +-0.132912990526,-0.14950471709,0.00353398195952,0.00665904514331,87.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00665904514331,87.0,rerun,0.0,None +-0.13379108308,-0.148671135587,0.00351071673503,0.00605367740301,88.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00605367740301,88.0,rerun,0.0,None +-0.134773089327,-0.148100554939,0.00352283112672,0.00550334309365,89.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00550334309365,89.0,rerun,0.0,None +-0.135478180719,-0.14739058092,0.00350456846709,0.00500303917604,90.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00500303917604,90.0,rerun,0.0,None +-0.136119848517,-0.146745822275,0.00348981535709,0.00454821743276,91.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00454821743276,91.0,rerun,0.0,None +-0.136703179242,-0.146159674433,0.00347783891029,0.0041347431207,92.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.0041347431207,92.0,rerun,0.0,None +-0.137233987812,-0.145627318144,0.00346822200939,0.00375885738245,93.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00375885738245,93.0,rerun,0.0,None +-0.137715563185,-0.145142384869,0.00346029861805,0.00341714307495,94.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00341714307495,94.0,rerun,0.0,None +-0.138154665929,-0.144702836802,0.0034541221503,0.0031064937045,95.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.0031064937045,95.0,rerun,0.0,None +-0.138552428175,-0.144301832829,0.0034489421102,0.00282408518591,96.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00282408518591,96.0,rerun,0.0,None +-0.138914430167,-0.143937681631,0.00344485274235,0.00256735016901,97.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00256735016901,97.0,rerun,0.0,None +-0.139243775513,-0.143606886467,0.00344163446388,0.0023339546991,98.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.0023339546991,98.0,rerun,0.0,None +-0.139543028008,-0.143306011976,0.00343906173725,0.00212177699918,99.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00212177699918,99.0,rerun,0.0,None +-0.139815147035,-0.143032560665,0.00343704721078,0.00192888818108,100.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00192888818108,100.0,rerun,0.0,None +-0.140062646486,-0.142784086493,0.00343549370051,0.00175353471007,101.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00175353471007,101.0,rerun,0.0,None +-0.140287417934,-0.14255797396,0.0034342571914,0.0015941224637,102.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.0015941224637,102.0,rerun,0.0,None +-0.140491961995,-0.142352622469,0.00343334361622,0.00144920223973,103.0,rejected,0.0,noImprovement +-0.142536295745,-0.140298006193,0.0034332657589,0.00144920223973,103.0,rerun,0.0,None +-0.140678080915,-0.142166108177,0.00343268694567,0.00131745658157,104.0,accepted,0.0,None +-0.14081689445,-0.142025453035,0.00343215757533,0.00158094789486,105.0,accepted,0.0,None +-0.142854322626,-0.13999780278,0.00343631719496,0.00143722642017,106.0,rejected,0.0,noImprovement +-0.14081689445,-0.142025453035,0.00343215757533,0.00143722642017,106.0,rerun,0.0,None +-0.142669102807,-0.14018213555,0.00343525635168,0.00130656947288,107.0,rejected,0.0,noImprovement +-0.14081689445,-0.142025453035,0.00343215757533,0.00130656947288,107.0,rerun,0.0,None +-0.142500720997,-0.140349710638,0.00343441043386,0.00118779042989,108.0,rejected,0.0,noImprovement +-0.14081689445,-0.142025453035,0.00343215757533,0.00118779042989,108.0,rerun,0.0,None +-0.142347574039,-0.140501978696,0.0034337273053,0.00107980948172,109.0,rejected,0.0,noImprovement +-0.14081689445,-0.142025453035,0.00343215757533,0.00107980948172,109.0,rerun,0.0,None +-0.142208355997,-0.140640410705,0.00343318829827,0.000981644983383,110.0,rejected,0.0,noImprovement +-0.14081689445,-0.142025453035,0.00343215757533,0.000981644983383,110.0,rerun,0.0,None +-0.140894983124,-0.141945793209,0.00343184921261,0.000892404530348,111.0,accepted,0.0,None +-0.142410188112,-0.140432118748,0.0034333802822,0.00107087073572,112.0,rejected,0.0,noImprovement +-0.140894983124,-0.141945793209,0.00343184921261,0.00107087073572,112.0,rerun,0.0,None +-0.142272440422,-0.140569723734,0.00343286170303,0.000973518850654,113.0,rejected,0.0,noImprovement +-0.140894983124,-0.141945793209,0.00343184921261,0.000973518850654,113.0,rerun,0.0,None +-0.1421470984,-0.140694702219,0.00343243669219,0.000885017136958,114.0,rejected,0.0,noImprovement +-0.140894983124,-0.141945793209,0.00343184921261,0.000885017136958,114.0,rerun,0.0,None +-0.142033297094,-0.140808465142,0.00343212889179,0.000804561033599,115.0,rejected,0.0,noImprovement +-0.140894983124,-0.141945793209,0.00343184921261,0.000804561033599,115.0,rerun,0.0,None +-0.141929888028,-0.140911932695,0.00343190174684,0.000731419121453,116.0,rejected,0.0,noImprovement +-0.140894983124,-0.141945793209,0.00343184921261,0.000731419121453,116.0,rerun,0.0,None +-0.141835761268,-0.141005875475,0.00343171274436,0.000664926474048,117.0,accepted,0.0,None +-0.140711784314,-0.142138716404,0.00343312080224,0.000797911768695,118.0,rejected,0.0,noImprovement +-0.141835761268,-0.141005875475,0.00343171274436,0.000797911768695,118.0,rerun,0.0,None +-0.141835761268,-0.141005875475,0.00343171274436,0.000797911768695,118.0,final,0.0,None diff --git a/tests/framework/Optimizers/GradientDescent/gold/ConvergeGradient/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/ConvergeGradient/opt_export_0.csv index b3956e6258..0218fcfafb 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/ConvergeGradient/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/ConvergeGradient/opt_export_0.csv @@ -7,27 +7,27 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 1.23358144803,-0.145439315804,3.01990062781,0.130867578459,5.0,accepted,0.0 2.6986739362,-0.0620703524431,2.0640619099,0.163051396235,6.0,accepted,1.0 1.7952574268,1.5333511983,81.2197052519,0.203716436728,7.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.203716436728,8.0,rerun,0.0 -2.1071506516,1.0075623514,14.6513640883,0.135810957819,9.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.135810957819,10.0,rerun,0.0 -2.2982778586,0.647640269243,2.2193394575,0.0905406385459,11.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.0905406385459,12.0,rerun,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0603604256973,13.0,accepted,1.0 -2.73935159855,-0.193966559427,3.3026249344,0.0754490879958,14.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0754490879958,15.0,rerun,0.0 -2.65217854187,0.015722308547,1.39512500367,0.0502993919972,16.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0502993919972,17.0,rerun,0.0 -2.57435570864,0.145308057513,0.566720647988,0.0335329279982,18.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0335329279982,19.0,rerun,0.0 -2.53170619372,0.23650119913,0.223152036915,0.0223552853321,20.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0223552853321,21.0,rerun,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0149035235547,22.0,accepted,1.0 -2.4904680161,0.462471654459,0.256459637347,0.0186290359958,23.0,rejected,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0186290359958,24.0,rerun,0.0 -2.49305314774,0.406643736668,0.118808446685,0.0124193573305,25.0,rejected,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0124193573305,26.0,rerun,0.0 -2.49509401848,0.36944139653,0.079876658151,0.0082795715537,27.0,accepted,1.0 -2.56459362239,0.307426672113,0.0996875631353,0.0103494623159,28.0,rejected,0.0 -2.49509401848,0.36944139653,0.079876658151,0.0103494623159,29.0,rerun,0.0 -2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,30.0,accepted,1.0 -2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,30.0,final,1.0 +2.6986739362,-0.0620703524431,2.0640619099,0.203716436728,7.0,rerun,0.0 +2.1071506516,1.0075623514,14.6513640883,0.135810957819,8.0,rejected,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.135810957819,8.0,rerun,0.0 +2.2982778586,0.647640269243,2.2193394575,0.0905406385459,9.0,rejected,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.0905406385459,9.0,rerun,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0603604256973,10.0,accepted,1.0 +2.73935159855,-0.193966559427,3.3026249344,0.0754490879958,11.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0754490879958,11.0,rerun,0.0 +2.65217854187,0.0157223085471,1.39512500367,0.0502993919972,12.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0502993919972,12.0,rerun,0.0 +2.57435570864,0.145308057513,0.566720647988,0.0335329279982,13.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0335329279982,13.0,rerun,0.0 +2.53170619372,0.23650119913,0.223152036915,0.0223552853321,14.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0223552853321,14.0,rerun,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0149035235547,15.0,accepted,1.0 +2.4904680161,0.462471654459,0.256459637347,0.0186290359958,16.0,rejected,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0186290359958,16.0,rerun,0.0 +2.49305314774,0.406643736668,0.118808446685,0.0124193573305,17.0,rejected,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0124193573305,17.0,rerun,0.0 +2.49509401848,0.36944139653,0.079876658151,0.0082795715537,18.0,accepted,1.0 +2.56459362239,0.307426672113,0.0996875631353,0.0103494623159,19.0,rejected,0.0 +2.49509401848,0.36944139653,0.079876658151,0.0103494623159,19.0,rerun,0.0 +2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,20.0,accepted,1.0 +2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,20.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/ConvergeIterationLimit/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/ConvergeIterationLimit/opt_export_0.csv new file mode 100644 index 0000000000..5948ded08f --- /dev/null +++ b/tests/framework/Optimizers/GradientDescent/gold/ConvergeIterationLimit/opt_export_0.csv @@ -0,0 +1,16 @@ +x,y,ans,stepSize,iteration,accepted,conv_iterationLimit,conv_gradient,conv_samePoint,conv_objective +-2.0,-2.0,495.703125,0.0707106781187,0.0,first,0.0,0.0,0.0,0.0 +-1.76216514014,-1.4097165262,120.216065726,0.0707106781187,1.0,accepted,0.0,0.0,0.0,0.0 +-1.49300760726,-0.833041381524,50.0888841374,0.0707106781187,2.0,accepted,0.0,0.0,0.0,0.0 +-0.908994151272,-0.293287483134,29.3018670741,0.0883599531938,3.0,accepted,0.0,0.0,0.0,0.0 +0.0558184408956,-0.135120911841,13.4828248644,0.108632350994,4.0,accepted,0.0,0.0,0.0,0.0 +1.23358144803,-0.145439315804,3.01990062781,0.130867578459,5.0,accepted,0.0,0.0,0.0,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.163051396235,6.0,accepted,0.0,0.0,0.0,0.0 +1.7952574268,1.5333511983,81.2197052519,0.203716436728,7.0,rejected,0.0,0.0,0.0,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.203716436728,7.0,rerun,0.0,0.0,0.0,0.0 +2.1071506516,1.0075623514,14.6513640883,0.135810957819,8.0,rejected,0.0,0.0,0.0,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.135810957819,8.0,rerun,0.0,0.0,0.0,0.0 +2.2982778586,0.647640269243,2.2193394575,0.0905406385459,9.0,rejected,0.0,0.0,0.0,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.0905406385459,9.0,rerun,0.0,0.0,0.0,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0603604256973,10.0,accepted,1.0,0.0,0.0,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0603604256973,10.0,final,1.0,0.0,0.0,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/ConvergeObjective/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/ConvergeObjective/opt_export_0.csv index 568840e6f7..05bd149927 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/ConvergeObjective/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/ConvergeObjective/opt_export_0.csv @@ -7,38 +7,38 @@ x,y,ans,stepSize,iteration,accepted,conv_objective 1.23358144803,-0.145439315804,3.01990062781,0.130867578459,5.0,accepted,0.0 2.6986739362,-0.0620703524431,2.0640619099,0.163051396235,6.0,accepted,0.0 1.7952574268,1.5333511983,81.2197052519,0.203716436728,7.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.203716436728,8.0,rerun,0.0 -2.1071506516,1.0075623514,14.6513640883,0.135810957819,9.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.135810957819,10.0,rerun,0.0 -2.2982778586,0.647640269243,2.2193394575,0.0905406385459,11.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.0905406385459,12.0,rerun,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0603604256973,13.0,accepted,0.0 -2.73935159855,-0.193966559427,3.3026249344,0.0754490879958,14.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0754490879958,15.0,rerun,0.0 -2.65217854187,0.015722308547,1.39512500367,0.0502993919972,16.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0502993919972,17.0,rerun,0.0 -2.57435570864,0.145308057513,0.566720647988,0.0335329279982,18.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0335329279982,19.0,rerun,0.0 -2.53170619372,0.23650119913,0.223152036915,0.0223552853321,20.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0223552853321,21.0,rerun,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0149035235547,22.0,accepted,0.0 -2.4904680161,0.462471654459,0.256459637347,0.0186290359958,23.0,rejected,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0186290359958,24.0,rerun,0.0 -2.49305314774,0.406643736668,0.118808446685,0.0124193573305,25.0,rejected,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0124193573305,26.0,rerun,0.0 -2.49509401848,0.36944139653,0.079876658151,0.0082795715537,27.0,accepted,0.0 -2.56459362239,0.307426672113,0.0996875631353,0.0103494623159,28.0,rejected,0.0 -2.49509401848,0.36944139653,0.079876658151,0.0103494623159,29.0,rerun,0.0 -2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,30.0,accepted,0.0 -2.54369708324,0.405651541563,0.0787844861168,0.00862455142398,31.0,rejected,0.0 -2.54139709763,0.32806466165,0.0734851786742,0.00862455142398,32.0,rerun,0.0 -2.5427669421,0.379793835891,0.0604894232541,0.00574970094932,33.0,accepted,0.0 -2.5925082872,0.338443785458,0.0660262750688,0.00718711817723,34.0,rejected,0.0 -2.5427669421,0.379793835891,0.0604894232541,0.00718711817723,35.0,rerun,0.0 -2.57538850329,0.351590967546,0.0550136051699,0.00479141211815,36.0,accepted,0.0 -2.58226316361,0.405051902693,0.0556156283883,0.00598901519275,37.0,rejected,0.0 -2.57538850329,0.351590967546,0.0550136051699,0.00598901519275,38.0,rerun,0.0 -2.58010336695,0.387214400395,0.0476931261698,0.00399267679517,39.0,accepted,0.0 -2.61683719642,0.361364610093,0.047273164752,0.00499083838033,40.0,accepted,0.0 -2.61620130686,0.398585297682,0.0382727627184,0.00413623545083,41.0,accepted,1.0 -2.61620130686,0.398585297682,0.0382727627184,0.00413623545083,41.0,final,1.0 +2.6986739362,-0.0620703524431,2.0640619099,0.203716436728,7.0,rerun,0.0 +2.1071506516,1.0075623514,14.6513640883,0.135810957819,8.0,rejected,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.135810957819,8.0,rerun,0.0 +2.2982778586,0.647640269243,2.2193394575,0.0905406385459,9.0,rejected,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.0905406385459,9.0,rerun,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0603604256973,10.0,accepted,0.0 +2.73935159855,-0.193966559427,3.3026249344,0.0754490879958,11.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0754490879958,11.0,rerun,0.0 +2.65217854187,0.0157223085471,1.39512500367,0.0502993919972,12.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0502993919972,12.0,rerun,0.0 +2.57435570864,0.145308057513,0.566720647988,0.0335329279982,13.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0335329279982,13.0,rerun,0.0 +2.53170619372,0.23650119913,0.223152036915,0.0223552853321,14.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0223552853321,14.0,rerun,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0149035235547,15.0,accepted,0.0 +2.4904680161,0.462471654459,0.256459637347,0.0186290359958,16.0,rejected,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0186290359958,16.0,rerun,0.0 +2.49305314774,0.406643736668,0.118808446685,0.0124193573305,17.0,rejected,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0124193573305,17.0,rerun,0.0 +2.49509401848,0.36944139653,0.079876658151,0.0082795715537,18.0,accepted,0.0 +2.56459362239,0.307426672113,0.0996875631353,0.0103494623159,19.0,rejected,0.0 +2.49509401848,0.36944139653,0.079876658151,0.0103494623159,19.0,rerun,0.0 +2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,20.0,accepted,0.0 +2.54369708324,0.405651541563,0.0787844861168,0.00862455142398,21.0,rejected,0.0 +2.54139709763,0.32806466165,0.0734851786742,0.00862455142398,21.0,rerun,0.0 +2.5427669421,0.379793835891,0.0604894232541,0.00574970094932,22.0,accepted,0.0 +2.5925082872,0.338443785458,0.0660262750688,0.00718711817723,23.0,rejected,0.0 +2.5427669421,0.379793835891,0.0604894232541,0.00718711817723,23.0,rerun,0.0 +2.57538850329,0.351590967546,0.0550136051699,0.00479141211815,24.0,accepted,0.0 +2.58226316361,0.405051902693,0.0556156283883,0.00598901519275,25.0,rejected,0.0 +2.57538850329,0.351590967546,0.0550136051699,0.00598901519275,25.0,rerun,0.0 +2.58010336695,0.387214400395,0.0476931261698,0.00399267679517,26.0,accepted,0.0 +2.61683719642,0.361364610093,0.047273164752,0.00499083838033,27.0,accepted,0.0 +2.61620130686,0.398585297682,0.0382727627184,0.00413623545083,28.0,accepted,1.0 +2.61620130686,0.398585297682,0.0382727627184,0.00413623545083,28.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/ConvergeStepsize/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/ConvergeStepsize/opt_export_0.csv index 865578340b..901cfded84 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/ConvergeStepsize/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/ConvergeStepsize/opt_export_0.csv @@ -7,42 +7,42 @@ x,y,ans,stepSize,iteration,accepted,conv_stepSize 1.23358144803,-0.145439315804,3.01990062781,0.130867578459,5.0,accepted,0.0 2.6986739362,-0.0620703524431,2.0640619099,0.163051396235,6.0,accepted,0.0 1.7952574268,1.5333511983,81.2197052519,0.203716436728,7.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.203716436728,8.0,rerun,0.0 -2.1071506516,1.0075623514,14.6513640883,0.135810957819,9.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.135810957819,10.0,rerun,0.0 -2.2982778586,0.647640269243,2.2193394575,0.0905406385459,11.0,rejected,0.0 -2.6986739362,-0.0620703524431,2.0640619099,0.0905406385459,12.0,rerun,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0603604256973,13.0,accepted,0.0 -2.73935159855,-0.193966559427,3.3026249344,0.0754490879958,14.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0754490879958,15.0,rerun,0.0 -2.65217854187,0.015722308547,1.39512500367,0.0502993919972,16.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0502993919972,17.0,rerun,0.0 -2.57435570864,0.145308057513,0.566720647988,0.0335329279982,18.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0335329279982,19.0,rerun,0.0 -2.53170619372,0.23650119913,0.223152036915,0.0223552853321,20.0,rejected,0.0 -2.43796304958,0.414525591535,0.1887133043,0.0223552853321,21.0,rerun,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0149035235547,22.0,accepted,0.0 -2.4904680161,0.462471654459,0.256459637347,0.0186290359958,23.0,rejected,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0186290359958,24.0,rerun,0.0 -2.49305314774,0.406643736668,0.118808446685,0.0124193573305,25.0,rejected,0.0 -2.49887281286,0.295021127603,0.105657997798,0.0124193573305,26.0,rerun,0.0 -2.49509401848,0.36944139653,0.079876658151,0.0082795715537,27.0,accepted,0.0 -2.56459362239,0.307426672113,0.0996875631353,0.0103494623159,28.0,rejected,0.0 -2.49509401848,0.36944139653,0.079876658151,0.0103494623159,29.0,rerun,0.0 -2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,30.0,accepted,0.0 -2.54369708324,0.405651541563,0.0787844861168,0.00862455142398,31.0,rejected,0.0 -2.54139709763,0.32806466165,0.0734851786742,0.00862455142398,32.0,rerun,0.0 -2.5427669421,0.379793835891,0.0604894232541,0.00574970094932,33.0,accepted,0.0 -2.5925082872,0.338443785458,0.0660262750688,0.00718711817723,34.0,rejected,0.0 -2.5427669421,0.379793835891,0.0604894232541,0.00718711817723,35.0,rerun,0.0 -2.57538850329,0.351590967546,0.0550136051699,0.00479141211815,36.0,accepted,0.0 -2.58226316361,0.405051902693,0.0556156283883,0.00598901519275,37.0,rejected,0.0 -2.57538850329,0.351590967546,0.0550136051699,0.00598901519275,38.0,rerun,0.0 -2.58010336695,0.387214400395,0.0476931261698,0.00399267679517,39.0,accepted,0.0 -2.61683719642,0.361364610093,0.047273164752,0.00499083838033,40.0,accepted,0.0 -2.61620130686,0.398585297682,0.0382727627184,0.00413623545083,41.0,accepted,0.0 -2.63926184068,0.380489027392,0.0354827178058,0.00325702132016,42.0,accepted,0.0 -2.64273034459,0.402921320291,0.0314568462997,0.00252209565047,43.0,accepted,0.0 -2.65894519592,0.393788909338,0.0290213564318,0.00206774862248,44.0,accepted,0.0 -2.66526217451,0.408636625155,0.0267364017419,0.00179284890699,45.0,accepted,1.0 -2.66526217451,0.408636625155,0.0267364017419,0.00179284890699,45.0,final,1.0 +2.6986739362,-0.0620703524431,2.0640619099,0.203716436728,7.0,rerun,0.0 +2.1071506516,1.0075623514,14.6513640883,0.135810957819,8.0,rejected,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.135810957819,8.0,rerun,0.0 +2.2982778586,0.647640269243,2.2193394575,0.0905406385459,9.0,rejected,0.0 +2.6986739362,-0.0620703524431,2.0640619099,0.0905406385459,9.0,rerun,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0603604256973,10.0,accepted,0.0 +2.73935159855,-0.193966559427,3.3026249344,0.0754490879958,11.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0754490879958,11.0,rerun,0.0 +2.65217854187,0.0157223085471,1.39512500367,0.0502993919972,12.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0502993919972,12.0,rerun,0.0 +2.57435570864,0.145308057513,0.566720647988,0.0335329279982,13.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0335329279982,13.0,rerun,0.0 +2.53170619372,0.23650119913,0.223152036915,0.0223552853321,14.0,rejected,0.0 +2.43796304958,0.414525591535,0.1887133043,0.0223552853321,14.0,rerun,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0149035235547,15.0,accepted,0.0 +2.4904680161,0.462471654459,0.256459637347,0.0186290359958,16.0,rejected,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0186290359958,16.0,rerun,0.0 +2.49305314774,0.406643736668,0.118808446685,0.0124193573305,17.0,rejected,0.0 +2.49887281286,0.295021127603,0.105657997798,0.0124193573305,17.0,rerun,0.0 +2.49509401848,0.36944139653,0.079876658151,0.0082795715537,18.0,accepted,0.0 +2.56459362239,0.307426672113,0.0996875631353,0.0103494623159,19.0,rejected,0.0 +2.49509401848,0.36944139653,0.079876658151,0.0103494623159,19.0,rerun,0.0 +2.54139709763,0.32806466165,0.0734851786742,0.00689964154392,20.0,accepted,0.0 +2.54369708324,0.405651541563,0.0787844861168,0.00862455142398,21.0,rejected,0.0 +2.54139709763,0.32806466165,0.0734851786742,0.00862455142398,21.0,rerun,0.0 +2.5427669421,0.379793835891,0.0604894232541,0.00574970094932,22.0,accepted,0.0 +2.5925082872,0.338443785458,0.0660262750688,0.00718711817723,23.0,rejected,0.0 +2.5427669421,0.379793835891,0.0604894232541,0.00718711817723,23.0,rerun,0.0 +2.57538850329,0.351590967546,0.0550136051699,0.00479141211815,24.0,accepted,0.0 +2.58226316361,0.405051902693,0.0556156283883,0.00598901519275,25.0,rejected,0.0 +2.57538850329,0.351590967546,0.0550136051699,0.00598901519275,25.0,rerun,0.0 +2.58010336695,0.387214400395,0.0476931261698,0.00399267679517,26.0,accepted,0.0 +2.61683719642,0.361364610093,0.047273164752,0.00499083838033,27.0,accepted,0.0 +2.61620130686,0.398585297682,0.0382727627184,0.00413623545083,28.0,accepted,0.0 +2.63926184068,0.380489027392,0.0354827178058,0.00325702132016,29.0,accepted,0.0 +2.64273034459,0.402921320291,0.0314568462998,0.00252209565047,30.0,accepted,0.0 +2.65894519592,0.393788909338,0.0290213564318,0.00206774862247,31.0,accepted,0.0 +2.66526217451,0.408636625155,0.0267364017419,0.00179284890699,32.0,accepted,1.0 +2.66526217451,0.408636625155,0.0267364017419,0.00179284890699,32.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/InitSampler/opt_export_1.csv b/tests/framework/Optimizers/GradientDescent/gold/InitSampler/opt_export_1.csv index dadf49bf2e..72c0e343bb 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/InitSampler/opt_export_1.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/InitSampler/opt_export_1.csv @@ -4,13 +4,13 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 1.99180925033,0.755928498735,5.2084937629,0.0707106781187,2.0,accepted,0.0 2.10781055751,-0.0298185878168,0.737969614797,0.088251519575,3.0,accepted,0.0 2.0956488044,0.953586074116,11.717390259,0.109275540131,4.0,rejected,0.0 -2.10781055751,-0.0298185878168,0.737969614797,0.109275540131,5.0,rerun,0.0 -2.10125005988,0.625801829823,2.53246481792,0.0728503600876,6.0,rejected,0.0 -2.10781055751,-0.0298185878168,0.737969614797,0.0728503600876,7.0,rerun,0.0 -2.09583272933,0.407119428803,0.767504061379,0.048566906725,8.0,rejected,0.0 -2.10781055751,-0.0298185878168,0.737969614797,0.048566906725,9.0,rerun,0.0 -2.10047188829,0.261490429161,0.404500814795,0.0323779378167,10.0,accepted,1.0 -2.41365905609,0.075498423425,0.602567662925,0.0404724000258,11.0,rejected,0.0 -2.10047188829,0.261490429161,0.404500814795,0.0404724000258,12.0,rerun,0.0 -2.31211206359,0.142423296422,0.335463657994,0.0269816000172,13.0,accepted,1.0 -2.31211206359,0.142423296422,0.335463657994,0.0269816000172,13.0,final,1.0 +2.10781055751,-0.0298185878168,0.737969614797,0.109275540131,4.0,rerun,0.0 +2.10125005988,0.625801829823,2.53246481792,0.0728503600876,5.0,rejected,0.0 +2.10781055751,-0.0298185878168,0.737969614797,0.0728503600876,5.0,rerun,0.0 +2.09583272933,0.407119428803,0.767504061379,0.048566906725,6.0,rejected,0.0 +2.10781055751,-0.0298185878168,0.737969614797,0.048566906725,6.0,rerun,0.0 +2.10047188829,0.261490429161,0.404500814795,0.0323779378167,7.0,accepted,1.0 +2.41365905609,0.075498423425,0.602567662925,0.0404724000258,8.0,rejected,0.0 +2.10047188829,0.261490429161,0.404500814795,0.0404724000258,8.0,rerun,0.0 +2.31211206359,0.142423296422,0.335463657994,0.0269816000172,9.0,accepted,1.0 +2.31211206359,0.142423296422,0.335463657994,0.0269816000172,9.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/InitialStep/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/InitialStep/opt_export_0.csv index 472a6e8018..8c75df97f0 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/InitialStep/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/InitialStep/opt_export_0.csv @@ -4,42 +4,42 @@ x,y,func,const,ans,stepSize,iteration,accepted,conv_gradient -0.577460977709,0.0287066286523,2.59124565094,3.14,22.4947565696,0.141421356237,2.0,accepted,0.0 0.957689107158,0.270592304239,4.3682814114,3.14,5.34211121795,0.172676621446,3.0,accepted,0.0 2.63092410216,-0.575319490024,5.19560461214,3.14,7.49058741536,0.208323173447,4.0,rejected,0.0 -0.957689107158,0.270592304239,4.3682814114,3.14,5.34211121795,0.208323173447,5.0,rerun,0.0 -2.05597897304,-0.326154690652,4.86982428239,3.14,1.9224547773,0.138882115631,6.0,accepted,0.0 -1.63141737892,1.17732036618,5.9487377451,3.14,24.8602679266,0.17358563524,7.0,rejected,0.0 -2.05597897304,-0.326154690652,4.86982428239,3.14,1.9224547773,0.17358563524,8.0,rerun,0.0 -1.78967516134,0.680738203006,5.61041336435,3.14,4.48528290897,0.115723756827,9.0,rejected,0.0 -2.05597897304,-0.326154690652,4.86982428239,3.14,1.9224547773,0.115723756827,10.0,rerun,0.0 -1.86855026939,0.342412467706,5.35096273709,3.14,1.12555632863,0.077149171218,11.0,accepted,0.0 -2.43015320635,-0.319301070288,5.25085213607,3.14,2.92875571278,0.0964341178017,12.0,rejected,0.0 -1.86855026939,0.342412467706,5.35096273709,3.14,1.12555632863,0.0964341178017,13.0,rerun,0.0 -2.23020702186,-0.10923761824,5.26096940362,3.14,1.10407196649,0.0642894118678,14.0,accepted,0.0 -2.02296020388,0.583620740189,5.74658094407,3.14,2.28014072096,0.0803544576812,15.0,rejected,0.0 -2.23020702186,-0.10923761824,5.26096940362,3.14,1.10407196649,0.0803544576812,16.0,rerun,0.0 -2.09179577117,0.352594088094,5.58438985926,3.14,0.586687254121,0.0535696384542,17.0,accepted,0.0 -2.45013061928,-0.131960655871,5.45816996341,3.14,1.67511575622,0.0669620459361,18.0,rejected,0.0 -2.09179577117,0.352594088094,5.58438985926,3.14,0.586687254121,0.0669620459361,19.0,rerun,0.0 -2.33596320259,0.0335279086155,5.50949111121,3.14,0.664561559344,0.0446413639574,20.0,rejected,0.0 -2.09179577117,0.352594088094,5.58438985926,3.14,0.586687254121,0.0446413639574,21.0,rerun,0.0 -2.25049246932,0.136821041745,5.52731351107,3.14,0.342215239925,0.0297609093049,22.0,accepted,0.0 -2.2628972241,0.471387827731,5.87428505183,3.14,0.691289882566,0.037199630329,23.0,rejected,0.0 -2.25049246932,0.136821041745,5.52731351107,3.14,0.342215239925,0.037199630329,24.0,rerun,0.0 -2.25871466563,0.359867327,5.75858199263,3.14,0.305831960099,0.0247997535527,25.0,accepted,0.0 -2.42547490724,0.136192397786,5.70166730503,3.14,0.413515482735,0.030999691783,26.0,rejected,0.0 -2.25871466563,0.359867327,5.75858199263,3.14,0.305831960099,0.030999691783,27.0,rerun,0.0 -2.37018863235,0.210975195553,5.7211638279,3.14,0.213984841395,0.0206664611887,28.0,accepted,0.0 -2.36165748396,0.443316206906,5.94497369087,3.14,0.378633404537,0.0258330647655,29.0,rejected,0.0 -2.37018863235,0.210975195553,5.7211638279,3.14,0.213984841395,0.0258330647655,30.0,rerun,0.0 -2.3647218555,0.365877147824,5.87059900333,3.14,0.182187561058,0.017222043177,31.0,accepted,0.0 -2.48004082665,0.210185786872,5.83022661352,3.14,0.253206008562,0.0215275490972,32.0,rejected,0.0 -2.3647218555,0.365877147824,5.87059900333,3.14,0.182187561058,0.0215275490972,33.0,rerun,0.0 -2.44345087413,0.263478832647,5.84692970678,3.14,0.141545229466,0.0143516993982,34.0,accepted,0.0 -2.43869945921,0.424859721772,6.00355918098,3.14,0.212110519296,0.0179389800136,35.0,rejected,0.0 -2.44345087413,0.263478832647,5.84692970678,3.14,0.141545229466,0.0179389800136,36.0,rerun,0.0 -2.43964309184,0.371045337357,5.9506884292,3.14,0.118658576484,0.0119593200091,37.0,accepted,0.0 -2.52337699767,0.265735632455,5.92911263013,3.14,0.155740075745,0.0149490909475,38.0,rejected,0.0 -2.43964309184,0.371045337357,5.9506884292,3.14,0.118658576484,0.0149490909475,39.0,rerun,0.0 -2.49650253738,0.301675927827,5.93817846521,3.14,0.0984247582161,0.00996606063165,40.0,accepted,0.0 -2.49719348031,0.413789219855,6.05098270016,3.14,0.126702817962,0.0124572690126,41.0,rejected,0.0 -2.49650253738,0.301675927827,5.93817846521,3.14,0.0984247582161,0.0124572690126,42.0,rerun,0.0 -2.49650253738,0.301675927827,5.93817846521,3.14,0.0984247582161,0.0124572690126,42.0,final,0.0 +0.957689107158,0.270592304239,4.3682814114,3.14,5.34211121795,0.208323173447,4.0,rerun,0.0 +2.05597897304,-0.326154690652,4.86982428239,3.14,1.9224547773,0.138882115631,5.0,accepted,0.0 +1.63141737892,1.17732036618,5.9487377451,3.14,24.8602679266,0.17358563524,6.0,rejected,0.0 +2.05597897304,-0.326154690652,4.86982428239,3.14,1.9224547773,0.17358563524,6.0,rerun,0.0 +1.78967516134,0.680738203006,5.61041336435,3.14,4.48528290897,0.115723756827,7.0,rejected,0.0 +2.05597897304,-0.326154690652,4.86982428239,3.14,1.9224547773,0.115723756827,7.0,rerun,0.0 +1.86855026939,0.342412467706,5.35096273709,3.14,1.12555632863,0.077149171218,8.0,accepted,0.0 +2.43015320635,-0.319301070288,5.25085213607,3.14,2.92875571278,0.0964341178017,9.0,rejected,0.0 +1.86855026939,0.342412467706,5.35096273709,3.14,1.12555632863,0.0964341178017,9.0,rerun,0.0 +2.23020702186,-0.10923761824,5.26096940362,3.14,1.10407196649,0.0642894118678,10.0,accepted,0.0 +2.02296020388,0.583620740189,5.74658094407,3.14,2.28014072096,0.0803544576812,11.0,rejected,0.0 +2.23020702186,-0.10923761824,5.26096940362,3.14,1.10407196649,0.0803544576812,11.0,rerun,0.0 +2.09179577117,0.352594088094,5.58438985926,3.14,0.586687254121,0.0535696384542,12.0,accepted,0.0 +2.45013061928,-0.131960655871,5.45816996341,3.14,1.67511575622,0.0669620459361,13.0,rejected,0.0 +2.09179577117,0.352594088094,5.58438985926,3.14,0.586687254121,0.0669620459361,13.0,rerun,0.0 +2.33596320259,0.0335279086155,5.50949111121,3.14,0.664561559344,0.0446413639574,14.0,rejected,0.0 +2.09179577117,0.352594088094,5.58438985926,3.14,0.586687254121,0.0446413639574,14.0,rerun,0.0 +2.25049246932,0.136821041745,5.52731351107,3.14,0.342215239925,0.0297609093049,15.0,accepted,0.0 +2.2628972241,0.471387827731,5.87428505183,3.14,0.691289882566,0.037199630329,16.0,rejected,0.0 +2.25049246932,0.136821041745,5.52731351107,3.14,0.342215239925,0.037199630329,16.0,rerun,0.0 +2.25871466563,0.359867327,5.75858199263,3.14,0.305831960099,0.0247997535527,17.0,accepted,0.0 +2.42547490724,0.136192397786,5.70166730503,3.14,0.413515482735,0.030999691783,18.0,rejected,0.0 +2.25871466563,0.359867327,5.75858199263,3.14,0.305831960099,0.030999691783,18.0,rerun,0.0 +2.37018863235,0.210975195553,5.7211638279,3.14,0.213984841395,0.0206664611887,19.0,accepted,0.0 +2.36165748396,0.443316206906,5.94497369087,3.14,0.378633404537,0.0258330647655,20.0,rejected,0.0 +2.37018863235,0.210975195553,5.7211638279,3.14,0.213984841395,0.0258330647655,20.0,rerun,0.0 +2.3647218555,0.365877147824,5.87059900333,3.14,0.182187561058,0.017222043177,21.0,accepted,0.0 +2.48004082665,0.210185786872,5.83022661352,3.14,0.253206008562,0.0215275490972,22.0,rejected,0.0 +2.3647218555,0.365877147824,5.87059900333,3.14,0.182187561058,0.0215275490972,22.0,rerun,0.0 +2.44345087413,0.263478832647,5.84692970678,3.14,0.141545229466,0.0143516993982,23.0,accepted,0.0 +2.43869945921,0.424859721772,6.00355918098,3.14,0.212110519296,0.0179389800136,24.0,rejected,0.0 +2.44345087413,0.263478832647,5.84692970678,3.14,0.141545229466,0.0179389800136,24.0,rerun,0.0 +2.43964309184,0.371045337357,5.9506884292,3.14,0.118658576484,0.0119593200091,25.0,accepted,0.0 +2.52337699767,0.265735632455,5.92911263013,3.14,0.155740075745,0.0149490909475,26.0,rejected,0.0 +2.43964309184,0.371045337357,5.9506884292,3.14,0.118658576484,0.0149490909475,26.0,rerun,0.0 +2.49650253738,0.301675927827,5.93817846521,3.14,0.0984247582161,0.00996606063165,27.0,accepted,0.0 +2.49719348031,0.413789219855,6.05098270016,3.14,0.126702817962,0.0124572690126,28.0,rejected,0.0 +2.49650253738,0.301675927827,5.93817846521,3.14,0.0984247582161,0.0124572690126,28.0,rerun,0.0 +2.49650253738,0.301675927827,5.93817846521,3.14,0.0984247582161,0.0124572690126,28.0,final,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/Max/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/Max/opt_export_0.csv index 6bb94bfce4..7f6502345f 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/Max/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/Max/opt_export_0.csv @@ -7,19 +7,19 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 1.23358144803,-0.145439315804,-3.01990062781,0.130867578459,5.0,accepted,0.0 2.6986739362,-0.0620703524431,-2.0640619099,0.163051396235,6.0,accepted,1.0 1.7952574268,1.5333511983,-81.2197052519,0.203716436728,7.0,rejected,0.0 -2.6986739362,-0.0620703524431,-2.0640619099,0.203716436728,8.0,rerun,0.0 -2.1071506516,1.0075623514,-14.6513640883,0.135810957819,9.0,rejected,0.0 -2.6986739362,-0.0620703524431,-2.0640619099,0.135810957819,10.0,rerun,0.0 -2.2982778586,0.647640269243,-2.2193394575,0.0905406385459,11.0,rejected,0.0 -2.6986739362,-0.0620703524431,-2.0640619099,0.0905406385459,12.0,rerun,0.0 -2.43796304958,0.414525591535,-0.1887133043,0.0603604256973,13.0,accepted,1.0 -2.73935159855,-0.193966559427,-3.3026249344,0.0754490879958,14.0,rejected,0.0 -2.43796304958,0.414525591535,-0.1887133043,0.0754490879958,15.0,rerun,0.0 -2.65217854187,0.015722308547,-1.39512500367,0.0502993919972,16.0,rejected,0.0 -2.43796304958,0.414525591535,-0.1887133043,0.0502993919972,17.0,rerun,0.0 -2.57435570864,0.145308057513,-0.566720647988,0.0335329279982,18.0,rejected,0.0 -2.43796304958,0.414525591535,-0.1887133043,0.0335329279982,19.0,rerun,0.0 -2.53170619372,0.23650119913,-0.223152036915,0.0223552853321,20.0,rejected,0.0 -2.43796304958,0.414525591535,-0.1887133043,0.0223552853321,21.0,rerun,0.0 -2.49887281286,0.295021127603,-0.105657997798,0.0149035235547,22.0,accepted,1.0 -2.49887281286,0.295021127603,-0.105657997798,0.0149035235547,22.0,final,1.0 +2.6986739362,-0.0620703524431,-2.0640619099,0.203716436728,7.0,rerun,0.0 +2.1071506516,1.0075623514,-14.6513640883,0.135810957819,8.0,rejected,0.0 +2.6986739362,-0.0620703524431,-2.0640619099,0.135810957819,8.0,rerun,0.0 +2.2982778586,0.647640269243,-2.2193394575,0.0905406385459,9.0,rejected,0.0 +2.6986739362,-0.0620703524431,-2.0640619099,0.0905406385459,9.0,rerun,0.0 +2.43796304958,0.414525591535,-0.1887133043,0.0603604256973,10.0,accepted,1.0 +2.73935159855,-0.193966559427,-3.3026249344,0.0754490879958,11.0,rejected,0.0 +2.43796304958,0.414525591535,-0.1887133043,0.0754490879958,11.0,rerun,0.0 +2.65217854187,0.0157223085471,-1.39512500367,0.0502993919972,12.0,rejected,0.0 +2.43796304958,0.414525591535,-0.1887133043,0.0502993919972,12.0,rerun,0.0 +2.57435570864,0.145308057513,-0.566720647988,0.0335329279982,13.0,rejected,0.0 +2.43796304958,0.414525591535,-0.1887133043,0.0335329279982,13.0,rerun,0.0 +2.53170619372,0.23650119913,-0.223152036915,0.0223552853321,14.0,rejected,0.0 +2.43796304958,0.414525591535,-0.1887133043,0.0223552853321,14.0,rerun,0.0 +2.49887281286,0.295021127603,-0.105657997798,0.0149035235547,15.0,accepted,1.0 +2.49887281286,0.295021127603,-0.105657997798,0.0149035235547,15.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_0.csv index 97df54b854..908421a4c0 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_0.csv @@ -3,13 +3,13 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient -1.76216514014,-1.4097165262,120.216065726,0.0707106781187,1.0,accepted,0.0 -1.49361933709,-0.8327562575,50.1004202974,0.0707106781187,2.0,accepted,0.0 -0.904850997818,-0.298178172915,29.2355086004,0.0883610638408,3.0,accepted,0.0 -0.0591512578733,-0.140102890022,13.4398844325,0.108541858799,4.0,accepted,0.0 +0.0591512578734,-0.140102890022,13.4398844325,0.108541858799,4.0,accepted,0.0 1.23720635958,-0.150831301595,3.00356629095,0.1309004391,5.0,accepted,0.0 -2.70069665355,-0.0383123506168,1.90617365921,0.16308993031,6.0,accepted,0.0 +2.70069665355,-0.0383123506167,1.90617365921,0.16308993031,6.0,accepted,0.0 1.83643492203,1.57843596909,95.6238696275,0.203694987115,7.0,rejected,0.0 -2.70069665355,-0.0383123506168,1.90617365921,0.203694987115,8.0,rerun,0.0 -2.11355775529,1.03358654111,16.2960814589,0.135796658077,9.0,rejected,0.0 -2.70069665355,-0.0383123506168,1.90617365921,0.135796658077,10.0,rerun,0.0 -2.31544013911,0.679631785437,2.65719350328,0.0905311053844,11.0,rejected,0.0 -2.70069665355,-0.0383123506168,1.90617365921,0.0905311053844,12.0,rerun,0.0 -2.43992342156,0.438184280005,0.246667150243,0.0603540702563,13.0,accepted,0.0 +2.70069665355,-0.0383123506167,1.90617365921,0.203694987115,7.0,rerun,0.0 +2.11355775529,1.03358654111,16.2960814589,0.135796658077,8.0,rejected,0.0 +2.70069665355,-0.0383123506167,1.90617365921,0.135796658077,8.0,rerun,0.0 +2.31544013911,0.679631785437,2.65719350329,0.0905311053844,9.0,rejected,0.0 +2.70069665355,-0.0383123506167,1.90617365921,0.0905311053844,9.0,rerun,0.0 +2.43992342156,0.438184280005,0.246667150243,0.0603540702563,10.0,accepted,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_1.csv b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_1.csv index 40c33591ea..7ab9de1318 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_1.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_1.csv @@ -5,13 +5,13 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 1.34776962505,-0.0425144754993,2.45848608228,0.0883876911838,3.0,accepted,0.0 2.33997124893,-0.050599387102,1.00659893097,0.110248284791,4.0,accepted,0.0 2.02421335108,0.792604269967,5.99706616206,0.100042920256,5.0,rejected,0.0 -2.33997124893,-0.050599387102,1.00659893097,0.100042920256,6.0,rerun,0.0 -2.12997670195,0.511727370571,1.2800882408,0.0666952801704,7.0,rejected,0.0 -2.33997124893,-0.050599387102,1.00659893097,0.0666952801704,8.0,rerun,0.0 -2.20271028056,0.325295280128,0.326915064396,0.0444635201136,9.0,accepted,0.0 -2.54103540012,-0.0431443977156,1.41302079949,0.0555790708833,10.0,rejected,0.0 -2.20271028056,0.325295280128,0.326915064396,0.0555790708833,11.0,rerun,0.0 -2.43560992667,0.0866261636367,0.589548709693,0.0370527139222,12.0,rejected,0.0 -2.20271028056,0.325295280128,0.326915064396,0.0370527139222,13.0,rerun,0.0 -2.35352628238,0.161958010901,0.304091256806,0.0247018092815,14.0,accepted,0.0 -2.31461055259,0.437091191306,0.435105084053,0.0308746371967,15.0,accepted,0.0 +2.33997124893,-0.050599387102,1.00659893097,0.100042920256,5.0,rerun,0.0 +2.12997670195,0.511727370571,1.2800882408,0.0666952801704,6.0,rejected,0.0 +2.33997124893,-0.050599387102,1.00659893097,0.0666952801704,6.0,rerun,0.0 +2.20271028056,0.325295280128,0.326915064396,0.0444635201136,7.0,accepted,0.0 +2.54103540012,-0.0431443977156,1.41302079949,0.0555790708833,8.0,rejected,0.0 +2.20271028056,0.325295280128,0.326915064396,0.0555790708833,8.0,rerun,0.0 +2.43560992667,0.0866261636367,0.589548709693,0.0370527139222,9.0,rejected,0.0 +2.20271028056,0.325295280128,0.326915064396,0.0370527139222,9.0,rerun,0.0 +2.35352628238,0.161958010901,0.304091256806,0.0247018092815,10.0,accepted,0.0 +2.31461055259,0.437091191306,0.435105084053,0.0308746371967,11.0,accepted,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_2.csv b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_2.csv index e26b6319e6..82343b183d 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_2.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_2.csv @@ -4,16 +4,16 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 1.26791169284,-0.0786642223544,2.83749990866,0.0707106781187,2.0,accepted,0.0 2.06204224172,-0.076013094047,0.872502559862,0.0882372193484,3.0,accepted,0.0 2.06210222697,0.91486586726,10.0046501883,0.110097662569,4.0,rejected,0.0 -2.06204224172,-0.076013094047,0.872502559862,0.110097662569,5.0,rerun,0.0 -2.06340254559,0.584571480772,2.15660645426,0.0733984417128,6.0,rejected,0.0 -2.06204224172,-0.076013094047,0.872502559862,0.0733984417128,7.0,rerun,0.0 -2.05539056579,0.36432731979,0.703480434277,0.0489322944752,8.0,accepted,0.0 -2.36927087929,-0.0878856959177,1.23576991869,0.0611633577447,9.0,rejected,0.0 -2.05539056579,0.36432731979,0.703480434277,0.0611633577447,10.0,rerun,0.0 -2.26531618451,0.0633195748622,0.516556754188,0.0407755718298,11.0,accepted,0.0 -2.19031599812,0.51587181706,1.14694991628,0.0509694364817,12.0,rejected,0.0 -2.26531618451,0.0633195748622,0.516556754188,0.0509694364817,13.0,rerun,0.0 -2.21702801,0.365299800359,0.383047706569,0.0339796243211,14.0,accepted,0.0 -2.43290135155,0.0498182702614,0.727152469658,0.0424743779594,15.0,rejected,0.0 -2.21702801,0.365299800359,0.383047706569,0.0424743779594,16.0,rerun,0.0 -2.36432102703,0.157330121505,0.318352833505,0.028316251973,17.0,accepted,0.0 +2.06204224172,-0.076013094047,0.872502559862,0.110097662569,4.0,rerun,0.0 +2.06340254559,0.584571480772,2.15660645426,0.0733984417128,5.0,rejected,0.0 +2.06204224172,-0.076013094047,0.872502559862,0.0733984417128,5.0,rerun,0.0 +2.05539056579,0.36432731979,0.703480434277,0.0489322944752,6.0,accepted,0.0 +2.36927087929,-0.0878856959177,1.23576991869,0.0611633577447,7.0,rejected,0.0 +2.05539056579,0.36432731979,0.703480434277,0.0611633577447,7.0,rerun,0.0 +2.26531618451,0.0633195748622,0.516556754188,0.0407755718298,8.0,accepted,0.0 +2.19031599812,0.51587181706,1.14694991628,0.0509694364817,9.0,rejected,0.0 +2.26531618451,0.0633195748622,0.516556754188,0.0509694364817,9.0,rerun,0.0 +2.21702801,0.365299800359,0.383047706569,0.0339796243211,10.0,accepted,0.0 +2.43290135155,0.0498182702614,0.727152469658,0.0424743779594,11.0,rejected,0.0 +2.21702801,0.365299800359,0.383047706569,0.0424743779594,11.0,rerun,0.0 +2.36432102703,0.157330121505,0.318352833505,0.028316251973,12.0,accepted,0.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_3.csv b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_3.csv index 1454eb7b19..c83cc46076 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_3.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_3.csv @@ -2,30 +2,30 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient -2.0,2.0,143.703125,0.0707106781187,0.0,first,0.0 -1.81481776891,1.39114242939,1.12876877706,0.0707106781187,1.0,accepted,0.0 -1.85443168513,0.755980451908,26.6113539821,0.0707106781187,2.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.0707106781187,3.0,rerun,0.0 --1.85231189115,0.968538370257,15.8287286635,0.0471404520791,4.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.0471404520791,5.0,rerun,0.0 --1.83736851556,1.10920012355,8.84741079988,0.0314269680527,6.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.0314269680527,7.0,rerun,0.0 --1.8328609898,1.20344587179,4.90656148242,0.0209513120352,8.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.0209513120352,9.0,rerun,0.0 --1.83922681933,1.26782711245,2.81106800938,0.0139675413568,10.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.0139675413568,11.0,rerun,0.0 --1.83050568426,1.30881862404,1.88993601568,0.00931169423785,12.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.00931169423785,13.0,rerun,0.0 --1.82230904441,1.33577677058,1.47320409652,0.00620779615857,14.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.00620779615857,15.0,rerun,0.0 --1.82071778353,1.35436591215,1.27099985774,0.00413853077238,16.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.00413853077238,17.0,rerun,0.0 --1.81832251449,1.36655982398,1.18596052134,0.00275902051492,18.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.00275902051492,19.0,rerun,0.0 --1.81733578536,1.37478093238,1.14895794667,0.00183934700995,20.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.00183934700995,21.0,rerun,0.0 --1.81649380604,1.38023435868,1.13429990258,0.00122623133996,22.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.00122623133996,23.0,rerun,0.0 --1.8158821939,1.383862446,1.12892821507,0.000817487559976,24.0,rejected,0.0 --1.81481776891,1.39114242939,1.12876877706,0.000817487559976,25.0,rerun,0.0 --1.81553475389,1.38629019018,1.12727124343,0.00054499170665,26.0,accepted,0.0 --1.81957036046,1.39090591794,1.12791179682,0.000681239458083,27.0,rejected,0.0 --1.81553475389,1.38629019018,1.12727124343,0.000681239458083,28.0,rerun,0.0 --1.81828214514,1.38931657094,1.12676986165,0.000454159638722,29.0,accepted,1.0 +-1.81481776891,1.39114242939,1.12876877706,0.0707106781187,2.0,rerun,0.0 +-1.85231189115,0.968538370257,15.8287286635,0.0471404520791,3.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.0471404520791,3.0,rerun,0.0 +-1.83736851556,1.10920012355,8.84741079988,0.0314269680527,4.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.0314269680527,4.0,rerun,0.0 +-1.8328609898,1.20344587179,4.90656148242,0.0209513120352,5.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.0209513120352,5.0,rerun,0.0 +-1.83922681933,1.26782711245,2.81106800938,0.0139675413568,6.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.0139675413568,6.0,rerun,0.0 +-1.83050568426,1.30881862404,1.88993601568,0.00931169423785,7.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.00931169423785,7.0,rerun,0.0 +-1.82230904441,1.33577677058,1.47320409652,0.00620779615857,8.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.00620779615857,8.0,rerun,0.0 +-1.82071778353,1.35436591215,1.27099985774,0.00413853077238,9.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.00413853077238,9.0,rerun,0.0 +-1.81832251449,1.36655982398,1.18596052134,0.00275902051492,10.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.00275902051492,10.0,rerun,0.0 +-1.81733578536,1.37478093238,1.14895794667,0.00183934700995,11.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.00183934700995,11.0,rerun,0.0 +-1.81649380604,1.38023435868,1.13429990258,0.00122623133996,12.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.00122623133996,12.0,rerun,0.0 +-1.8158821939,1.383862446,1.12892821507,0.000817487559976,13.0,rejected,0.0 +-1.81481776891,1.39114242939,1.12876877706,0.000817487559976,13.0,rerun,0.0 +-1.81553475389,1.38629019018,1.12727124343,0.00054499170665,14.0,accepted,0.0 +-1.81957036046,1.39090591794,1.12791179682,0.000681239458083,15.0,rejected,0.0 +-1.81553475389,1.38629019018,1.12727124343,0.000681239458083,15.0,rerun,0.0 +-1.81828214514,1.38931657094,1.12676986165,0.000454159638722,16.0,accepted,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_4.csv b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_4.csv index 958cdc5c58..3b29eaad34 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_4.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/MultiTraj/opt_export_4.csv @@ -4,40 +4,40 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient 1.70759626893,0.763876680722,6.38831830708,0.0707106781187,2.0,accepted,0.0 1.84030115121,-0.0190281312614,0.924996038899,0.0882302354608,3.0,accepted,0.0 2.56156994305,0.644756025144,1.47810168382,0.108913720319,4.0,rejected,0.0 -1.84030115121,-0.0190281312614,0.924996038899,0.108913720319,5.0,rerun,0.0 -2.31905736627,0.425754547802,0.38688552079,0.0726091468793,6.0,accepted,0.0 -2.6896457282,-0.302194370052,4.0667024133,0.0907612089462,7.0,rejected,0.0 -2.31905736627,0.425754547802,0.38688552079,0.0907612089462,8.0,rerun,0.0 -2.55011933287,-0.0673619307006,1.58179116967,0.0605074726308,9.0,rejected,0.0 -2.31905736627,0.425754547802,0.38688552079,0.0605074726308,10.0,rerun,0.0 -2.48295280332,0.101810357386,0.597004461346,0.0403383150872,11.0,rejected,0.0 -2.31905736627,0.425754547802,0.38688552079,0.0403383150872,12.0,rerun,0.0 -2.42672617041,0.208992243605,0.229620496761,0.0268922100581,13.0,accepted,0.0 -2.37424778164,0.506941509667,0.658258178671,0.0336150588013,14.0,rejected,0.0 -2.42672617041,0.208992243605,0.229620496761,0.0336150588013,15.0,rerun,0.0 -2.39111579628,0.40751402999,0.229040422148,0.0224100392009,16.0,accepted,0.0 -2.51239400991,0.186488263346,0.343032641073,0.0280125180624,17.0,rejected,0.0 -2.39111579628,0.40751402999,0.229040422148,0.0280125180624,18.0,rerun,0.0 -2.47173584842,0.26003640712,0.149919509527,0.0186750120416,19.0,accepted,0.0 -2.44517919267,0.468445044973,0.342562386685,0.023343758596,20.0,rejected,0.0 -2.47173584842,0.26003640712,0.149919509527,0.023343758596,21.0,rerun,0.0 -2.45447061811,0.399030760158,0.141932765994,0.0155625057307,22.0,accepted,0.0 -2.54283623635,0.247889033228,0.203422890351,0.0194531104833,23.0,rejected,0.0 -2.45447061811,0.399030760158,0.141932765994,0.0194531104833,24.0,rerun,0.0 -2.51296714285,0.298028765805,0.103174862465,0.0129687403222,25.0,accepted,0.0 -2.50103290978,0.443437900407,0.186632073945,0.0162108949589,26.0,rejected,0.0 -2.51296714285,0.298028765805,0.103174862465,0.0162108949589,27.0,rerun,0.0 -2.50564506283,0.395018143045,0.0935329630576,0.0108072633059,28.0,accepted,0.0 -2.57294244855,0.293760878785,0.124498200414,0.0135090146811,29.0,rejected,0.0 -2.50564506283,0.395018143045,0.0935329630576,0.0135090146811,30.0,rerun,0.0 -2.55058607629,0.327563932618,0.0739104046002,0.0090060097874,31.0,accepted,0.0 -2.54812390362,0.428851606652,0.10826814378,0.0112575106373,32.0,rejected,0.0 -2.55058607629,0.327563932618,0.0739104046002,0.0112575106373,33.0,rerun,0.0 -2.54891633135,0.395088354857,0.065964231187,0.0075050070915,34.0,accepted,0.0 -2.59992446687,0.327806713384,0.0799170054825,0.00938125868057,35.0,rejected,0.0 -2.54891633135,0.395088354857,0.065964231187,0.00938125868057,36.0,rerun,0.0 -2.58232033151,0.34978425689,0.0558003659649,0.00625417245372,37.0,accepted,0.0 -2.58568076614,0.420062003578,0.0678849266674,0.00781756032209,38.0,rejected,0.0 -2.58232033151,0.34978425689,0.0558003659649,0.00781756032209,39.0,rerun,0.0 -2.58438371378,0.396644212413,0.0494900108542,0.00521170688139,40.0,accepted,1.0 -2.58438371378,0.396644212413,0.0494900108542,0.00521170688139,40.0,final,1.0 +1.84030115121,-0.0190281312614,0.924996038899,0.108913720319,4.0,rerun,0.0 +2.31905736627,0.425754547802,0.38688552079,0.0726091468793,5.0,accepted,0.0 +2.6896457282,-0.302194370052,4.0667024133,0.0907612089462,6.0,rejected,0.0 +2.31905736627,0.425754547802,0.38688552079,0.0907612089462,6.0,rerun,0.0 +2.55011933287,-0.0673619307006,1.58179116967,0.0605074726308,7.0,rejected,0.0 +2.31905736627,0.425754547802,0.38688552079,0.0605074726308,7.0,rerun,0.0 +2.48295280332,0.101810357386,0.597004461346,0.0403383150872,8.0,rejected,0.0 +2.31905736627,0.425754547802,0.38688552079,0.0403383150872,8.0,rerun,0.0 +2.42672617041,0.208992243605,0.229620496761,0.0268922100581,9.0,accepted,0.0 +2.37424778164,0.506941509667,0.658258178671,0.0336150588013,10.0,rejected,0.0 +2.42672617041,0.208992243605,0.229620496761,0.0336150588013,10.0,rerun,0.0 +2.39111579628,0.40751402999,0.229040422148,0.0224100392009,11.0,accepted,0.0 +2.51239400991,0.186488263346,0.343032641073,0.0280125180624,12.0,rejected,0.0 +2.39111579628,0.40751402999,0.229040422148,0.0280125180624,12.0,rerun,0.0 +2.47173584842,0.26003640712,0.149919509527,0.0186750120416,13.0,accepted,0.0 +2.44517919267,0.468445044973,0.342562386685,0.023343758596,14.0,rejected,0.0 +2.47173584842,0.26003640712,0.149919509527,0.023343758596,14.0,rerun,0.0 +2.45447061811,0.399030760158,0.141932765994,0.0155625057307,15.0,accepted,0.0 +2.54283623635,0.247889033228,0.203422890351,0.0194531104833,16.0,rejected,0.0 +2.45447061811,0.399030760158,0.141932765994,0.0194531104833,16.0,rerun,0.0 +2.51296714285,0.298028765805,0.103174862465,0.0129687403222,17.0,accepted,0.0 +2.50103290978,0.443437900407,0.186632073945,0.0162108949589,18.0,rejected,0.0 +2.51296714285,0.298028765805,0.103174862465,0.0162108949589,18.0,rerun,0.0 +2.50564506283,0.395018143045,0.0935329630575,0.0108072633059,19.0,accepted,0.0 +2.57294244855,0.293760878785,0.124498200414,0.0135090146811,20.0,rejected,0.0 +2.50564506283,0.395018143045,0.0935329630575,0.0135090146811,20.0,rerun,0.0 +2.55058607629,0.327563932618,0.0739104046002,0.0090060097874,21.0,accepted,0.0 +2.54812390362,0.428851606652,0.10826814378,0.0112575106373,22.0,rejected,0.0 +2.55058607629,0.327563932618,0.0739104046002,0.0112575106373,22.0,rerun,0.0 +2.54891633135,0.395088354857,0.0659642311869,0.0075050070915,23.0,accepted,0.0 +2.59992446687,0.327806713384,0.0799170054825,0.00938125868057,24.0,rejected,0.0 +2.54891633135,0.395088354857,0.0659642311869,0.00938125868057,24.0,rerun,0.0 +2.58232033151,0.34978425689,0.0558003659649,0.00625417245372,25.0,accepted,0.0 +2.58568076614,0.420062003578,0.0678849266674,0.00781756032209,26.0,rejected,0.0 +2.58232033151,0.34978425689,0.0558003659649,0.00781756032209,26.0,rerun,0.0 +2.58438371378,0.396644212413,0.0494900108541,0.00521170688139,27.0,accepted,1.0 +2.58438371378,0.396644212413,0.0494900108541,0.00521170688139,27.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/SPSA/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/SPSA/opt_export_0.csv index 4182732add..94f64a9210 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/SPSA/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/SPSA/opt_export_0.csv @@ -1,16 +1,16 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient -2.0,-2.0,495.703125,0.0707106781187,0.0,first,0.0 -1.81653479369,-2.60937715585,1481.86960869,0.0707106781187,1.0,rejected,0.0 --2.0,-2.0,495.703125,0.0707106781187,2.0,rerun,0.0 --1.89269561401,-2.56850374893,1476.52998333,0.0642824346533,3.0,rejected,0.0 --2.0,-2.0,495.703125,0.0642824346533,4.0,rerun,0.0 --2.4957790108,-1.82443342611,496.928589318,0.0584385769576,5.0,rejected,0.0 --2.0,-2.0,495.703125,0.0584385769576,6.0,rerun,0.0 --2.46254603624,-1.87890868722,548.5235933,0.0531259790523,7.0,rejected,0.0 --2.0,-2.0,495.703125,0.0531259790523,8.0,rerun,0.0 --1.72901014663,-1.66014710777,188.254299925,0.048296344593,9.0,accepted,0.0 --1.48508837985,-1.32044575694,82.4651966278,0.0464671443814,10.0,accepted,0.0 --1.01454713822,-1.14631100832,43.9601605567,0.0557476645971,11.0,accepted,0.0 --0.912401809122,-0.571734468239,30.5607231618,0.0648428174222,12.0,accepted,0.0 --0.319540242721,-0.812724022553,19.5955776113,0.0711077084432,13.0,accepted,1.0 --0.319540242721,-0.812724022553,19.5955776113,0.0711077084432,13.0,final,1.0 +-2.0,-2.0,495.703125,0.0707106781187,1.0,rerun,0.0 +-1.89269561401,-2.56850374893,1476.52998333,0.0642824346533,2.0,rejected,0.0 +-2.0,-2.0,495.703125,0.0642824346533,2.0,rerun,0.0 +-2.4957790108,-1.82443342611,496.928589318,0.0584385769576,3.0,rejected,0.0 +-2.0,-2.0,495.703125,0.0584385769576,3.0,rerun,0.0 +-2.46254603624,-1.87890868722,548.5235933,0.0531259790523,4.0,rejected,0.0 +-2.0,-2.0,495.703125,0.0531259790523,4.0,rerun,0.0 +-1.72901014663,-1.66014710777,188.254299925,0.048296344593,5.0,accepted,0.0 +-1.48508837985,-1.32044575694,82.4651966278,0.0464671443814,6.0,accepted,0.0 +-1.01454713822,-1.14631100832,43.9601605567,0.0557476645971,7.0,accepted,0.0 +-0.912401809122,-0.571734468239,30.5607231618,0.0648428174222,8.0,accepted,0.0 +-0.319540242721,-0.812724022553,19.5955776113,0.0711077084432,9.0,accepted,1.0 +-0.319540242721,-0.812724022553,19.5955776113,0.0711077084432,9.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/gold/WriteFinal/opt_export_0.csv b/tests/framework/Optimizers/GradientDescent/gold/WriteFinal/opt_export_0.csv index 9f5c8a131a..c3ee7df179 100644 --- a/tests/framework/Optimizers/GradientDescent/gold/WriteFinal/opt_export_0.csv +++ b/tests/framework/Optimizers/GradientDescent/gold/WriteFinal/opt_export_0.csv @@ -1,2 +1,2 @@ x,y,ans,stepSize,iteration,accepted,conv_gradient -2.62537005291,0.366572336624,0.043701618434,0.00519825301237,44.0,final,1.0 +2.62537005291,0.366572336624,0.043701618434,0.00519825301237,30.0,final,1.0 diff --git a/tests/framework/Optimizers/GradientDescent/tests b/tests/framework/Optimizers/GradientDescent/tests index 144290ff8b..0397c1ad45 100644 --- a/tests/framework/Optimizers/GradientDescent/tests +++ b/tests/framework/Optimizers/GradientDescent/tests @@ -63,6 +63,17 @@ [../] [../] + [./ConvergeIterationLimit] + type = 'RavenFramework' + input = 'converge_iterationLimit.xml' + [./data] + type = OrderedCSV + output = 'ConvergeIterationLimit/opt_export_0.csv' + rel_err = 1e-3 + zero_threshold = 1e-5 + [../] + [../] + [./ConstrainBoundary] #REQUIREMENT_TEST R-RM-2 type = 'RavenFramework' diff --git a/tests/framework/user_guide/optimizing/gold/Constrain/opt_export.csv b/tests/framework/user_guide/optimizing/gold/Constrain/opt_export.csv index 63e40ed200..0a537d6f68 100644 --- a/tests/framework/user_guide/optimizing/gold/Constrain/opt_export.csv +++ b/tests/framework/user_guide/optimizing/gold/Constrain/opt_export.csv @@ -10,212 +10,212 @@ trajID,iteration,x,y,ans 0,8,0.153252846558,0.53199814035,12.8442313662 0,9,0.153253406898,0.531997443781,12.8442252793 0,10,-2.18681872047,0.517365813092,41.6950630412 +0,10,0.153253406898,0.531997443781,12.8442252793 +0,11,0.625775905836,2.51125990141,178.854038733 0,11,0.153253406898,0.531997443781,12.8442252793 -0,12,0.625775905836,2.51125990141,178.854038733 +0,12,1.79351850136,1.19572773298,27.7435800444 +0,12,0.153253406898,0.531997443781,12.8442252793 +0,13,-1.37965803252,0.399053866162,32.395277516 0,13,0.153253406898,0.531997443781,12.8442252793 -0,14,1.79351850136,1.19572773298,27.7435800444 -0,15,0.153253406898,0.531997443781,12.8442252793 -0,16,-1.37965803252,0.399053866162,32.395277516 -0,17,0.153253406898,0.531997443781,12.8442252793 -0,18,0.153253643029,0.531997229302,12.8442228553 -0,19,0.153253738875,0.531997120429,12.8442218324 -0,20,1.290063945,1.53927042307,57.4341254328 -0,21,0.153253738875,0.531997120429,12.8442218324 -0,22,0.153253792339,0.531997062646,12.8442212672 -0,23,0.153253796853,0.53199706063,12.8442212245 -0,24,1.09950491298,1.85840270696,104.111347324 -0,25,0.153253796853,0.53199706063,12.8442212245 -0,26,0.153253797488,0.531997058068,12.8442212145 +0,14,0.153253643029,0.531997229302,12.8442228553 +0,15,0.153253738875,0.531997120429,12.8442218324 +0,16,1.290063945,1.53927042307,57.4341254328 +0,16,0.153253738875,0.531997120429,12.8442218324 +0,17,0.153253792339,0.531997062646,12.8442212672 +0,18,0.153253796853,0.53199706063,12.8442212245 +0,19,1.09950491298,1.85840270696,104.111347324 +0,19,0.153253796853,0.53199706063,12.8442212245 +0,20,0.153253797488,0.531997058068,12.8442212145 +0,21,0.153253797734,0.531997057518,12.8442212114 +0,22,1.61955280414,1.20070757328,26.6325462105 +0,22,0.153253797734,0.531997057518,12.8442212114 +0,23,1.45238350971,1.05747137834,16.7247488575 +0,23,0.153253797734,0.531997057518,12.8442212114 +0,24,1.1919662873,1.16920787591,21.2622100711 +0,24,0.153253797734,0.531997057518,12.8442212114 +0,25,0.880370323921,1.30280547248,24.9487234161 +0,25,0.153253797734,0.531997057518,12.8442212114 +0,26,0.496564999189,1.38708117074,22.1289020625 +0,26,0.153253797734,0.531997057518,12.8442212114 +0,27,-0.0973751895272,-0.229038318546,15.527269341 0,27,0.153253797734,0.531997057518,12.8442212114 -0,28,1.61955280414,1.20070757328,26.6325462105 +0,28,0.424190939432,1.17389232642,16.6213181262 +0,28,0.153253797734,0.531997057518,12.8442212114 +0,29,0.31881781535,1.11479056253,15.3287300866 0,29,0.153253797734,0.531997057518,12.8442212114 -0,30,1.45238350971,1.05747137834,16.7247488575 -0,31,0.153253797734,0.531997057518,12.8442212114 -0,32,1.1919662873,1.16920787591,21.2622100711 -0,33,0.153253797734,0.531997057518,12.8442212114 -0,34,0.880370323921,1.30280547248,24.9487234161 -0,35,0.153253797734,0.531997057518,12.8442212114 -0,36,0.496564999189,1.38708117074,22.1289020625 -0,37,0.153253797734,0.531997057518,12.8442212114 -0,38,-0.0973751895272,-0.229038318546,15.527269341 -0,39,0.153253797734,0.531997057518,12.8442212114 -0,40,0.424190939432,1.17389232642,16.6213181262 -0,41,0.153253797734,0.531997057518,12.8442212114 -0,42,0.31881781535,1.11479056253,15.3287300866 -0,43,0.153253797734,0.531997057518,12.8442212114 -0,44,0.538664608615,0.891174429677,12.7424517244 -0,45,0.543480474398,0.889899202353,12.7143540338 -0,46,0.543503322289,0.889814565938,12.7132722362 -0,47,0.543514085968,0.889766766173,12.7126670187 -0,48,-0.166263931307,0.180731269427,16.2749912893 -0,49,0.543514085968,0.889766766173,12.7126670187 -0,50,0.543505173978,0.889741678748,12.7123881952 -0,51,0.543511189221,0.889736192673,12.7123059997 -0,52,-0.553973246333,0.503368742078,19.9074948631 -0,53,0.543511189221,0.889736192673,12.7123059997 -0,54,0.543518858945,0.889735321762,12.7122750546 -0,55,-0.091532631301,0.263065823452,15.280560239 -0,56,0.543518858945,0.889735321762,12.7122750546 -0,57,0.599416037069,1.66353742,37.4501731174 -0,58,0.543518858945,0.889735321762,12.7122750546 -0,59,0.543521391664,0.889734865493,12.7122628015 -0,60,0.0237878563401,0.475346886614,13.9722989454 -0,61,0.543521391664,0.889734865493,12.7122628015 -0,62,0.543521614607,0.889734703441,12.7122602528 -0,63,0.543521729635,0.889734637114,12.7122591463 -0,64,-0.134200942899,0.734433296886,15.0253112533 -0,65,0.543521729635,0.889734637114,12.7122591463 -0,66,0.543521740909,0.889734602886,12.7122587035 -0,67,0.543521773721,0.889734589147,12.7122584503 -0,68,0.0172490606105,0.442258774427,14.0296340169 -0,69,0.543521773721,0.889734589147,12.7122584503 -0,70,0.543521767421,0.889734582789,12.7122583904 -0,71,0.543521766658,0.8897345801,12.71225836 -0,72,0.00661718266567,0.152370177664,14.1227116451 -0,73,0.543521766658,0.8897345801,12.71225836 -0,74,1.33131803266,0.981756333214,13.5460851555 -0,75,0.543521766658,0.8897345801,12.71225836 -0,76,-0.116987790245,0.691214378053,15.0089486973 -0,77,0.543521766658,0.8897345801,12.71225836 -0,78,1.01544328161,1.25983575781,24.4621491634 -0,79,0.543521766658,0.8897345801,12.71225836 -0,80,0.969081905655,1.19118432772,20.7437978856 -0,81,0.543521766658,0.8897345801,12.71225836 -0,82,0.140320500468,0.682178106819,13.2457208244 -0,83,0.543521766658,0.8897345801,12.71225836 -0,84,0.893963039987,1.07054547015,16.1070975508 -0,85,0.543521766658,0.8897345801,12.71225836 -0,86,0.543521766229,0.889734579628,12.7122583555 -0,87,0.267539702226,0.770067761237,12.8021800281 -0,88,0.543521766229,0.889734579628,12.7122583555 -0,89,0.282403161266,0.874317808061,13.3200386452 -0,90,0.543521766229,0.889734579628,12.7122583555 -0,91,0.352759664177,0.765857116514,12.3447767238 -0,92,0.354732218642,0.764983375098,12.3292347149 -0,93,0.355168172362,0.764739138637,12.3254709255 -0,94,0.386811102064,1.08266797901,15.1614514826 -0,95,0.355168172362,0.764739138637,12.3254709255 -0,96,0.105374880262,0.643123046677,13.4174003082 -0,97,0.355168172362,0.764739138637,12.3254709255 -0,98,0.185290400888,0.592965662928,12.7079044127 -0,99,0.355168172362,0.764739138637,12.3254709255 -0,100,0.203902536849,0.618962877714,12.6334267496 -0,101,0.355168172362,0.764739138637,12.3254709255 -0,102,0.355520333015,0.76468186859,12.3233138357 -0,103,0.355526235683,0.764641280709,12.3230271418 -0,104,0.178468000738,0.734153875079,13.1449882781 -0,105,0.355526235683,0.764641280709,12.3230271418 -0,106,0.241860734737,0.657460166251,12.4834427473 -0,107,0.355526235683,0.764641280709,12.3230271418 -0,108,0.355533726276,0.764637724901,12.3229664712 -0,109,0.426246597006,0.872685576701,12.866204623 -0,110,0.355533726276,0.764637724901,12.3229664712 -0,111,0.253645153893,0.717445049794,12.6402280082 -0,112,0.355533726276,0.764637724901,12.3229664712 -0,113,0.355535746301,0.764635534346,12.3229423234 -0,114,0.355536428335,0.764635323984,12.322937516 -0,115,0.39277821891,0.871804204244,12.9611916798 -0,116,0.355536428335,0.764635323984,12.322937516 -0,117,0.35553661073,0.764635277712,12.3229362936 -0,118,0.355536645917,0.764635245132,12.3229359082 -0,119,0.355536660119,0.764635219655,12.3229356747 -0,120,0.355536660737,0.764635210661,12.3229356147 -0,121,0.449263192171,0.924240045546,13.324203202 -0,122,0.355536660737,0.764635210661,12.3229356147 -0,123,0.355536660744,0.764635210061,12.3229356109 -0,124,0.433087454977,0.884529765705,12.9579866406 -0,125,0.355536660744,0.764635210061,12.3229356109 -0,126,0.392600706806,0.883138970753,13.0597424533 -0,127,0.355536660744,0.764635210061,12.3229356109 -0,128,0.424518056294,0.847695109443,12.6464367005 -0,129,0.355536660744,0.764635210061,12.3229356109 -0,130,0.265410433157,0.738330894308,12.6634780843 -0,131,0.355536660744,0.764635210061,12.3229356109 -0,132,0.274001209029,0.760498199144,12.7217835295 -0,133,0.355536660744,0.764635210061,12.3229356109 -0,134,0.284601423562,0.761806939034,12.672806544 -0,135,0.355536660744,0.764635210061,12.3229356109 -0,136,0.355536661121,0.764635210325,12.3229356106 -0,137,0.367295260481,0.818242459918,12.6314775762 -0,138,0.355536661121,0.764635210325,12.3229356106 -0,139,0.392720938427,0.794549014154,12.3477042764 -0,140,0.355536661121,0.764635210325,12.3229356106 -0,141,0.38367521412,0.795136746004,12.3931940499 -0,142,0.355536661121,0.764635210325,12.3229356106 -0,143,0.38115708842,0.790047121536,12.3683907492 -0,144,0.355536661121,0.764635210325,12.3229356106 -0,145,0.32421110568,0.762808100652,12.4725926336 -0,146,0.355536661121,0.764635210325,12.3229356106 -0,147,0.328265962852,0.763724269896,12.4570319369 -0,148,0.355536661121,0.764635210325,12.3229356106 -0,149,0.364403368097,0.786643076938,12.4232624685 -0,150,0.355536661121,0.764635210325,12.3229356106 -0,151,0.369867639978,0.779477892927,12.3487564432 -0,152,0.355536661121,0.764635210325,12.3229356106 -0,153,0.355536661538,0.76463521066,12.3229356106 -0,154,0.362771160346,0.785820184742,12.4254341919 -0,155,0.355536661538,0.76463521066,12.3229356106 -0,156,0.336077451072,0.764111954353,12.419214141 -0,157,0.355536661538,0.76463521066,12.3229356106 -0,158,0.368465071453,0.775561567208,12.3292863479 -0,159,0.355536661538,0.76463521066,12.3229356106 -0,160,0.344127485304,0.755335327618,12.3246553232 -0,161,0.355536661538,0.76463521066,12.3229356106 -0,162,0.343805583778,0.759516057498,12.3516075691 -0,163,0.355536661538,0.76463521066,12.3229356106 -0,164,0.344634777436,0.762393930104,12.3648477307 -0,165,0.355536661538,0.76463521066,12.3229356106 -0,166,0.362666516925,0.771179828065,12.3290281429 -0,167,0.355536661538,0.76463521066,12.3229356106 -0,168,0.348934493071,0.75941630554,12.3243619809 -0,169,0.355536661538,0.76463521066,12.3229356106 -0,170,0.348705610219,0.762010126635,12.3415315089 -0,171,0.355536661538,0.76463521066,12.3229356106 -0,172,0.349237617452,0.763731435373,12.3494582504 -0,173,0.355536661538,0.76463521066,12.3229356106 -0,174,0.350817926754,0.76174498523,12.3290107842 -0,175,0.355536661538,0.76463521066,12.3229356106 -0,176,0.350836470103,0.763605058021,12.3404854905 -0,177,0.355536661538,0.76463521066,12.3229356106 -0,178,0.351928825741,0.76251612459,12.3280943955 -0,179,0.355536661538,0.76463521066,12.3229356106 -0,180,0.357973867866,0.767336661419,12.3277455847 -0,181,0.355536661538,0.76463521066,12.3229356106 -0,182,0.353103774524,0.762612650981,12.3226629479 -0,183,0.354844884991,0.764747829185,12.3271737168 -0,184,0.353103774524,0.762612650981,12.3226629479 -0,185,0.353121615454,0.762606993173,12.3225359435 -0,186,0.353131693054,0.762605706007,12.3224761458 -0,187,0.35000479204,0.76175971044,12.3332909704 -0,188,0.353131693054,0.762605706007,12.3224761458 -0,189,0.353134234775,0.762604654117,12.3224565134 -0,190,0.350720404633,0.761875268527,12.3303219092 -0,191,0.353134234775,0.762604654117,12.3224565134 -0,192,0.353134768771,0.762604616338,12.3224535351 -0,193,0.353718981081,0.764438044466,12.3309646329 -0,194,0.353134768771,0.762604616338,12.3224535351 -0,195,0.353870324626,0.764107539546,12.3281133384 -0,196,0.353134768771,0.762604616338,12.3224535351 -0,197,0.351732939168,0.762214821044,12.3272232609 -0,198,0.353134768771,0.762604616338,12.3224535351 -0,199,0.352081862221,0.761903050728,12.3234856882 -0,200,0.353134768771,0.762604616338,12.3224535351 -0,201,0.352037053301,0.762530721474,12.3276294605 -0,202,0.353134768771,0.762604616338,12.3224535351 -0,203,0.353134991776,0.762604546892,12.3224519556 -0,204,0.353135004556,0.762604545954,12.3224518841 -0,205,0.353778616723,0.76342610013,12.3243009379 -0,206,0.353135004556,0.762604545954,12.3224518841 -0,207,0.353604125849,0.763381403557,12.3249139484 -0,208,0.353135004556,0.762604545954,12.3224518841 -0,209,0.353135009195,0.762604542116,12.3224518363 -0,210,0.353135010525,0.762604541479,12.3224518254 -0,211,0.352191997689,0.762425015839,12.3261739131 -0,212,0.353135010525,0.762604541479,12.3224518254 -0,213,0.35359904284,0.763298416405,12.3244193232 -0,214,0.353135010525,0.762604541479,12.3224518254 -0,215,0.353135010414,0.762604540796,12.3224518217 -0,216,0.353135069991,0.762604591193,12.3224518312 -0,217,0.353135010414,0.762604540796,12.3224518217 -0,218,0.353135009724,0.762604539991,12.3224518202 -0,218,0.353135009724,0.762604539991,12.3224518202 +0,30,0.538664608615,0.891174429677,12.7424517244 +0,31,0.543480474398,0.889899202353,12.7143540338 +0,32,0.543503322289,0.889814565938,12.7132722362 +0,33,0.543514085968,0.889766766173,12.7126670187 +0,34,-0.166263931307,0.180731269427,16.2749912893 +0,34,0.543514085968,0.889766766173,12.7126670187 +0,35,0.543505173978,0.889741678748,12.7123881952 +0,36,0.543511189221,0.889736192673,12.7123059997 +0,37,-0.553973246333,0.503368742078,19.9074948631 +0,37,0.543511189221,0.889736192673,12.7123059997 +0,38,0.543518858945,0.889735321762,12.7122750546 +0,39,-0.091532631301,0.263065823452,15.280560239 +0,39,0.543518858945,0.889735321762,12.7122750546 +0,40,0.599416037069,1.66353742,37.4501731174 +0,40,0.543518858945,0.889735321762,12.7122750546 +0,41,0.543521391664,0.889734865493,12.7122628015 +0,42,0.0237878563401,0.475346886614,13.9722989454 +0,42,0.543521391664,0.889734865493,12.7122628015 +0,43,0.543521614607,0.889734703441,12.7122602528 +0,44,0.543521729635,0.889734637114,12.7122591463 +0,45,-0.134200942899,0.734433296886,15.0253112533 +0,45,0.543521729635,0.889734637114,12.7122591463 +0,46,0.543521740909,0.889734602886,12.7122587035 +0,47,0.543521773721,0.889734589147,12.7122584503 +0,48,0.0172490606105,0.442258774427,14.0296340169 +0,48,0.543521773721,0.889734589147,12.7122584503 +0,49,0.543521767421,0.889734582789,12.7122583904 +0,50,0.543521766658,0.8897345801,12.71225836 +0,51,0.00661718266567,0.152370177664,14.1227116451 +0,51,0.543521766658,0.8897345801,12.71225836 +0,52,1.33131803266,0.981756333214,13.5460851555 +0,52,0.543521766658,0.8897345801,12.71225836 +0,53,-0.116987790245,0.691214378053,15.0089486973 +0,53,0.543521766658,0.8897345801,12.71225836 +0,54,1.01544328161,1.25983575781,24.4621491634 +0,54,0.543521766658,0.8897345801,12.71225836 +0,55,0.969081905655,1.19118432772,20.7437978856 +0,55,0.543521766658,0.8897345801,12.71225836 +0,56,0.140320500468,0.682178106819,13.2457208244 +0,56,0.543521766658,0.8897345801,12.71225836 +0,57,0.893963039987,1.07054547015,16.1070975508 +0,57,0.543521766658,0.8897345801,12.71225836 +0,58,0.543521766229,0.889734579628,12.7122583555 +0,59,0.267539702226,0.770067761237,12.8021800281 +0,59,0.543521766229,0.889734579628,12.7122583555 +0,60,0.282403161266,0.874317808061,13.3200386452 +0,60,0.543521766229,0.889734579628,12.7122583555 +0,61,0.352759664177,0.765857116514,12.3447767238 +0,62,0.354732218642,0.764983375098,12.3292347149 +0,63,0.355168172362,0.764739138637,12.3254709255 +0,64,0.386811102064,1.08266797901,15.1614514826 +0,64,0.355168172362,0.764739138637,12.3254709255 +0,65,0.105374880262,0.643123046677,13.4174003082 +0,65,0.355168172362,0.764739138637,12.3254709255 +0,66,0.185290400888,0.592965662928,12.7079044127 +0,66,0.355168172362,0.764739138637,12.3254709255 +0,67,0.203902536849,0.618962877714,12.6334267496 +0,67,0.355168172362,0.764739138637,12.3254709255 +0,68,0.355520333015,0.76468186859,12.3233138357 +0,69,0.355526235683,0.764641280709,12.3230271418 +0,70,0.178468000738,0.734153875079,13.1449882781 +0,70,0.355526235683,0.764641280709,12.3230271418 +0,71,0.241860734737,0.657460166251,12.4834427473 +0,71,0.355526235683,0.764641280709,12.3230271418 +0,72,0.355533726276,0.764637724901,12.3229664712 +0,73,0.426246597006,0.872685576701,12.866204623 +0,73,0.355533726276,0.764637724901,12.3229664712 +0,74,0.253645153893,0.717445049794,12.6402280082 +0,74,0.355533726276,0.764637724901,12.3229664712 +0,75,0.355535746301,0.764635534346,12.3229423234 +0,76,0.355536428335,0.764635323984,12.322937516 +0,77,0.39277821891,0.871804204244,12.9611916798 +0,77,0.355536428335,0.764635323984,12.322937516 +0,78,0.35553661073,0.764635277712,12.3229362936 +0,79,0.355536645917,0.764635245132,12.3229359082 +0,80,0.355536660119,0.764635219655,12.3229356747 +0,81,0.355536660737,0.764635210661,12.3229356147 +0,82,0.449263192171,0.924240045546,13.324203202 +0,82,0.355536660737,0.764635210661,12.3229356147 +0,83,0.355536660744,0.764635210061,12.3229356109 +0,84,0.433087454977,0.884529765705,12.9579866406 +0,84,0.355536660744,0.764635210061,12.3229356109 +0,85,0.392600706806,0.883138970753,13.0597424533 +0,85,0.355536660744,0.764635210061,12.3229356109 +0,86,0.424518056294,0.847695109443,12.6464367005 +0,86,0.355536660744,0.764635210061,12.3229356109 +0,87,0.265410433157,0.738330894308,12.6634780843 +0,87,0.355536660744,0.764635210061,12.3229356109 +0,88,0.274001209029,0.760498199144,12.7217835295 +0,88,0.355536660744,0.764635210061,12.3229356109 +0,89,0.284601423562,0.761806939034,12.672806544 +0,89,0.355536660744,0.764635210061,12.3229356109 +0,90,0.355536661121,0.764635210325,12.3229356106 +0,91,0.367295260481,0.818242459918,12.6314775762 +0,91,0.355536661121,0.764635210325,12.3229356106 +0,92,0.392720938427,0.794549014154,12.3477042764 +0,92,0.355536661121,0.764635210325,12.3229356106 +0,93,0.38367521412,0.795136746004,12.3931940499 +0,93,0.355536661121,0.764635210325,12.3229356106 +0,94,0.38115708842,0.790047121536,12.3683907492 +0,94,0.355536661121,0.764635210325,12.3229356106 +0,95,0.32421110568,0.762808100652,12.4725926336 +0,95,0.355536661121,0.764635210325,12.3229356106 +0,96,0.328265962852,0.763724269896,12.4570319369 +0,96,0.355536661121,0.764635210325,12.3229356106 +0,97,0.364403368097,0.786643076938,12.4232624685 +0,97,0.355536661121,0.764635210325,12.3229356106 +0,98,0.369867639978,0.779477892927,12.3487564432 +0,98,0.355536661121,0.764635210325,12.3229356106 +0,99,0.355536661538,0.76463521066,12.3229356106 +0,100,0.362771160346,0.785820184742,12.4254341919 +0,100,0.355536661538,0.76463521066,12.3229356106 +0,101,0.336077451072,0.764111954353,12.419214141 +0,101,0.355536661538,0.76463521066,12.3229356106 +0,102,0.368465071453,0.775561567208,12.3292863479 +0,102,0.355536661538,0.76463521066,12.3229356106 +0,103,0.344127485304,0.755335327618,12.3246553232 +0,103,0.355536661538,0.76463521066,12.3229356106 +0,104,0.343805583778,0.759516057498,12.3516075691 +0,104,0.355536661538,0.76463521066,12.3229356106 +0,105,0.344634777436,0.762393930104,12.3648477307 +0,105,0.355536661538,0.76463521066,12.3229356106 +0,106,0.362666516925,0.771179828065,12.3290281429 +0,106,0.355536661538,0.76463521066,12.3229356106 +0,107,0.348934493071,0.75941630554,12.3243619809 +0,107,0.355536661538,0.76463521066,12.3229356106 +0,108,0.348705610219,0.762010126635,12.3415315089 +0,108,0.355536661538,0.76463521066,12.3229356106 +0,109,0.349237617452,0.763731435373,12.3494582504 +0,109,0.355536661538,0.76463521066,12.3229356106 +0,110,0.350817926754,0.76174498523,12.3290107842 +0,110,0.355536661538,0.76463521066,12.3229356106 +0,111,0.350836470103,0.763605058021,12.3404854905 +0,111,0.355536661538,0.76463521066,12.3229356106 +0,112,0.351928825741,0.76251612459,12.3280943955 +0,112,0.355536661538,0.76463521066,12.3229356106 +0,113,0.357973867866,0.767336661419,12.3277455847 +0,113,0.355536661538,0.76463521066,12.3229356106 +0,114,0.353103774524,0.762612650981,12.3226629479 +0,115,0.354844884991,0.764747829185,12.3271737168 +0,115,0.353103774524,0.762612650981,12.3226629479 +0,116,0.353121615454,0.762606993173,12.3225359435 +0,117,0.353131693054,0.762605706007,12.3224761458 +0,118,0.35000479204,0.76175971044,12.3332909704 +0,118,0.353131693054,0.762605706007,12.3224761458 +0,119,0.353134234775,0.762604654117,12.3224565134 +0,120,0.350720404633,0.761875268527,12.3303219092 +0,120,0.353134234775,0.762604654117,12.3224565134 +0,121,0.353134768771,0.762604616338,12.3224535351 +0,122,0.353718981081,0.764438044466,12.3309646329 +0,122,0.353134768771,0.762604616338,12.3224535351 +0,123,0.353870324626,0.764107539546,12.3281133384 +0,123,0.353134768771,0.762604616338,12.3224535351 +0,124,0.351732939168,0.762214821044,12.3272232609 +0,124,0.353134768771,0.762604616338,12.3224535351 +0,125,0.352081862221,0.761903050728,12.3234856882 +0,125,0.353134768771,0.762604616338,12.3224535351 +0,126,0.352037053301,0.762530721474,12.3276294605 +0,126,0.353134768771,0.762604616338,12.3224535351 +0,127,0.353134991776,0.762604546892,12.3224519556 +0,128,0.353135004556,0.762604545954,12.3224518841 +0,129,0.353778616723,0.76342610013,12.3243009379 +0,129,0.353135004556,0.762604545954,12.3224518841 +0,130,0.353604125849,0.763381403557,12.3249139484 +0,130,0.353135004556,0.762604545954,12.3224518841 +0,131,0.353135009195,0.762604542116,12.3224518363 +0,132,0.353135010525,0.762604541479,12.3224518254 +0,133,0.352191997689,0.762425015839,12.3261739131 +0,133,0.353135010525,0.762604541479,12.3224518254 +0,134,0.35359904284,0.763298416405,12.3244193232 +0,134,0.353135010525,0.762604541479,12.3224518254 +0,135,0.353135010414,0.762604540796,12.3224518217 +0,136,0.353135069991,0.762604591193,12.3224518312 +0,136,0.353135010414,0.762604540796,12.3224518217 +0,137,0.353135009724,0.762604539991,12.3224518202 +0,137,0.353135009724,0.762604539991,12.3224518202 diff --git a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_0.csv b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_0.csv index 0785bfedcf..18ef4312af 100644 --- a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_0.csv +++ b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_0.csv @@ -1,59 +1,59 @@ iteration,accepted,x,y,ans 0.0,first,-2.0,-2.0,495.703125 1.0,rejected,-2.63632753543,-1.99065828441,797.996049032 -2.0,rerun,-2.0,-2.0,495.703125 -3.0,accepted,-1.6863744392,-1.51384184526,136.20884616 -4.0,accepted,-1.95443714168,-1.03352226284,79.8380320855 -5.0,rejected,-2.51519753528,-0.822283236973,89.1527025345 -6.0,rerun,-1.95443714168,-1.03352226284,79.8380320855 -7.0,accepted,-2.38230919349,-0.696356133049,76.5720132747 -8.0,rejected,-3.01558385439,-0.558292473062,95.1523018133 -9.0,rerun,-2.38230919349,-0.696356133049,76.5720132747 -10.0,rejected,-2.10524482915,-1.21637928044,112.133641789 -11.0,rerun,-2.38230919349,-0.696356133049,76.5720132747 -12.0,rejected,-2.91153334789,-0.613563416444,93.4946952982 -13.0,rerun,-2.38230919349,-0.696356133049,76.5720132747 -14.0,accepted,-2.13183027659,-0.278749990491,58.7047899575 -15.0,accepted,-1.70433102278,-0.0838327442235,45.4977638848 -16.0,rejected,-1.65531174391,-0.627608361477,50.1668620576 -17.0,rerun,-1.70433102278,-0.0838327442235,45.4977638848 -18.0,accepted,-1.44245536667,0.337807492452,34.5686051056 -19.0,accepted,-1.32069782685,0.781364473183,21.8350043504 -20.0,rejected,-1.86414067031,0.850573787316,21.9801248912 -21.0,rerun,-1.32069782685,0.781364473183,21.8350043504 -22.0,accepted,-1.05069791029,1.19985359721,8.32371698795 -23.0,accepted,-1.4065310508,1.51895395315,1.56817323445 -24.0,rejected,-0.98810111855,1.26039456099,7.00004773272 +1.0,rerun,-2.0,-2.0,495.703125 +2.0,accepted,-1.6863744392,-1.51384184526,136.20884616 +3.0,accepted,-1.95443714168,-1.03352226284,79.8380320855 +4.0,rejected,-2.51519753528,-0.822283236973,89.1527025345 +4.0,rerun,-1.95443714168,-1.03352226284,79.8380320855 +5.0,accepted,-2.38230919349,-0.696356133049,76.5720132747 +6.0,rejected,-3.01558385439,-0.558292473062,95.1523018133 +6.0,rerun,-2.38230919349,-0.696356133049,76.5720132747 +7.0,rejected,-2.10524482915,-1.21637928044,112.133641789 +7.0,rerun,-2.38230919349,-0.696356133049,76.5720132747 +8.0,rejected,-2.91153334789,-0.613563416444,93.4946952982 +8.0,rerun,-2.38230919349,-0.696356133049,76.5720132747 +9.0,accepted,-2.13183027659,-0.278749990491,58.7047899575 +10.0,accepted,-1.70433102278,-0.0838327442235,45.4977638848 +11.0,rejected,-1.65531174391,-0.627608361477,50.1668620576 +11.0,rerun,-1.70433102278,-0.0838327442235,45.4977638848 +12.0,accepted,-1.44245536667,0.337807492452,34.5686051056 +13.0,accepted,-1.32069782685,0.781364473183,21.8350043504 +14.0,rejected,-1.86414067031,0.850573787316,21.9801248912 +14.0,rerun,-1.32069782685,0.781364473183,21.8350043504 +15.0,accepted,-1.05069791029,1.19985359721,8.32371698795 +16.0,accepted,-1.4065310508,1.51895395315,1.56817323445 +17.0,rejected,-0.98810111855,1.26039456099,7.00004773272 +17.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +18.0,rejected,-0.966222691551,1.44100444897,3.10709947508 +18.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +19.0,rejected,-1.04094930869,1.34120153891,4.65571693122 +19.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +20.0,rejected,-1.77601730272,1.51211328702,3.37550202094 +20.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +21.0,rejected,-1.09936204421,1.38289368835,3.38665289328 +21.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +22.0,rejected,-1.62644397342,1.30702159006,2.59117222378 +22.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +23.0,rejected,-1.15570895186,1.3998879168,2.7510865534 +23.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +24.0,rejected,-1.25825953037,1.31468693181,4.04587817548 +24.0,rerun,-1.4065310508,1.51895395315,1.56817323445 +25.0,rejected,-1.63507202159,1.49842419995,2.05491652918 25.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -26.0,rejected,-0.966222691551,1.44100444897,3.10709947508 -27.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -28.0,rejected,-1.04094930869,1.34120153891,4.65571693122 -29.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -30.0,rejected,-1.77601730272,1.51211328702,3.37550202094 -31.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -32.0,rejected,-1.09936204421,1.38289368835,3.38665289328 -33.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -34.0,rejected,-1.62644397342,1.30702159006,2.59117222378 -35.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -36.0,rejected,-1.15570895186,1.3998879168,2.7510865534 -37.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -38.0,rejected,-1.25825953037,1.31468693181,4.04587817548 -39.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -40.0,rejected,-1.63507202159,1.49842419995,2.05491652918 -41.0,rerun,-1.4065310508,1.51895395315,1.56817323445 -42.0,accepted,-1.60122362465,1.44405922736,1.23947223217 -43.0,rejected,-1.38500588745,1.32141453511,3.25585272633 -44.0,rerun,-1.60122362465,1.44405922736,1.23947223217 -45.0,rejected,-1.64376753734,1.2221185958,4.96650386007 -46.0,rerun,-1.60122362465,1.44405922736,1.23947223217 -47.0,rejected,-1.41851252355,1.35013742402,2.48412054343 -48.0,rerun,-1.60122362465,1.44405922736,1.23947223217 -49.0,accepted,-1.78497911272,1.41068561556,1.18251303899 -50.0,rejected,-1.92849815617,1.31380046157,1.55532283086 -51.0,rerun,-1.78497911272,1.41068561556,1.18251303899 -52.0,accepted,-1.93853386662,1.37602333299,1.10022594857 -53.0,rejected,-1.76187672053,1.31603802658,1.94956295532 -54.0,rerun,-1.93853386662,1.37602333299,1.10022594857 -55.0,rejected,-1.85327136186,1.22940961767,3.92115438967 -56.0,rerun,-1.93853386662,1.37602333299,1.10022594857 -57.0,accepted,-2.08887810545,1.34182442338,1.06239499218 +26.0,accepted,-1.60122362465,1.44405922736,1.23947223217 +27.0,rejected,-1.38500588745,1.32141453511,3.25585272633 +27.0,rerun,-1.60122362465,1.44405922736,1.23947223217 +28.0,rejected,-1.64376753734,1.2221185958,4.96650386007 +28.0,rerun,-1.60122362465,1.44405922736,1.23947223217 +29.0,rejected,-1.41851252355,1.35013742402,2.48412054343 +29.0,rerun,-1.60122362465,1.44405922736,1.23947223217 +30.0,accepted,-1.78497911272,1.41068561556,1.18251303899 +31.0,rejected,-1.92849815617,1.31380046157,1.55532283086 +31.0,rerun,-1.78497911272,1.41068561556,1.18251303899 +32.0,accepted,-1.93853386662,1.37602333299,1.10022594857 +33.0,rejected,-1.76187672053,1.31603802658,1.94956295532 +33.0,rerun,-1.93853386662,1.37602333299,1.10022594857 +34.0,rejected,-1.85327136186,1.22940961767,3.92115438967 +34.0,rerun,-1.93853386662,1.37602333299,1.10022594857 +35.0,accepted,-2.08887810545,1.34182442338,1.06239499218 diff --git a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_1.csv b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_1.csv index 1a53c26d56..88a99466f0 100644 --- a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_1.csv +++ b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_1.csv @@ -2,125 +2,125 @@ iteration,accepted,x,y,ans 0.0,first,-2.0,2.0,143.703125 1.0,accepted,-1.73688106037,1.4205447182,1.2052333027 2.0,rejected,-2.10888177408,0.90419651301,19.9186835044 +2.0,rerun,-1.73688106037,1.4205447182,1.2052333027 +3.0,rejected,-1.54900132171,0.873359239953,19.6011453232 3.0,rerun,-1.73688106037,1.4205447182,1.2052333027 -4.0,rejected,-1.54900132171,0.873359239953,19.6011453232 +4.0,rejected,-1.33326667599,1.08332686852,11.1255099274 +4.0,rerun,-1.73688106037,1.4205447182,1.2052333027 +5.0,rejected,-1.2976760846,1.23157135783,6.17912361024 5.0,rerun,-1.73688106037,1.4205447182,1.2052333027 -6.0,rejected,-1.33326667599,1.08332686852,11.1255099274 +6.0,rejected,-1.56794845178,1.02004844763,13.3322537183 +6.0,rerun,-1.73688106037,1.4205447182,1.2052333027 +7.0,rejected,-1.42162811255,1.18229986284,7.25734379044 7.0,rerun,-1.73688106037,1.4205447182,1.2052333027 -8.0,rejected,-1.2976760846,1.23157135783,6.17912361024 -9.0,rerun,-1.73688106037,1.4205447182,1.2052333027 -10.0,rejected,-1.56794845178,1.02004844763,13.3322537183 -11.0,rerun,-1.73688106037,1.4205447182,1.2052333027 -12.0,rejected,-1.42162811255,1.18229986284,7.25734379044 -13.0,rerun,-1.73688106037,1.4205447182,1.2052333027 -14.0,accepted,-2.08871509919,1.34803064852,1.05490487606 -15.0,rejected,-2.33852139508,1.57473309656,18.8652230575 -16.0,rerun,-2.08871509919,1.34803064852,1.05490487606 -17.0,rejected,-1.86426020937,1.55699778255,6.86680915968 -18.0,rerun,-2.08871509919,1.34803064852,1.05490487606 -19.0,accepted,-2.36676288106,1.32767285352,1.02216396052 -20.0,rejected,-2.46201816642,1.0870138238,8.60837868224 -21.0,rerun,-2.36676288106,1.32767285352,1.02216396052 -22.0,rejected,-2.14911596863,1.23826515145,2.67583407205 -23.0,rerun,-2.36676288106,1.32767285352,1.02216396052 -24.0,accepted,-2.57806442755,1.29440186519,0.958363306189 -25.0,rejected,-2.62197644954,1.10218191592,7.37807181228 +8.0,accepted,-2.08871509919,1.34803064852,1.05490487606 +9.0,rejected,-2.33852139508,1.57473309656,18.8652230575 +9.0,rerun,-2.08871509919,1.34803064852,1.05490487606 +10.0,rejected,-1.86426020937,1.55699778255,6.86680915968 +10.0,rerun,-2.08871509919,1.34803064852,1.05490487606 +11.0,accepted,-2.36676288106,1.32767285352,1.02216396052 +12.0,rejected,-2.46201816642,1.0870138238,8.60837868224 +12.0,rerun,-2.36676288106,1.32767285352,1.02216396052 +13.0,rejected,-2.14911596863,1.23826515145,2.67583407205 +13.0,rerun,-2.36676288106,1.32767285352,1.02216396052 +14.0,accepted,-2.57806442755,1.29440186519,0.958363306189 +15.0,rejected,-2.62197644954,1.10218191592,7.37807181228 +15.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +16.0,rejected,-2.59287062057,1.47303652702,10.1106200891 +16.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +17.0,rejected,-2.72860177111,1.35678670571,2.41524243537 +17.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +18.0,rejected,-2.72083709576,1.33390997754,1.60303254712 +18.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +19.0,rejected,-2.69478864285,1.36157149983,2.4762902409 +19.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +20.0,rejected,-2.60023222803,1.17399726323,3.73718407134 +20.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +21.0,rejected,-2.65351506521,1.37622203231,2.94965778686 +21.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +22.0,rejected,-2.52682838947,1.38165057986,2.57740036518 +22.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +23.0,rejected,-2.67003227913,1.29602455694,0.960646368099 +23.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +24.0,rejected,-2.49451066346,1.29773325167,0.979302462639 +24.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +25.0,rejected,-2.50338694002,1.30861656438,0.97863364791 +25.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +26.0,rejected,-2.51235419553,1.31580328169,1.01296895307 26.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -27.0,rejected,-2.59287062057,1.47303652702,10.1106200891 +27.0,rejected,-2.58104309637,1.35715626996,1.89227247874 +27.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +28.0,rejected,-2.58134904472,1.35142102571,1.72194810085 28.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -29.0,rejected,-2.72860177111,1.35678670571,2.41524243537 +29.0,rejected,-2.58863686796,1.34523560664,1.57550401431 +29.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +30.0,rejected,-2.54210284368,1.32497532087,1.11908245079 30.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -31.0,rejected,-2.72083709576,1.33390997754,1.60303254712 +31.0,rejected,-2.55779247152,1.33222179023,1.24291953716 +31.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +32.0,rejected,-2.60945447846,1.31756216222,1.09805506501 32.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -33.0,rejected,-2.69478864285,1.36157149983,2.4762902409 +33.0,rejected,-2.58952497118,1.26084165235,1.20304019982 +33.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +34.0,rejected,-2.60117064035,1.31688448458,1.08243646656 34.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -35.0,rejected,-2.60023222803,1.17399726323,3.73718407134 +35.0,rejected,-2.59697027776,1.31679714078,1.07771887795 +35.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +36.0,rejected,-2.60016496699,1.30928361924,1.01142793949 36.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -37.0,rejected,-2.65351506521,1.37622203231,2.94965778686 -38.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -39.0,rejected,-2.52682838947,1.38165057986,2.57740036518 -40.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -41.0,rejected,-2.67003227913,1.29602455694,0.960646368099 -42.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -43.0,rejected,-2.49451066346,1.29773325167,0.979302462639 -44.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -45.0,rejected,-2.50338694002,1.30861656438,0.97863364791 -46.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -47.0,rejected,-2.51235419553,1.31580328169,1.01296895307 -48.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -49.0,rejected,-2.58104309637,1.35715626996,1.89227247874 -50.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -51.0,rejected,-2.58134904472,1.35142102571,1.72194810085 -52.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -53.0,rejected,-2.58863686796,1.34523560664,1.57550401431 -54.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -55.0,rejected,-2.54210284368,1.32497532087,1.11908245079 -56.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -57.0,rejected,-2.55779247152,1.33222179023,1.24291953716 -58.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -59.0,rejected,-2.60945447846,1.31756216222,1.09805506501 -60.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -61.0,rejected,-2.58952497118,1.26084165235,1.20304019982 -62.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -63.0,rejected,-2.60117064035,1.31688448458,1.08243646656 -64.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -65.0,rejected,-2.59697027776,1.31679714078,1.07771887795 -66.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -67.0,rejected,-2.60016496699,1.30928361924,1.01142793949 -68.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -69.0,rejected,-2.58266805818,1.31818213367,1.08013683305 -70.0,rerun,-2.57806442755,1.29440186519,0.958363306189 -71.0,accepted,-2.59989464519,1.29728511947,0.957448425107 -72.0,rejected,-2.61936526932,1.2844330013,0.964004962277 -73.0,rerun,-2.59989464519,1.29728511947,0.957448425107 -74.0,rejected,-2.57868620866,1.29713620722,0.958474659822 -75.0,rerun,-2.59989464519,1.29728511947,0.957448425107 -76.0,rejected,-2.60746336664,1.27955191659,0.993679914289 -77.0,rerun,-2.59989464519,1.29728511947,0.957448425107 -78.0,rejected,-2.59279678735,1.28125846992,0.993504267602 -79.0,rerun,-2.59989464519,1.29728511947,0.957448425107 -80.0,accepted,-2.61553411363,1.29423247069,0.952779621743 -81.0,rejected,-2.62380214666,1.28100305023,0.975701317752 -82.0,rerun,-2.61553411363,1.29423247069,0.952779621743 -83.0,rejected,-2.60146606022,1.29243562259,0.954429732392 -84.0,rerun,-2.61553411363,1.29423247069,0.952779621743 -85.0,accepted,-2.6278760099,1.29050312738,0.949981301361 -86.0,accepted,-2.63966520051,1.29133720123,0.948339596308 -87.0,rejected,-2.62738282891,1.28458938507,0.959979948278 -88.0,rerun,-2.63966520051,1.29133720123,0.948339596308 -89.0,rejected,-2.63715495693,1.27884703735,0.978625188739 -90.0,rerun,-2.63966520051,1.29133720123,0.948339596308 -91.0,accepted,-2.6512069843,1.29037594288,0.946533864699 -92.0,rejected,-2.63978217851,1.28953781371,0.948050677166 -93.0,rerun,-2.6512069843,1.29037594288,0.946533864699 -94.0,rejected,-2.65659034186,1.28146118605,0.957296287188 -95.0,rerun,-2.6512069843,1.29037594288,0.946533864699 -96.0,rejected,-2.64391224241,1.28434123718,0.954082568182 -97.0,rerun,-2.6512069843,1.29037594288,0.946533864699 -98.0,accepted,-2.65966182789,1.28876635588,0.944857982088 -99.0,rejected,-2.65275857782,1.2845306236,0.950512752978 -100.0,rerun,-2.65966182789,1.28876635588,0.944857982088 -101.0,rejected,-2.6544353703,1.28358022529,0.952062627838 -102.0,rerun,-2.65966182789,1.28876635588,0.944857982088 -103.0,rejected,-2.65550772511,1.28351787243,0.951821756046 -104.0,rerun,-2.65966182789,1.28876635588,0.944857982088 -105.0,rejected,-2.66332989819,1.29362152381,0.951589262189 -106.0,rerun,-2.65966182789,1.28876635588,0.944857982088 -107.0,rejected,-2.66311716721,1.2930862845,0.950228670223 -108.0,rerun,-2.65966182789,1.28876635588,0.944857982088 -109.0,rejected,-2.6606127971,1.28382815106,0.949334354767 -110.0,rerun,-2.65966182789,1.28876635588,0.944857982088 -111.0,accepted,-2.66422060644,1.28842206305,0.944150513565 -112.0,rejected,-2.66567317406,1.28385143434,0.947638159256 -113.0,rerun,-2.66422060644,1.28842206305,0.944150513565 -114.0,rejected,-2.66484065624,1.28410647524,0.947432003776 -115.0,rerun,-2.66422060644,1.28842206305,0.944150513565 -116.0,rejected,-2.66026462093,1.28817732309,0.944732099829 -117.0,rerun,-2.66422060644,1.28842206305,0.944150513565 -118.0,accepted,-2.66781116536,1.28812019322,0.943588722344 -119.0,rejected,-2.66797125272,1.29139525104,0.946831087136 -120.0,rerun,-2.66781116536,1.28812019322,0.943588722344 -121.0,accepted,-2.67077950074,1.28784700623,0.943120217621 -122.0,rejected,-2.67234509093,1.29036934096,0.945097631053 -123.0,rerun,-2.67077950074,1.28784700623,0.943120217621 -124.0,accepted,-2.67318666157,1.28662665774,0.942779971045 +37.0,rejected,-2.58266805818,1.31818213367,1.08013683305 +37.0,rerun,-2.57806442755,1.29440186519,0.958363306189 +38.0,accepted,-2.59989464519,1.29728511947,0.957448425107 +39.0,rejected,-2.61936526932,1.2844330013,0.964004962277 +39.0,rerun,-2.59989464519,1.29728511947,0.957448425107 +40.0,rejected,-2.57868620866,1.29713620722,0.958474659822 +40.0,rerun,-2.59989464519,1.29728511947,0.957448425107 +41.0,rejected,-2.60746336664,1.27955191659,0.993679914289 +41.0,rerun,-2.59989464519,1.29728511947,0.957448425107 +42.0,rejected,-2.59279678735,1.28125846992,0.993504267602 +42.0,rerun,-2.59989464519,1.29728511947,0.957448425107 +43.0,accepted,-2.61553411363,1.29423247069,0.952779621743 +44.0,rejected,-2.62380214666,1.28100305023,0.975701317752 +44.0,rerun,-2.61553411363,1.29423247069,0.952779621743 +45.0,rejected,-2.60146606022,1.29243562259,0.954429732392 +45.0,rerun,-2.61553411363,1.29423247069,0.952779621743 +46.0,accepted,-2.6278760099,1.29050312738,0.949981301361 +47.0,accepted,-2.63966520051,1.29133720123,0.948339596308 +48.0,rejected,-2.62738282891,1.28458938507,0.959979948278 +48.0,rerun,-2.63966520051,1.29133720123,0.948339596308 +49.0,rejected,-2.63715495693,1.27884703735,0.978625188739 +49.0,rerun,-2.63966520051,1.29133720123,0.948339596308 +50.0,accepted,-2.6512069843,1.29037594288,0.946533864699 +51.0,rejected,-2.63978217851,1.28953781371,0.948050677166 +51.0,rerun,-2.6512069843,1.29037594288,0.946533864699 +52.0,rejected,-2.65659034186,1.28146118605,0.957296287188 +52.0,rerun,-2.6512069843,1.29037594288,0.946533864699 +53.0,rejected,-2.64391224241,1.28434123718,0.954082568182 +53.0,rerun,-2.6512069843,1.29037594288,0.946533864699 +54.0,accepted,-2.65966182789,1.28876635588,0.944857982088 +55.0,rejected,-2.65275857782,1.2845306236,0.950512752978 +55.0,rerun,-2.65966182789,1.28876635588,0.944857982088 +56.0,rejected,-2.6544353703,1.28358022529,0.952062627838 +56.0,rerun,-2.65966182789,1.28876635588,0.944857982088 +57.0,rejected,-2.65550772511,1.28351787243,0.951821756046 +57.0,rerun,-2.65966182789,1.28876635588,0.944857982088 +58.0,rejected,-2.66332989819,1.29362152381,0.951589262189 +58.0,rerun,-2.65966182789,1.28876635588,0.944857982088 +59.0,rejected,-2.66311716721,1.2930862845,0.950228670223 +59.0,rerun,-2.65966182789,1.28876635588,0.944857982088 +60.0,rejected,-2.6606127971,1.28382815106,0.949334354767 +60.0,rerun,-2.65966182789,1.28876635588,0.944857982088 +61.0,accepted,-2.66422060644,1.28842206305,0.944150513565 +62.0,rejected,-2.66567317406,1.28385143434,0.947638159256 +62.0,rerun,-2.66422060644,1.28842206305,0.944150513565 +63.0,rejected,-2.66484065624,1.28410647524,0.947432003776 +63.0,rerun,-2.66422060644,1.28842206305,0.944150513565 +64.0,rejected,-2.66026462093,1.28817732309,0.944732099829 +64.0,rerun,-2.66422060644,1.28842206305,0.944150513565 +65.0,accepted,-2.66781116536,1.28812019322,0.943588722344 +66.0,rejected,-2.66797125272,1.29139525104,0.946831087136 +66.0,rerun,-2.66781116536,1.28812019322,0.943588722344 +67.0,accepted,-2.67077950074,1.28784700623,0.943120217621 +68.0,rejected,-2.67234509093,1.29036934096,0.945097631053 +68.0,rerun,-2.67077950074,1.28784700623,0.943120217621 +69.0,accepted,-2.67318666157,1.28662665774,0.942779971045 diff --git a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_2.csv b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_2.csv index b8ed0600c8..7c5f084641 100644 --- a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_2.csv +++ b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_2.csv @@ -3,92 +3,92 @@ iteration,accepted,x,y,ans 1.0,accepted,2.48492581893,-1.58787507945,156.885113419 2.0,accepted,2.68720742332,-0.984482874892,26.2839030004 3.0,rejected,3.42867707442,-0.924217187574,41.3704013664 -4.0,rerun,2.68720742332,-0.984482874892,26.2839030004 -5.0,accepted,2.51602515642,-0.330220233533,3.41132696282 -6.0,accepted,1.85302714599,-0.276529011604,1.57613768308 -7.0,rejected,2.53929750179,-0.108812733905,1.80481351 +3.0,rerun,2.68720742332,-0.984482874892,26.2839030004 +4.0,accepted,2.51602515642,-0.330220233533,3.41132696282 +5.0,accepted,1.85302714599,-0.276529011604,1.57613768308 +6.0,rejected,2.53929750179,-0.108812733905,1.80481351 +6.0,rerun,1.85302714599,-0.276529011604,1.57613768308 +7.0,rejected,1.22845746782,-0.126900991385,3.04105899957 +7.0,rerun,1.85302714599,-0.276529011604,1.57613768308 +8.0,rejected,1.3254488298,-0.0264285642268,2.56474348436 8.0,rerun,1.85302714599,-0.276529011604,1.57613768308 -9.0,rejected,1.22845746782,-0.126900991385,3.04105899957 -10.0,rerun,1.85302714599,-0.276529011604,1.57613768308 -11.0,rejected,1.3254488298,-0.0264285642268,2.56474348436 -12.0,rerun,1.85302714599,-0.276529011604,1.57613768308 -13.0,accepted,2.31662285033,-0.0180612902392,0.836387050947 -14.0,rejected,2.07981526709,0.424804785265,0.886304758076 -15.0,rerun,2.31662285033,-0.0180612902392,0.836387050947 -16.0,rejected,2.76717920732,0.0556644973085,1.51785153988 -17.0,rerun,2.31662285033,-0.0180612902392,0.836387050947 -18.0,accepted,2.51387793616,0.347112668328,0.0682497055553 -19.0,rejected,2.93174789794,0.548719837852,0.103258967054 -20.0,rerun,2.51387793616,0.347112668328,0.0682497055553 -21.0,accepted,2.92739959312,0.430186673093,0.0514588787583 -22.0,rejected,2.82771517691,-0.0630926733689,2.63066495596 -23.0,rerun,2.92739959312,0.430186673093,0.0514588787583 -24.0,rejected,3.34889895678,0.608077955382,0.0554272745597 -25.0,rerun,2.92739959312,0.430186673093,0.0514588787583 -26.0,rejected,2.56631576409,0.636583083521,1.36499203137 -27.0,rerun,2.92739959312,0.430186673093,0.0514588787583 -28.0,rejected,3.13612633503,0.745452686902,1.84714342444 -29.0,rerun,2.92739959312,0.430186673093,0.0514588787583 -30.0,rejected,3.15570368199,0.687141144227,0.847469375446 -31.0,rerun,2.92739959312,0.430186673093,0.0514588787583 -32.0,rejected,2.8964519581,0.11924372925,1.54213675663 -33.0,rerun,2.92739959312,0.430186673093,0.0514588787583 -34.0,rejected,2.64701106085,0.47578479464,0.122728589974 -35.0,rerun,2.92739959312,0.430186673093,0.0514588787583 -36.0,accepted,3.16382440293,0.534085551046,0.00403043793288 -37.0,rejected,2.93601466622,0.604349712202,0.377350162223 +9.0,accepted,2.31662285033,-0.0180612902392,0.836387050947 +10.0,rejected,2.07981526709,0.424804785265,0.886304758076 +10.0,rerun,2.31662285033,-0.0180612902392,0.836387050947 +11.0,rejected,2.76717920732,0.0556644973085,1.51785153988 +11.0,rerun,2.31662285033,-0.0180612902392,0.836387050947 +12.0,accepted,2.51387793616,0.347112668328,0.0682497055553 +13.0,rejected,2.93174789794,0.548719837852,0.103258967054 +13.0,rerun,2.51387793616,0.347112668328,0.0682497055553 +14.0,accepted,2.92739959312,0.430186673093,0.0514588787583 +15.0,rejected,2.82771517691,-0.0630926733689,2.63066495596 +15.0,rerun,2.92739959312,0.430186673093,0.0514588787583 +16.0,rejected,3.34889895678,0.608077955382,0.0554272745597 +16.0,rerun,2.92739959312,0.430186673093,0.0514588787583 +17.0,rejected,2.56631576409,0.636583083521,1.36499203137 +17.0,rerun,2.92739959312,0.430186673093,0.0514588787583 +18.0,rejected,3.13612633503,0.745452686902,1.84714342444 +18.0,rerun,2.92739959312,0.430186673093,0.0514588787583 +19.0,rejected,3.15570368199,0.687141144227,0.847469375446 +19.0,rerun,2.92739959312,0.430186673093,0.0514588787583 +20.0,rejected,2.8964519581,0.11924372925,1.54213675663 +20.0,rerun,2.92739959312,0.430186673093,0.0514588787583 +21.0,rejected,2.64701106085,0.47578479464,0.122728589974 +21.0,rerun,2.92739959312,0.430186673093,0.0514588787583 +22.0,accepted,3.16382440293,0.534085551046,0.00403043793288 +23.0,rejected,2.93601466622,0.604349712202,0.377350162223 +23.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +24.0,rejected,3.25388416081,0.731214339959,1.34643720762 +24.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +25.0,rejected,3.35966407406,0.555659477254,0.0303331433027 +25.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +26.0,rejected,3.00464095948,0.616196013782,0.373990754569 +26.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +27.0,rejected,3.1336447639,0.69409437291,0.975801309329 +27.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +28.0,rejected,3.09052371295,0.662689994217,0.664589688383 +28.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +29.0,rejected,3.29706885501,0.552929238285,0.0153578401144 +29.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +30.0,rejected,3.28539860967,0.547722532494,0.0172093694515 +30.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +31.0,rejected,3.26317261526,0.584072934434,0.0305303519745 +31.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +32.0,rejected,3.09518037202,0.60831593947,0.224195233609 +32.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +33.0,rejected,3.12947649462,0.448831331347,0.161660236163 +33.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +34.0,rejected,3.08713859621,0.567269213626,0.0616358885686 +34.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +35.0,rejected,3.08786297085,0.534090245481,0.00566462895663 +35.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +36.0,rejected,3.15134345122,0.466166953334,0.123001926332 +36.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +37.0,rejected,3.21248479155,0.573749757615,0.02647825897 +37.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +38.0,rejected,3.21972620919,0.545578209581,0.00665353152499 38.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -39.0,rejected,3.25388416081,0.731214339959,1.34643720762 +39.0,rejected,3.11727950316,0.557006825447,0.0263082969491 +39.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +40.0,rejected,3.15481333206,0.487788261235,0.0639905584061 40.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -41.0,rejected,3.35966407406,0.555659477254,0.0303331433027 +41.0,rejected,3.13435730041,0.565234131046,0.0357567848225 +41.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +42.0,rejected,3.14104846423,0.565719624535,0.0342850918373 42.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -43.0,rejected,3.00464095948,0.616196013782,0.373990754569 +43.0,rejected,3.1943801214,0.552032653131,0.00663347466768 +43.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +44.0,rejected,3.19516426967,0.541543634204,0.00523495698787 44.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -45.0,rejected,3.1336447639,0.69409437291,0.975801309329 +45.0,rejected,3.18233237397,0.5567824546,0.0110200289363 +45.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +46.0,rejected,3.18952441836,0.541038792936,0.00486665990631 46.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -47.0,rejected,3.09052371295,0.662689994217,0.664589688383 +47.0,rejected,3.1761183648,0.554934419911,0.0102391520935 +47.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +48.0,rejected,3.17349690415,0.553848872166,0.00966385699302 48.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -49.0,rejected,3.29706885501,0.552929238285,0.0153578401144 -50.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -51.0,rejected,3.28539860967,0.547722532494,0.0172093694515 -52.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -53.0,rejected,3.26317261526,0.584072934434,0.0305303519745 -54.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -55.0,rejected,3.09518037202,0.60831593947,0.224195233609 -56.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -57.0,rejected,3.12947649462,0.448831331347,0.161660236163 -58.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -59.0,rejected,3.08713859621,0.567269213626,0.0616358885686 -60.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -61.0,rejected,3.08786297085,0.534090245481,0.00566462895663 -62.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -63.0,rejected,3.15134345122,0.466166953334,0.123001926332 -64.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -65.0,rejected,3.21248479155,0.573749757615,0.02647825897 -66.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -67.0,rejected,3.21972620919,0.545578209581,0.00665353152499 -68.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -69.0,rejected,3.11727950316,0.557006825447,0.0263082969491 -70.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -71.0,rejected,3.15481333206,0.487788261235,0.0639905584061 -72.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -73.0,rejected,3.13435730041,0.565234131046,0.0357567848225 -74.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -75.0,rejected,3.14104846423,0.565719624535,0.0342850918373 -76.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -77.0,rejected,3.1943801214,0.552032653131,0.00663347466768 -78.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -79.0,rejected,3.19516426967,0.541543634204,0.00523495698787 -80.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -81.0,rejected,3.18233237397,0.5567824546,0.0110200289363 -82.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -83.0,rejected,3.18952441836,0.541038792936,0.00486665990631 -84.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -85.0,rejected,3.1761183648,0.554934419911,0.0102391520935 -86.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -87.0,rejected,3.17349690415,0.553848872166,0.00966385699302 -88.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -89.0,rejected,3.18047063554,0.545177156791,0.0046860156918 -90.0,rerun,3.16382440293,0.534085551046,0.00403043793288 -91.0,accepted,3.14646222424,0.53949231349,0.00372835575434 -91.0,final,3.14646222424,0.53949231349,0.00372835575434 +49.0,rejected,3.18047063554,0.545177156791,0.0046860156918 +49.0,rerun,3.16382440293,0.534085551046,0.00403043793288 +50.0,accepted,3.14646222424,0.53949231349,0.00372835575434 +50.0,final,3.14646222424,0.53949231349,0.00372835575434 diff --git a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_3.csv b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_3.csv index e26673702d..498c5566e5 100644 --- a/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_3.csv +++ b/tests/framework/user_guide/optimizing/gold/MultipleTraj/opt_export_3.csv @@ -1,48 +1,48 @@ iteration,accepted,x,y,ans 0.0,first,2.0,2.0,356.703125 1.0,rejected,1.91484650929,2.63067335683,1471.24473235 +1.0,rerun,2.0,2.0,356.703125 +2.0,rejected,2.57656329739,1.95219301405,475.069991886 2.0,rerun,2.0,2.0,356.703125 -3.0,rejected,2.57656329739,1.95219301405,475.069991886 -4.0,rerun,2.0,2.0,356.703125 -5.0,accepted,1.98808600447,1.47418776533,76.0534642887 -6.0,accepted,1.59467032448,1.11646278445,20.3871473951 -7.0,accepted,1.74689852801,0.533049891403,2.77292584429 -8.0,accepted,2.39088823266,0.407092082666,0.228343061947 -9.0,rejected,2.89767183392,-0.0904013697453,3.2192428536 +3.0,accepted,1.98808600447,1.47418776533,76.0534642887 +4.0,accepted,1.59467032448,1.11646278445,20.3871473951 +5.0,accepted,1.74689852801,0.533049891403,2.77292584429 +6.0,accepted,2.39088823266,0.407092082666,0.228343061947 +7.0,rejected,2.89767183392,-0.0904013697453,3.2192428536 +7.0,rerun,2.39088823266,0.407092082666,0.228343061947 +8.0,rejected,2.95291285552,0.0893981386496,1.98116358227 +8.0,rerun,2.39088823266,0.407092082666,0.228343061947 +9.0,rejected,2.5562434619,0.970227397381,12.214089885 +9.0,rerun,2.39088823266,0.407092082666,0.228343061947 +10.0,rejected,2.81519429427,0.0836030745007,1.4991847212 10.0,rerun,2.39088823266,0.407092082666,0.228343061947 -11.0,rejected,2.95291285552,0.0893981386496,1.98116358227 +11.0,rejected,2.51830356936,-0.0609236195637,1.45126724945 +11.0,rerun,2.39088823266,0.407092082666,0.228343061947 +12.0,rejected,2.44600079462,0.84458882951,6.38412441782 12.0,rerun,2.39088823266,0.407092082666,0.228343061947 -13.0,rejected,2.5562434619,0.970227397381,12.214089885 +13.0,rejected,2.19481218372,0.0574507558745,0.512758363697 +13.0,rerun,2.39088823266,0.407092082666,0.228343061947 +14.0,rejected,2.14449644993,0.138583664358,0.378539460713 14.0,rerun,2.39088823266,0.407092082666,0.228343061947 -15.0,rejected,2.81519429427,0.0836030745007,1.4991847212 +15.0,rejected,2.68999942277,0.26465171849,0.292093520214 +15.0,rerun,2.39088823266,0.407092082666,0.228343061947 +16.0,rejected,2.39861129459,0.106013319569,0.482510318746 16.0,rerun,2.39088823266,0.407092082666,0.228343061947 -17.0,rejected,2.51830356936,-0.0609236195637,1.45126724945 +17.0,rejected,2.476559529,0.667141643012,2.00447864732 +17.0,rerun,2.39088823266,0.407092082666,0.228343061947 +18.0,rejected,2.56471884947,0.228941171593,0.268849582001 18.0,rerun,2.39088823266,0.407092082666,0.228343061947 -19.0,rejected,2.44600079462,0.84458882951,6.38412441782 +19.0,rejected,2.43278270056,0.62945933021,1.60677666517 +19.0,rerun,2.39088823266,0.407092082666,0.228343061947 +20.0,rejected,2.48396226019,0.590540190386,1.05887744879 20.0,rerun,2.39088823266,0.407092082666,0.228343061947 -21.0,rejected,2.19481218372,0.0574507558745,0.512758363697 -22.0,rerun,2.39088823266,0.407092082666,0.228343061947 -23.0,rejected,2.14449644993,0.138583664358,0.378539460713 -24.0,rerun,2.39088823266,0.407092082666,0.228343061947 -25.0,rejected,2.68999942277,0.26465171849,0.292093520214 -26.0,rerun,2.39088823266,0.407092082666,0.228343061947 -27.0,rejected,2.39861129459,0.106013319569,0.482510318746 -28.0,rerun,2.39088823266,0.407092082666,0.228343061947 -29.0,rejected,2.476559529,0.667141643012,2.00447864732 -30.0,rerun,2.39088823266,0.407092082666,0.228343061947 -31.0,rejected,2.56471884947,0.228941171593,0.268849582001 -32.0,rerun,2.39088823266,0.407092082666,0.228343061947 -33.0,rejected,2.43278270056,0.62945933021,1.60677666517 -34.0,rerun,2.39088823266,0.407092082666,0.228343061947 -35.0,rejected,2.48396226019,0.590540190386,1.05887744879 -36.0,rerun,2.39088823266,0.407092082666,0.228343061947 -37.0,rejected,2.45227362655,0.583737829999,1.06702715326 -38.0,rerun,2.39088823266,0.407092082666,0.228343061947 -39.0,accepted,2.51245316284,0.288246159737,0.115802637103 -40.0,rejected,2.35258104308,0.321276918474,0.151835336061 -41.0,rerun,2.51245316284,0.288246159737,0.115802637103 -42.0,rejected,2.66067037308,0.295766523014,0.172432431776 -43.0,rerun,2.51245316284,0.288246159737,0.115802637103 -44.0,rejected,2.39704348457,0.358124629968,0.141494289615 -45.0,rerun,2.51245316284,0.288246159737,0.115802637103 -46.0,accepted,2.5479853554,0.405637660633,0.0759610615735 +21.0,rejected,2.45227362655,0.583737829999,1.06702715326 +21.0,rerun,2.39088823266,0.407092082666,0.228343061947 +22.0,accepted,2.51245316284,0.288246159737,0.115802637103 +23.0,rejected,2.35258104308,0.321276918474,0.151835336061 +23.0,rerun,2.51245316284,0.288246159737,0.115802637103 +24.0,rejected,2.66067037308,0.295766523014,0.172432431776 +24.0,rerun,2.51245316284,0.288246159737,0.115802637103 +25.0,rejected,2.39704348457,0.358124629968,0.141494289615 +25.0,rerun,2.51245316284,0.288246159737,0.115802637103 +26.0,accepted,2.5479853554,0.405637660633,0.0759610615735 diff --git a/tests/framework/user_guide/optimizing/gold/Simple/opt_export.csv b/tests/framework/user_guide/optimizing/gold/Simple/opt_export.csv index 461b0da6f3..73de5c27f8 100644 --- a/tests/framework/user_guide/optimizing/gold/Simple/opt_export.csv +++ b/tests/framework/user_guide/optimizing/gold/Simple/opt_export.csv @@ -1,2 +1,2 @@ trajID,iteration,x,y,ans -0,40,2.70361192337,0.418175646148,0.0198839863127 +0,27,2.70361192337,0.418175646148,0.0198839863127 diff --git a/tests/framework/user_guide/optimizing/gold/StepSize/opt_export.csv b/tests/framework/user_guide/optimizing/gold/StepSize/opt_export.csv index 7997abf070..4d8a7efa7c 100644 --- a/tests/framework/user_guide/optimizing/gold/StepSize/opt_export.csv +++ b/tests/framework/user_guide/optimizing/gold/StepSize/opt_export.csv @@ -1,2 +1,2 @@ trajID,iteration,x,y,ans -0,40,2.75443876496,0.429744723736,0.0129723128508 +0,26,2.75443876496,0.429744723736,0.0129723128508