Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit bcb99dac authored by Sylvain Thery's avatar Sylvain Thery
Browse files

bug vector/list dans CGoGN

parent 7ea5c210
...@@ -120,7 +120,6 @@ inline void GenericMap::embedOrbit(unsigned int orbit, Dart d, unsigned int em) ...@@ -120,7 +120,6 @@ inline void GenericMap::embedOrbit(unsigned int orbit, Dart d, unsigned int em)
{ {
assert(isOrbitEmbedded(orbit) || !"Invalid parameter: orbit not embedded"); assert(isOrbitEmbedded(orbit) || !"Invalid parameter: orbit not embedded");
FunctorSetEmb<GenericMap> fsetemb(*this, orbit, em); FunctorSetEmb<GenericMap> fsetemb(*this, orbit, em);
std::cout << "EMBEDORBIT"<< std::endl;
foreach_dart_of_orbit(orbit, d, fsetemb); foreach_dart_of_orbit(orbit, d, fsetemb);
} }
......
...@@ -763,13 +763,12 @@ bool Map3::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread) ...@@ -763,13 +763,12 @@ bool Map3::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread)
DartMarkerStore mv(*this,thread); // Lock a marker DartMarkerStore mv(*this,thread); // Lock a marker
bool found = false; // Last functor return value bool found = false; // Last functor return value
std::vector<Dart> darts_list; //Darts that are traversed std::list<Dart> darts_list; //Darts that are traversed
darts_list.reserve(50);
darts_list.push_back(d); //Start with the dart d darts_list.push_back(d); //Start with the dart d
mv.mark(d); mv.mark(d);
for(std::vector<Dart>::iterator darts = darts_list.begin(); !found && darts != darts_list.end() ; ++darts) for(std::list<Dart>::iterator darts = darts_list.begin(); !found && darts != darts_list.end() ; ++darts)
{ {
Dart dc = *darts; Dart dc = *darts;
...@@ -799,6 +798,7 @@ bool Map3::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread) ...@@ -799,6 +798,7 @@ bool Map3::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread)
return found; return found;
} }
bool Map3::foreach_dart_of_edge(Dart d, FunctorType& f, unsigned int thread) bool Map3::foreach_dart_of_edge(Dart d, FunctorType& f, unsigned int thread)
{ {
Dart dNext = d; Dart dNext = d;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment