portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-06-11 11:56:56 +01:00
Code Releases Activity

Merge branch 'develop' into feature/qed-fvol

Browse Source
This commit is contained in:
Antonin Portelli
2017-01-19 14:22:36 -08:00
parent 92f8950a56 d6401e6d2c
commit 7a327a3f28
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extras/Hadrons/GeneticScheduler.hpp
View File

@ -166,7 +166,7 @@ void GeneticScheduler<T>::initPopulation(void)
{
auto p = graph_.topoSort(gen_);
population_.emplace(func_(p), p);
population_.insert(std::make_pair(func_(p), p));
}
}
@ -180,8 +180,8 @@ void GeneticScheduler<T>::doCrossover(void)
crossover(c1, c2, p1, p2);
PARALLEL_CRITICAL
{
population_.emplace(func_(c1), c1);
population_.emplace(func_(c2), c2);
population_.insert(std::make_pair(func_(c1), c1));
population_.insert(std::make_pair(func_(c2), c2));
}
}
@ -200,7 +200,7 @@ void GeneticScheduler<T>::doMutation(void)
mutation(m, it->second);
PARALLEL_CRITICAL
{
population_.emplace(func_(m), m);
population_.insert(std::make_pair(func_(m), m));
}
}
}