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: size fix for module graph with one vertex

Browse Source
This commit is contained in:
Antonin Portelli 2016-05-10 20:13:28 +01:00
parent 84fa2bdce6
commit 78198d1b04
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/Hadrons/Environment.cc
View File

@ -274,6 +274,7 @@ Graph<unsigned int> Environment::makeModuleGraph(void) const
for (unsigned int i = 0; i < module_.size(); ++i) for (unsigned int i = 0; i < module_.size(); ++i)
{ {
moduleGraph.addVertex(i);
for (auto &j: moduleInput_[i]) for (auto &j: moduleInput_[i])
{ {
moduleGraph.addEdge(objectModule_[j], i); moduleGraph.addEdge(objectModule_[j], i);

9
programs/Hadrons/GeneticScheduler.hpp
View File

@ -183,7 +183,7 @@ template <typename T>
void GeneticScheduler<T>::crossover(const std::vector<T> &p1, void GeneticScheduler<T>::crossover(const std::vector<T> &p1,
const std::vector<T> &p2) const std::vector<T> &p2)
{ {
std::uniform_int_distribution<unsigned int> dis(1, p1.size() - 2); std::uniform_int_distribution<unsigned int> dis(0, p1.size() - 1);
unsigned int cut = dis(gen_); unsigned int cut = dis(gen_);
std::vector<T> c1, c2, buf; std::vector<T> c1, c2, buf;
@ -211,7 +211,7 @@ void GeneticScheduler<T>::crossover(const std::vector<T> &p1,
template <typename T> template <typename T>
void GeneticScheduler<T>::mutation(std::vector<T> &c) void GeneticScheduler<T>::mutation(std::vector<T> &c)
{ {
std::uniform_int_distribution<unsigned int> dis(1, c.size() - 2); std::uniform_int_distribution<unsigned int> dis(0, c.size() - 1);
unsigned int cut = dis(gen_); unsigned int cut = dis(gen_);
Graph<T> g = graph_; Graph<T> g = graph_;
std::vector<T> buf; std::vector<T> buf;
@ -220,7 +220,10 @@ void GeneticScheduler<T>::mutation(std::vector<T> &c)
{ {
g.removeVertex(c[i]); g.removeVertex(c[i]);
} }
buf = g.topoSort(gen_); if (g.size() > 0)
{
buf = g.topoSort(gen_);
}
for (unsigned int i = cut; i < c.size(); ++i) for (unsigned int i = cut; i < c.size(); ++i)
{ {
buf.push_back(c[i]); buf.push_back(c[i]);