Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/act/alexandria/acm_ga.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ bool HybridGAMC::evolve(alexandria::MsgHandler *msghandler,
if (gach_->evaluateTestset())
{
(*bestGenome)[iMolSelect::Test] = pool[pold]->getBest(iMolSelect::Train);
(*bestGenome)[iMolSelect::Test].setFitness(iMolSelect::Test, (*bestGenome)[iMolSelect::Test].fitness(iMolSelect::Train));
}
// Open surveillance files for fitness, after initialization of bestGenome
for(const auto &bg : *bestGenome)
Expand Down Expand Up @@ -431,7 +432,7 @@ bool HybridGAMC::evolve(alexandria::MsgHandler *msghandler,
double fitness;
cr->recv(src, &fitness); // Receiving the new training fitness
pool[pold]->genomePtr(i)->setFitness(iMolSelect::Train, fitness);
if (msghandler->verbose())
if (msghandler->debug())
{
// Double check
fitnessComputer()->compute(msghandler, pool[pold]->genomePtr(i), iMolSelect::Train);
Expand Down
12 changes: 8 additions & 4 deletions src/act/alexandria/actmiddleman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,18 +165,22 @@ void ACTMiddleMan::run(MsgHandler *msghandler)
}
else
{
if (gach_->evaluateTestset())
{
fitComp_.compute(msghandler, ind_->bestGenomePtr(), iMolSelect::Test);
}
// IV. If we are working with Hybrid or MCMC, send
// the best genome found to the MASTER.
if (mutator_->foundMinimum())
{
if (gach_->evaluateTestset())
{
fitComp_.compute(msghandler, ind_->bestGenomePtr(), iMolSelect::Test);
}
ind_->bestGenomePtr()->Send(cr, master);
}
else
{
if (gach_->evaluateTestset())
{
fitComp_.compute(msghandler, ind_->genomePtr(), iMolSelect::Test);
}
ind_->genomePtr()->Send(cr, master);
}
}
Expand Down
Loading