modifs sur les IHM3 + correction attributs

Apps/Examples/volumeExplorer.cpp

@@ -407,7 +407,7 @@ int main(int argc, char **argv)
 		{
 */
 
-		if(extension == std::string(".map"))
+		if(extension == std::string(".mapbin"))
 		{
 			myMap.loadMapBin(filename);
 			position = myMap.getAttribute<VEC3, VERTEX,MAP>("position") ;

apps_cmake.txt

@@ -78,7 +78,7 @@ IF(WIN32)
 ELSE(WIN32)
 	find_package(SuiteSparse REQUIRED)
 	SET (COMMON_INCLUDES ${COMMON_INCLUDES} ${SUITESPARSE_INCLUDE_DIRS})
-	SET (COMMON_LIBS ${COMMON_LIBS} ${SUITESPARSE_LIBRARIES})
+	SET (COMMON_LIBS ${SUITESPARSE_LIBRARIES} lapack blas ${COMMON_LIBS})
 
 ENDIF(WIN32)
 

include/Algo/Export/export.hpp

@@ -996,7 +996,7 @@ bool exportChoupi(typename PFP::MAP& map, const VertexAttribute<typename PFP::VE
 		return false ;
 	}
 
-	out << map.template getNbOrbits<VERTEX>() << " " << map.template getNbOrbits<EDGE>() << std::endl;
+	out << Algo::Topo::getNbOrbits<VERTEX>(map) << " " << Algo::Topo::getNbOrbits<EDGE>(map) << std::endl;
 
 	TraversorV<MAP> travV(map);
 	for(Dart dit = travV.begin() ; dit != travV.end() ; dit = travV.next())

include/Algo/Modelisation/tetrahedralization.h

@@ -103,7 +103,7 @@ public:
 
 	EarTriangulation(MAP& map) : m_map(map), m_dartEars(map)
 	{
-		m_position = map.template getAttribute<VEC3, VERTEX>("position");
+		m_position = map.template getAttribute<VEC3, VERTEX, MAP>("position");
 	}
 
 //	void trianguleFace(Dart d, DartMarker& mark);

include/Algo/Multiresolution/IHM2/ihm2_PrimalAdapt.hpp

@@ -351,8 +351,6 @@ unsigned int IHM2<PFP>::subdivideFace(Dart d, bool triQuad, bool OneLevelDiffere
     unsigned int fLevel = faceLevel(d) ;
     Dart old = faceOldestDart(d) ;
 
-	//std::cout << "faceLevel = " << fLevel << std::endl;
-
 	unsigned int cur = m_map.getCurrentLevel() ;
 	m_map.setCurrentLevel(fLevel) ;		// go to the level of the face to subdivide its edges
 

include/Algo/Multiresolution/IHM3/ihm3_PrimalAdapt.h

@@ -137,7 +137,7 @@ protected:
     /***************************************************
      *               SUBDIVISION                       *
      ***************************************************/
-
+public:
     /**
      * subdivide the edge of d to the next level
      */
@@ -158,11 +158,11 @@ protected:
      */
     void coarsenFace(Dart d) ;
 
-public:
+
     //! Subdivide the volume of d to hexahedral cells
     /*! @param d Dart from the volume
      */
-    unsigned int subdivideVolume(Dart d, bool triQuad = true, bool OneLevelDifference = true);
+	Dart subdivideVolume(Dart d, bool triQuad = true, bool OneLevelDifference = true);
 
     /*!
      * \brief subdivideHexa
@@ -179,6 +179,8 @@ public:
      */
     void subdivideVolumeTetOcta(Dart d) ;
 
+	void coarsenVolume(Dart d) ;
+
     /**
      * vertices attributes management
      */
@@ -201,6 +203,6 @@ public:
 
 } // namespace CGoGN
 
-#include "Algo/Multiresolution/IHM2/ihm2_PrimalAdapt.hpp"
+#include "Algo/Multiresolution/IHM3/ihm3_PrimalAdapt.hpp"
 
 #endif

include/Algo/Multiresolution/Map2MR/Masks/catmullClark.h

@@ -47,10 +47,10 @@ class CCVertexVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	CCVertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	CCVertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -99,10 +99,10 @@ class CCEdgeVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	CCEdgeVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	CCEdgeVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -144,10 +144,10 @@ class CCFaceVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	CCFaceVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	CCFaceVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)

include/Algo/Multiresolution/Map2MR/Masks/lerp.h

@@ -48,10 +48,10 @@ class LerpVertexVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	LerpVertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	LerpVertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -74,10 +74,10 @@ class LerpEdgeVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	LerpEdgeVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	LerpEdgeVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -100,10 +100,10 @@ class LerpFaceVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	LerpFaceVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	LerpFaceVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)

