Commit 868ecce2 authored by Sauvage's avatar Sauvage

correction des template dans les diag de voronoi

parent 6a61546b
...@@ -57,7 +57,7 @@ public : ...@@ -57,7 +57,7 @@ public :
virtual void setSeeds_fromVector (const std::vector<Dart>&); virtual void setSeeds_fromVector (const std::vector<Dart>&);
virtual void setSeeds_random (unsigned int nbseeds); virtual void setSeeds_random (unsigned int nbseeds);
const std::vector<Dart>& getBorder () { return border; } const std::vector<Dart>& getBorder () { return border; }
void setCost (const EdgeAttribute<REAL>& c); void setCost (const EdgeAttribute<REAL,MAP>& c);
Dart computeDiagram (); Dart computeDiagram ();
virtual void computeDiagram_incremental (unsigned int nbseeds); virtual void computeDiagram_incremental (unsigned int nbseeds);
...@@ -74,7 +74,6 @@ protected : ...@@ -74,7 +74,6 @@ protected :
template <typename PFP> template <typename PFP>
class CentroidalVoronoiDiagram : public VoronoiDiagram<PFP> class CentroidalVoronoiDiagram : public VoronoiDiagram<PFP>
{ {
typedef typename PFP::MAP MAP;
typedef typename PFP::MAP MAP; typedef typename PFP::MAP MAP;
typedef typename PFP::VEC3 VEC3; typedef typename PFP::VEC3 VEC3;
typedef typename PFP::REAL REAL; typedef typename PFP::REAL REAL;
......
...@@ -102,7 +102,7 @@ void VoronoiDiagram<PFP>::initFrontWithSeeds () ...@@ -102,7 +102,7 @@ void VoronoiDiagram<PFP>::initFrontWithSeeds ()
} }
template <typename PFP> template <typename PFP>
void VoronoiDiagram<PFP>::setCost (const EdgeAttribute<typename PFP::REAL>& c) void VoronoiDiagram<PFP>::setCost (const EdgeAttribute<typename PFP::REAL,typename PFP::MAP>& c)
{ {
edgeCost = c; edgeCost = c;
} }
......
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