ajout diagrammes de voronoi

include/Algo/Geometry/voronoiDiagrams.h

+#ifndef __VORONOI_DIAGRAMS_H__
+#define __VORONOI_DIAGRAMS_H__
+
+#include <vector>
+#include <map>
+
+#include "Topology/generic/traversor2.h"
+
+namespace CGoGN
+{
+
+namespace Algo
+{
+
+namespace Geometry
+{
+
+template <typename PFP>
+class VoronoiDiagram {
+private :
+	typedef typename PFP::REAL REAL;
+	typedef typename PFP::VEC3 VEC3;
+
+	typedef struct
+	{
+		typename std::multimap<float,Dart>::iterator it ;
+		bool valid ;
+		unsigned int region;
+		static std::string CGoGNnameOfType() { return "VoronoiVertexInfo" ; }
+	} VoronoiVertexInfo ;
+	typedef NoMathIOAttribute<VoronoiVertexInfo> VertexInfo ;
+
+	typename PFP::MAP& map;
+	const EdgeAttribute<REAL>& edgeCost; // weights on the graph edges
+//	const VertexAttribute<VEC3>& position; // positions
+	VertexAttribute<unsigned int>& regions; // region labels
+	std::vector<Dart> border;
+	std::vector<Dart> seeds;
+
+	VertexAttribute<VertexInfo> vertexInfo;
+	std::multimap<float,Dart> front ;
+	CellMarkerStore<VERTEX> vmReached;
+
+public :
+	VoronoiDiagram (typename PFP::MAP& m, const EdgeAttribute<REAL>& c, VertexAttribute<unsigned int>& r);
+	~VoronoiDiagram ();
+
+	const std::vector<Dart>& getSeeds (){return seeds;}
+	void setSeeds (const std::vector<Dart>&);
+	void setRandomSeeds (unsigned int nbseeds);
+	const std::vector<Dart>& getBorder (){return border;}
+	void setCost (const EdgeAttribute<REAL>& c);
+
+	void computeDiagram ();
+
+private :
+	void clear ();
+	void initFrontWithSeeds();
+};
+
+}// end namespace Geometry
+}// end namespace Algo
+}// end namespace CGoGN
+
+#include "voronoiDiagrams.hpp"
+
+#endif

include/Algo/Geometry/voronoiDiagrams.hpp

+namespace CGoGN
+{
+
+namespace Algo
+{
+
+namespace Geometry
+{
+
+template <typename PFP>
+VoronoiDiagram<PFP>::VoronoiDiagram (typename PFP::MAP& m, const EdgeAttribute<REAL>& p, VertexAttribute<unsigned int>& r) : map(m), edgeCost (p), regions (r), vmReached(m)
+{
+	vertexInfo = map.template addAttribute<VertexInfo, VERTEX>("vertexInfo");
+}
+
+template <typename PFP>
+VoronoiDiagram<PFP>::~VoronoiDiagram ()
+{
+	map.removeAttribute(vertexInfo);
+}
+
+template <typename PFP>
+void VoronoiDiagram<PFP>::clear ()
+{
+	border.clear();
+	regions.setAllValues(0);
+	border.clear();
+	seeds.clear();
+	front.clear();
+	vmReached.unmarkAll();
+}
+
+template <typename PFP>
+void VoronoiDiagram<PFP>::setSeeds (const std::vector<Dart>& s)
+{
+	clear();
+	seeds = s;
+}
+
+template <typename PFP>
+void VoronoiDiagram<PFP>::setRandomSeeds (unsigned int nseeds)
+{
+	clear();
+
+	srand ( time(NULL) );
+	unsigned int n = nseeds;
+	while (n > 0)
+	{ // TODO : correct this random init which assumes contiguous Dart table
+		Dart d = rand() % map.getNbDarts() ;
+		if (! vmReached.isMarked(d))
+		{
+			vmReached.mark(d);
+			seeds.push_back(d);
+			n--;
+		}
+	}
+}
+
+template <typename PFP>
+void VoronoiDiagram<PFP>::initFrontWithSeeds ()
+{
+	vmReached.unmarkAll();
+	for (unsigned int i = 0; i < seeds.size(); i++)
+	{
+		Dart d = seeds[i];
+		vmReached.mark(d);
+		vertexInfo[d].it = front.insert(std::pair<float,Dart>(0.0, d));
+		vertexInfo[d].valid = true;
+		vertexInfo[d].region = i;
+	}
+}
+
+template <typename PFP>
+void VoronoiDiagram<PFP>::setCost (const EdgeAttribute<typename PFP::REAL>& c){
+	edgeCost = c;
+}
+
+
+template <typename PFP>
+void VoronoiDiagram<PFP>::computeDiagram ()
+{
+	initFrontWithSeeds();
+
+	while ( !front.empty() )
+	{
+		Dart e = front.begin()->second;
+		float d = front.begin()->first;
+		front.erase(vertexInfo[e].it);
+		vertexInfo[e].valid=false;
+		regions[e] = vertexInfo[e].region;
+
+		Traversor2VVaE<typename PFP::MAP> tv (map, e);
+		for (Dart f = tv.begin(); f != tv.end(); f=tv.next())
+		{
+			VertexInfo& vi (vertexInfo[f]);
+			if (vmReached.isMarked(f))
+			{
+				if (vi.valid) // probably useless (because of distance test) but faster
+				{
+//					float dist = d + Algo::Geometry::edgeLength<PFP>(map,f,position);
+					float dist = d + edgeCost[f];
+					if (dist < vi.it->first)
+					{
+						front.erase(vi.it);
+						vi.it = front.insert(std::pair<float,Dart>(dist, f));
+						vi.region = regions[e];
+					}
+				}
+				else
+				{
+					if ( regions[f] != regions[e] )
+						border.push_back(f);
+				}
+			}
+			else
+			{
+//				vi.it = front.insert(std::pair<float,Dart>(d + Algo::Geometry::edgeLength<PFP>(map,f,position), f));
+				vi.it = front.insert(std::pair<float,Dart>(d + edgeCost[f], f));
+				vi.valid=true;
+				vi.region = regions[e];
+				vmReached.mark(f);
+			}
+		}
+	}
+}
+
+}// end namespace Geometry
+}// end namespace Algo
+}// end namespace CGoGN