From c9120b7ad3dc091eff4c5745f424ecae58c2de9e Mon Sep 17 00:00:00 2001 From: Basile Sauvage Date: Wed, 5 Sep 2012 18:28:49 +0200 Subject: [PATCH] complements dans diag de Voronoi centroidaux --- include/Algo/Geometry/voronoiDiagrams.h | 4 ++-- include/Algo/Geometry/voronoiDiagrams.hpp | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/Algo/Geometry/voronoiDiagrams.h b/include/Algo/Geometry/voronoiDiagrams.h index 24fd96556..ab36ca89f 100644 --- a/include/Algo/Geometry/voronoiDiagrams.h +++ b/include/Algo/Geometry/voronoiDiagrams.h @@ -53,9 +53,9 @@ public : void computeDiagram (); protected : - void clear (); + virtual void clear (); void initFrontWithSeeds(); - void collectVertexFromFront(Dart e); + virtual void collectVertexFromFront(Dart e); void addVertexToFront(Dart f, float d); void updateVertexInFront(Dart f, float d); }; diff --git a/include/Algo/Geometry/voronoiDiagrams.hpp b/include/Algo/Geometry/voronoiDiagrams.hpp index 4862d56f1..99bdcdb8c 100644 --- a/include/Algo/Geometry/voronoiDiagrams.hpp +++ b/include/Algo/Geometry/voronoiDiagrams.hpp @@ -70,7 +70,6 @@ void VoronoiDiagram::initFrontWithSeeds () vmReached.mark(d); vertexInfo[d].it = front.insert(std::pair(0.0, d)); vertexInfo[d].valid = true; -// vertexInfo[d].region = i; regions[d] = i; vertexInfo[d].pathOrigin = d; } @@ -83,7 +82,6 @@ void VoronoiDiagram::setCost (const EdgeAttribute& c){ template void VoronoiDiagram::collectVertexFromFront(Dart e){ -// regions[e] = vertexInfo[e].region; regions[e] = regions[vertexInfo[e].pathOrigin]; front.erase(vertexInfo[e].it); vertexInfo[e].valid=false; @@ -94,7 +92,6 @@ void VoronoiDiagram::addVertexToFront(Dart f, float d){ VertexInfo& vi (vertexInfo[f]); vi.it = front.insert(std::pair(d + edgeCost[f], f)); vi.valid=true; -// vi.region = regions[map.phi2(f)]; vi.pathOrigin = map.phi2(f); vmReached.mark(f); } @@ -107,7 +104,6 @@ void VoronoiDiagram::updateVertexInFront(Dart f, float d){ { front.erase(vi.it); vi.it = front.insert(std::pair(dist, f)); -// vi.region = regions[map.phi2(f)]; vi.pathOrigin = map.phi2(f); } } @@ -166,7 +162,7 @@ void CentroidalVoronoiDiagram::clear () template void CentroidalVoronoiDiagram::collectVertexFromFront(Dart e){ - distances[e] = this->vertexInfo[e].it->first(); + distances[e] = this->vertexInfo[e].it->first; pathOrigins[e] = this->vertexInfo[e].pathOrigin; VoronoiDiagram::collectVertexFromFront(e); -- GitLab