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

Hadrons: genetic operators improvement

Browse Source
This commit is contained in:
Antonin Portelli 2016-12-13 19:02:05 +00:00
parent 4a87486365
commit de8f80cf94
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
extras/Hadrons/GeneticScheduler.hpp
View File

@ -79,8 +79,9 @@ private:
void doMutation(void); void doMutation(void);
// genetic operators // genetic operators
GenePair selectPair(void); GenePair selectPair(void);
void crossover(Gene &c, const Gene &p1, const Gene &p2); void crossover(Gene &c1, Gene &c2, const Gene &p1, const Gene &p2);
void mutation(Gene &m, const Gene &c); void mutation(Gene &m, const Gene &c);
private: private:
Graph<T> &graph_; Graph<T> &graph_;
const ObjFunc &func_; const ObjFunc &func_;
@ -169,11 +170,10 @@ template <typename T>
void GeneticScheduler<T>::doCrossover(void) void GeneticScheduler<T>::doCrossover(void)
{ {
auto p = selectPair(); auto p = selectPair();
auto &p1 = *(p.first), &p2 = *(p.second); Gene &p1 = *(p.first), &p2 = *(p.second);
Gene c1, c2; Gene c1, c2;
crossover(c1, p1, p2); crossover(c1, c2, p1, p2);
crossover(c2, p2, p1);
PARALLEL_CRITICAL PARALLEL_CRITICAL
{ {
population_.emplace(func_(c1), c1); population_.emplace(func_(c1), c1);
@ -196,7 +196,6 @@ void GeneticScheduler<T>::doMutation(void)
mutation(m, it->second); mutation(m, it->second);
PARALLEL_CRITICAL PARALLEL_CRITICAL
{ {
population_.erase(it);
population_.emplace(func_(m), m); population_.emplace(func_(m), m);
} }
} }
@ -236,22 +235,37 @@ typename GeneticScheduler<T>::GenePair GeneticScheduler<T>::selectPair(void)
} }
template <typename T> template <typename T>
void GeneticScheduler<T>::crossover(Gene &c, const Gene &p1, const Gene &p2) void GeneticScheduler<T>::crossover(Gene &c1, Gene &c2, const Gene &p1,
const Gene &p2)
{ {
Gene buf; Gene buf;
std::uniform_int_distribution<unsigned int> dis(0, p1.size() - 1); std::uniform_int_distribution<unsigned int> dis(0, p1.size() - 1);
unsigned int cut = dis(gen_); unsigned int cut = dis(gen_);
c.clear(); c1.clear();
buf = p1; buf = p2;
for (unsigned int i = 0; i < cut; ++i) for (unsigned int i = 0; i < cut; ++i)
{ {
c.push_back(p2[i]); c1.push_back(p1[i]);
buf.erase(std::find(buf.begin(), buf.end(), p2[i])); buf.erase(std::find(buf.begin(), buf.end(), p1[i]));
} }
for (unsigned int i = 0; i < buf.size(); ++i) for (unsigned int i = 0; i < buf.size(); ++i)
{ {
c.push_back(buf[i]); c1.push_back(buf[i]);
}
c2.clear();
buf = p2;
for (unsigned int i = cut; i < p1.size(); ++i)
{
buf.erase(std::find(buf.begin(), buf.end(), p1[i]));
}
for (unsigned int i = 0; i < buf.size(); ++i)
{
c2.push_back(buf[i]);
}
for (unsigned int i = cut; i < p1.size(); ++i)
{
c2.push_back(p1[i]);
} }
} }