include/Algo/Multiresolution/Map2MR/Masks/loop.h

@@ -47,10 +47,10 @@ class LoopVertexVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	LoopVertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	LoopVertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -85,10 +85,10 @@ class LoopEdgeVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	LoopEdgeVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	LoopEdgeVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)

include/Algo/Multiresolution/Map2MR/Masks/sqrt3.h

@@ -48,10 +48,10 @@ class Sqrt3VertexVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	Sqrt3VertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	Sqrt3VertexVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -123,10 +123,10 @@ class Sqrt3FaceVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	VertexAttribute<typename PFP::VEC3>& m_position ;
+	VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& m_position ;
 
 public:
-	Sqrt3FaceVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3>& p) : m_map(m), m_position(p)
+	Sqrt3FaceVertexFunctor(typename PFP::MAP& m, VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)

include/Algo/Multiresolution/Map3MR/Filters/bertram.h

@@ -29,7 +29,7 @@
 #include "Algo/Geometry/centroid.h"
 #include "Algo/Modelisation/tetrahedralization.h"
 #include "Algo/Multiresolution/filter.h"
-#include "Topology/generic/traversor2_closed.h"
+#include "Topology/generic/traversor/traversor2_closed.h"
 
 namespace CGoGN
 {

include/Algo/Multiresolution/Map3MR/Masks/lerp.h

@@ -53,10 +53,10 @@ class LerpVertexVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	AttributeHandler<typename PFP::VEC3, VERTEX>& m_position ;
+	AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& m_position ;
 
 public:
-	LerpVertexVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& p) : m_map(m), m_position(p)
+	LerpVertexVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -68,7 +68,7 @@ public:
 
 //		std::cout << " p du niv i+1 = " << p << std::endl;
 
-		m_position[d] = p;
+		//m_position[d] = p;
 
 //		m_map.decCurrentLevel() ;
 //		std::cout << "dec = " <<  m_position[d] << std::endl;
@@ -84,10 +84,10 @@ class LerpEdgeVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	AttributeHandler<typename PFP::VEC3, VERTEX>& m_position ;
+	AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& m_position ;
 
 public:
-	LerpEdgeVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& p) : m_map(m), m_position(p)
+	LerpEdgeVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -110,10 +110,10 @@ class LerpFaceVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	AttributeHandler<typename PFP::VEC3, VERTEX>& m_position ;
+	AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& m_position ;
 
 public:
-	LerpFaceVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& p) : m_map(m), m_position(p)
+	LerpFaceVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)
@@ -135,10 +135,10 @@ class LerpVolumeVertexFunctor : public FunctorType
 {
 protected:
 	typename PFP::MAP& m_map ;
-	AttributeHandler<typename PFP::VEC3, VERTEX>& m_position ;
+	AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& m_position ;
 
 public:
-	LerpVolumeVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX>& p) : m_map(m), m_position(p)
+	LerpVolumeVertexFunctor(typename PFP::MAP& m, AttributeHandler<typename PFP::VEC3, VERTEX, typename PFP::MAP>& p) : m_map(m), m_position(p)
 	{}
 
 	bool operator() (Dart d)

include/Topology/ihmap/ihm2.h

@@ -32,11 +32,11 @@ namespace CGoGN
 
 template<typename T, unsigned int ORBIT> class AttributeHandler_IHM ;
 
