| 49 |
|
Globals* globals = info->getSimParams(); |
| 50 |
|
|
| 51 |
|
if (globals->haveMinimizer()){ |
| 52 |
< |
setFTol(globals->getMinFTol()); |
| 52 |
> |
setFTol(globals->getMinimizerFTol()); |
| 53 |
|
} |
| 54 |
|
|
| 55 |
< |
if (globals->haveMinGTol()){ |
| 56 |
< |
setGTol(globals->getMinGTol()); |
| 55 |
> |
if (globals->haveMinimizerGTol()){ |
| 56 |
> |
setGTol(globals->getMinimizerGTol()); |
| 57 |
|
} |
| 58 |
|
|
| 59 |
< |
if (globals->haveMinMaxIter()){ |
| 60 |
< |
setMaxIteration(globals->getMinMaxIter()); |
| 59 |
> |
if (globals->haveMinimizerMaxIter()){ |
| 60 |
> |
setMaxIteration(globals->getMinimizerMaxIter()); |
| 61 |
|
} |
| 62 |
|
|
| 63 |
< |
if (globals->haveMinWriteFrq()){ |
| 64 |
< |
setMaxIteration(globals->getMinMaxIter()); |
| 63 |
> |
if (globals->haveMinimizerWriteFrq()){ |
| 64 |
> |
setMaxIteration(globals->getMinimizerMaxIter()); |
| 65 |
|
} |
| 66 |
|
|
| 67 |
< |
if (globals->haveMinWriteFrq()){ |
| 68 |
< |
setWriteFrq(globals->getMinWriteFrq()); |
| 67 |
> |
if (globals->haveMinimizerWriteFrq()){ |
| 68 |
> |
setWriteFrq(globals->getMinimizerWriteFrq()); |
| 69 |
|
} |
| 70 |
|
|
| 71 |
< |
if (globals->haveMinStepSize()){ |
| 72 |
< |
setStepSize(globals->getMinStepSize()); |
| 71 |
> |
if (globals->haveMinimizerStepSize()){ |
| 72 |
> |
setStepSize(globals->getMinimizerStepSize()); |
| 73 |
|
} |
| 74 |
|
|
| 75 |
< |
if (globals->haveMinLSMaxIter()){ |
| 76 |
< |
setLineSearchMaxIteration(globals->getMinLSMaxIter()); |
| 75 |
> |
if (globals->haveMinimizerLSMaxIter()){ |
| 76 |
> |
setLineSearchMaxIteration(globals->getMinimizerLSMaxIter()); |
| 77 |
|
} |
| 78 |
|
|
| 79 |
< |
if (globals->haveMinLSTol()){ |
| 80 |
< |
setLineSearchTol(globals->getMinLSTol()); |
| 79 |
> |
if (globals->haveMinimizerLSTol()){ |
| 80 |
> |
setLineSearchTol(globals->getMinimizerLSTol()); |
| 81 |
|
} |
| 82 |
|
|
| 83 |
|
} |
