portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Hadrons: application run minor fixes

Browse Source
This commit is contained in:
Antonin Portelli 2016-12-05 11:44:36 +09:00
parent 7433eed274
commit a69086ba1f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extras/Hadrons/Application.cc
View File

@ -76,6 +76,7 @@ Application::Application(const std::string parameterFileName)
void Application::setPar(const Application::GlobalPar &par) void Application::setPar(const Application::GlobalPar &par)
{ {
par_ = par; par_ = par;
env_.setSeed(strToVec<int>(par_.seed));
} }
// execute ///////////////////////////////////////////////////////////////////// // execute /////////////////////////////////////////////////////////////////////
@ -101,10 +102,12 @@ public:
void Application::parseParameterFile(void) void Application::parseParameterFile(void)
{ {
XmlReader reader(parameterFileName_); XmlReader reader(parameterFileName_);
GlobalPar par;
ObjectId id; ObjectId id;
LOG(Message) << "Reading '" << parameterFileName_ << "'..." << std::endl; LOG(Message) << "Reading '" << parameterFileName_ << "'..." << std::endl;
read(reader, "parameters", par_); read(reader, "parameters", par);
setPar(par);
push(reader, "modules"); push(reader, "modules");
push(reader, "module"); push(reader, "module");
do do
@ -150,7 +153,7 @@ void Application::schedule(void)
std::random_device rd; std::random_device rd;
GeneticScheduler<unsigned int>::Parameters par; GeneticScheduler<unsigned int>::Parameters par;
par.popSize = 20; par.popSize = 10;
par.mutationRate = .1; par.mutationRate = .1;
par.seed = rd(); par.seed = rd();
CartesianCommunicator::BroadcastWorld(0, &(par.seed), sizeof(par.seed)); CartesianCommunicator::BroadcastWorld(0, &(par.seed), sizeof(par.seed));
@ -173,6 +176,7 @@ void Application::schedule(void)
nCstPeak = 0; nCstPeak = 0;
} }
} }
LOG(Debug) << "generation " << gen << ":\n" << scheduler;
prevPeak = scheduler.getMinValue(); prevPeak = scheduler.getMinValue();
if (gen % 10 == 0) if (gen % 10 == 0)
{ {