46 |
|
#endif |
47 |
|
|
48 |
|
#include <fstream> |
49 |
+ |
#include <iostream> |
50 |
+ |
#include <locale> |
51 |
|
#include "utils/simError.h" |
52 |
|
#include "utils/CaseConversion.hpp" |
53 |
|
#include "brains/Register.hpp" |
76 |
|
#endif |
77 |
|
|
78 |
|
initSimError(); // the error handler |
79 |
< |
srand48( 1337 ); // the random number generator. |
79 |
> |
//srand48( 1337 ); // the random number generator. |
80 |
|
|
81 |
|
std::string svnrev; |
82 |
|
//convert a macro from compiler to a string in c++ |
144 |
|
Globals* simParams = info->getSimParams(); |
145 |
|
MinimizerParameters* miniPars = simParams->getMinimizerParameters(); |
146 |
|
|
147 |
< |
if (miniPars->haveUseMinimizer() && simParams->haveEnsemble()) { |
147 |
> |
if (miniPars->getUseMinimizer() && simParams->haveEnsemble()) { |
148 |
|
sprintf(painCave.errMsg, "Ensemble keyword can not co-exist with useMinimizer = \"true\" in the minimizer block\n"); |
149 |
|
painCave.isFatal = 1; |
150 |
|
simError(); |
151 |
|
} |
152 |
|
|
153 |
< |
if (miniPars->haveUseMinimizer()) { |
153 |
> |
if (miniPars->getUseMinimizer()) { |
154 |
|
//create minimizer |
155 |
|
OptimizationMethod* myMinimizer =OptimizationFactory::getInstance()->createOptimization(toUpperCopy(miniPars->getMethod()), info); |
156 |
|
|