-typedef EmbeddedMap2::TOPO_MAP TOPO_MAP;
 
 class ImplicitHierarchicalMap2 : public EmbeddedMap2
 {
 	template<typename T, unsigned int ORBIT> friend class AttributeHandler_IHM ;
+	typedef EmbeddedMap2::TOPO_MAP TOPO_MAP;
 
 private:
 	unsigned int m_curLevel ;

include/Topology/ihmap/ihm2.hpp

@@ -326,18 +326,14 @@ inline void ImplicitHierarchicalMap2::setCurrentLevel(unsigned int l)
 
 inline void ImplicitHierarchicalMap2::incCurrentLevel()
 {
-	if(m_curLevel < m_maxLevel)
-		++m_curLevel ;
-	else
-		CGoGNout << "incCurrentLevel : already at maximum resolution level" << CGoGNendl ;
+	assert(m_curLevel < m_maxLevel || "incCurrentLevel : already at maximum resolution level");
+	++m_curLevel ;
 }
 
 inline void ImplicitHierarchicalMap2::decCurrentLevel()
 {
-	if(m_curLevel > 0)
-		--m_curLevel ;
-	else
-		CGoGNout << "decCurrentLevel : already at minimum resolution level" << CGoGNendl ;
+	assert(m_curLevel > 0 || "decCurrentLevel : already at minimum resolution level");
+	--m_curLevel ;
 }
 
 inline unsigned int ImplicitHierarchicalMap2::getMaxLevel()

include/Topology/ihmap/ihm3.h

@@ -32,12 +32,12 @@ namespace CGoGN
 
 template<typename T, unsigned int ORBIT> class AttributeHandler_IHM ;
 
-typedef EmbeddedMap3::TOPO_MAP TOPO_MAP;
 
 
 class ImplicitHierarchicalMap3 : public EmbeddedMap3
 {
     template<typename T, unsigned int ORBIT> friend class AttributeHandler_IHM ;
+	typedef EmbeddedMap3::TOPO_MAP TOPO_MAP;
 
 private:
     unsigned int m_curLevel ;
@@ -80,11 +80,11 @@ public:
      *             ATTRIBUTES MANAGEMENT               *
      ***************************************************/
 
-    template <typename T, unsigned int ORBIT>
-    AttributeHandler_IHM<T, ORBIT> addAttribute(const std::string& nameAttr) ;
+//	template <typename T, unsigned int ORBIT, typename MAP>
+//	AttributeHandler_IHM<T, ORBIT, MAP> addAttribute(const std::string& nameAttr) ;
 
-    template <typename T, unsigned int ORBIT>
-    AttributeHandler_IHM<T, ORBIT> getAttribute(const std::string& nameAttr) ;
+//	template <typename T, unsigned int ORBIT, typename MAP>
+//	AttributeHandler_IHM<T, ORBIT, MAP> getAttribute(const std::string& nameAttr) ;
 
     /***************************************************
      *                 MAP TRAVERSAL                   *
@@ -163,6 +163,8 @@ public:
      *               MAP MANIPULATION                  *
      ***************************************************/
 
+	Dart cutEdge(Dart d);
+
     /***************************************************
      *              LEVELS MANAGEMENT                  *
      ***************************************************/
@@ -201,8 +203,15 @@ public:
     //! Set an edge id to all darts from an orbit of d
     /*!
      */
-    void setEdgeId(Dart d, unsigned int i, unsigned int orbit); //TODO a virer
-    void setEdgeId(Dart d, unsigned int i);
+	void setEdgeId(Dart d, unsigned int i); //TODO a virer
+	void setDartEdgeId(Dart d, unsigned int i);
+
+	unsigned int getTriRefinementEdgeId(Dart d);
+
+	unsigned int getQuadRefinementEdgeId(Dart d);
+
+
+
 
     //! Give a new unique id to all the faces of the map
     /*!

include/Topology/ihmap/ihm3.hpp

@@ -28,33 +28,33 @@ namespace CGoGN
 /***************************************************
  *             ATTRIBUTES MANAGEMENT               *
  ***************************************************/
-template <typename T, unsigned int ORBIT>
-AttributeHandler_IHM<T, ORBIT> ImplicitHierarchicalMap3::addAttribute(const std::string& nameAttr)
-{
-    bool addNextLevelCell = false ;
-    if(!isOrbitEmbedded<ORBIT>())
-        addNextLevelCell = true ;
+//template <typename T, unsigned int ORBIT, typename MAP>
+//AttributeHandler_IHM<T, ORBIT, MAP> ImplicitHierarchicalMap3::addAttribute(const std::string& nameAttr)
+//{
+//	bool addNextLevelCell = false ;
+//	if(!isOrbitEmbedded<ORBIT>())
+//		addNextLevelCell = true ;
 
-    AttributeHandler<T, ORBIT, ImplicitHierarchicalMap3> h = Map3::addAttribute<T, ORBIT, ImplicitHierarchicalMap3>(nameAttr) ;
+//	AttributeHandler<T, ORBIT, ImplicitHierarchicalMap3> h = Map3::addAttribute<T, ORBIT, ImplicitHierarchicalMap3>(nameAttr) ;
 
-    if(addNextLevelCell)
-    {
-        AttributeContainer& cellCont = m_attribs[ORBIT] ;
-        AttributeMultiVector<unsigned int>* amv = cellCont.addAttribute<unsigned int>("nextLevelCell") ;
-        m_nextLevelCell[ORBIT] = amv ;
-        for(unsigned int i = cellCont.begin(); i < cellCont.end(); cellCont.next(i))
-            amv->operator[](i) = EMBNULL ;
-    }
+//	if(addNextLevelCell)
+//	{
+//		AttributeContainer& cellCont = m_attribs[ORBIT] ;
+//		AttributeMultiVector<unsigned int>* amv = cellCont.addAttribute<unsigned int>("nextLevelCell") ;
+//		m_nextLevelCell[ORBIT] = amv ;
+//		for(unsigned int i = cellCont.begin(); i < cellCont.end(); cellCont.next(i))
+//			amv->operator[](i) = EMBNULL ;
+//	}
 
-    return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
-}
+//	return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
+//}
 
-template <typename T, unsigned int ORBIT>
-AttributeHandler_IHM<T, ORBIT> ImplicitHierarchicalMap3::getAttribute(const std::string& nameAttr)
-{
-    AttributeHandler<T, ORBIT, ImplicitHierarchicalMap3> h = Map3::getAttribute<T, ORBIT, ImplicitHierarchicalMap3>(nameAttr) ;
-    return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
-}
+//template <typename T, unsigned int ORBIT, typename MAP>
+//AttributeHandler_IHM<T, ORBIT, MAP> ImplicitHierarchicalMap3::getAttribute(const std::string& nameAttr)
+//{
+//	AttributeHandler<T, ORBIT, ImplicitHierarchicalMap3> h = Map3::getAttribute<T, ORBIT, ImplicitHierarchicalMap3>(nameAttr) ;
+//	return AttributeHandler_IHM<T, ORBIT>(this, h.getDataVector()) ;
+//}
 
 inline void ImplicitHierarchicalMap3::update_topo_shortcuts()
 {
@@ -72,7 +72,7 @@ inline void ImplicitHierarchicalMap3::update_topo_shortcuts()
  ***************************************************/
 inline Dart ImplicitHierarchicalMap3::newDart()
 {
-    Dart d = Map3::newDart() ;
+	Dart d = TOPO_MAP::newDart() ;
     m_dartLevel[d] = m_curLevel ;
     if(m_curLevel > m_maxLevel)			// update max level
         m_maxLevel = m_curLevel ;		// if needed
@@ -457,18 +457,14 @@ inline void ImplicitHierarchicalMap3::foreach_dart_of_cc(Dart d, FUNC& f, unsign
 
 inline void ImplicitHierarchicalMap3::incCurrentLevel()
 {
-    if(m_curLevel < m_maxLevel)
-        ++m_curLevel ;
-    else
-        CGoGNout << "incCurrentLevel : already at maximum resolution level" << CGoGNendl ;
+	assert(m_curLevel < m_maxLevel || "incCurrentLevel : already at maximum resolution level");
+	++m_curLevel ;
 }
 
 inline void ImplicitHierarchicalMap3::decCurrentLevel()
 {
-    if(m_curLevel > 0)
-        --m_curLevel ;
-    else
-        CGoGNout << "decCurrentLevel : already at minimum resolution level" << CGoGNendl ;
+	assert(m_curLevel > 0 || "decCurrentLevel : already at minimum resolution level");
+	--m_curLevel ;
 }
 
 inline unsigned int ImplicitHierarchicalMap3::getCurrentLevel() const
@@ -511,24 +507,57 @@ inline unsigned int ImplicitHierarchicalMap3::getEdgeId(Dart d)
     return m_edgeId[d] ;
 }
 
-inline void ImplicitHierarchicalMap3::setEdgeId(Dart d, unsigned int i, unsigned int orbit)
+inline void ImplicitHierarchicalMap3::setEdgeId(Dart d, unsigned int i)
 {
-    if(orbit == EDGE)
-    {
-        Dart e = d;
+	Dart e = d;
 
-        do
-        {
-            m_edgeId[e] = i;
-            m_edgeId[Map3::phi2(e)] = i;
+	do
+	{
+		m_edgeId[e] = i;
+		m_edgeId[Map3::phi2(e)] = i;
 
-            e = Map3::alpha2(e);
-        } while(e != d);
-    }
-    else if(orbit == DART)
-    {
-        m_edgeId[d] = i;
-    }
+		e = Map3::alpha2(e);
+	} while(e != d);
+
+}
+
+inline void ImplicitHierarchicalMap3::setDartEdgeId(Dart d, unsigned int i)
+{
+	m_edgeId[d] = i;
+}
+
+inline unsigned int ImplicitHierarchicalMap3::triRefinementEdgeId(Dart d)
+{
+	unsigned int dId = getEdgeId(phi_1(d));
+	unsigned int eId = getEdgeId(phi1(d));
+
+	unsigned int id = dId + eId;
+
+	if(id == 0)
+		return 1;
+	else if(id == 1)
+		return 2;
+	else if(id == 2)
+	{
+		if(dId == eId)
+			return 0;
+		else
+			return 1;
+	}
+
+	//else if(id == 3)
+	return 0;
+}
+
+inline unsigned int ImplicitHierarchicalMap3::quadRefinementEdgeId(Dart d)
+{
+	unsigned int eId = getEdgeId(phi1(d));
+
+	if(eId == 0)
+		return 1;
+
+	//else if(eId == 1)
+	return 0;
 }
 
 /***************************************************
@@ -540,6 +569,26 @@ inline unsigned int ImplicitHierarchicalMap3::getNewFaceId()
     return m_faceIdCount++;
 }
 
+inline unsigned int ImplicitHierarchicalMap3::faceId(Dart d)
+{
+	unsigned int fId = getFaceId(phi2(d));
+
+	if(fId == 0)
+		return 1;
+	else if(id == 1)
+		return 2;
+	else if(id == 2)
+	{
+		if(dId == eId)
+			return 0;
+		else
+			return 1;
+	}
+
+	//else if(id == 3)
+	return 0;
+}
+
 inline unsigned int ImplicitHierarchicalMap3::getFaceId(Dart d)
 {
     return m_faceId[d] ;

src/Topology/ihmap/ihm3.cpp

@@ -61,14 +61,14 @@ void ImplicitHierarchicalMap3::clear(bool removeAttrib)
 
 void ImplicitHierarchicalMap3::initImplicitProperties()
 {
-    initEdgeId() ;
+	//initEdgeId() ;
     initFaceId();
 
-//	for(Dart d = Map3::begin(); d != Map3::end(); Map3::next(d))
-//	{
-//		m_edgeId[d] = 0;
-//		m_faceId[d] = 0;
-//	}
+	for(Dart d = Map3::begin(); d != Map3::end(); Map3::next(d))
+	{
+		m_edgeId[d] = 0;
+		//m_faceId[d] = 0;
+	}
 
     for(unsigned int orbit = 0; orbit < NB_ORBITS; ++orbit)