Commit 684efc08 authored by Pierre Kraemer's avatar Pierre Kraemer

Corrected some asserts

parent e3b35f88
...@@ -35,7 +35,7 @@ namespace CGoGN ...@@ -35,7 +35,7 @@ namespace CGoGN
/** /**
* Class that create an access-table to an existing attribute * Class that create an access-table to an existing attribute
* Permetting operation are: * Main available operations are:
* - [ index ] * - [ index ]
* - [ dart ] * - [ dart ]
* - begin / end / next to manage indexing * - begin / end / next to manage indexing
...@@ -109,7 +109,7 @@ public: ...@@ -109,7 +109,7 @@ public:
* check if the attribute handler is linked to a valid attribute * check if the attribute handler is linked to a valid attribute
* -> MUST BE USED AFTER A CALL TO : * -> MUST BE USED AFTER A CALL TO :
* getAttribute(unsigned int orbit, const std::string& nameAttr) * getAttribute(unsigned int orbit, const std::string& nameAttr)
* addAttribute( unsigned int orbit, const std::string& nameAttr) * addAttribute(unsigned int orbit, const std::string& nameAttr)
*/ */
bool isValid() const ; bool isValid() const ;
......
...@@ -223,6 +223,7 @@ inline void GenericMap::initCell(unsigned int orbit, unsigned int i) ...@@ -223,6 +223,7 @@ inline void GenericMap::initCell(unsigned int orbit, unsigned int i)
template <typename T> template <typename T>
inline AttribMultiVect<T>& GenericMap::getAttributeVector(unsigned int idAttr) inline AttribMultiVect<T>& GenericMap::getAttributeVector(unsigned int idAttr)
{ {
assert(idAttr != AttribContainer::UNKNOWN) ;
return m_attribs[AttribContainer::orbitAttr(idAttr)].getDataVector<T>(AttribContainer::indexAttr(idAttr)) ; return m_attribs[AttribContainer::orbitAttr(idAttr)].getDataVector<T>(AttribContainer::indexAttr(idAttr)) ;
} }
...@@ -234,12 +235,13 @@ inline AttribMultiVect<Mark>* GenericMap::getMarkerVector(unsigned int orbit) ...@@ -234,12 +235,13 @@ inline AttribMultiVect<Mark>* GenericMap::getMarkerVector(unsigned int orbit)
inline AttribMultiVectGen& GenericMap::getMultiVec(unsigned int idAttr) inline AttribMultiVectGen& GenericMap::getMultiVec(unsigned int idAttr)
{ {
assert(idAttr != AttribContainer::UNKNOWN) ;
return m_attribs[AttribContainer::orbitAttr(idAttr)].getVirtualDataVector(AttribContainer::indexAttr(idAttr)) ; return m_attribs[AttribContainer::orbitAttr(idAttr)].getVirtualDataVector(AttribContainer::indexAttr(idAttr)) ;
} }
inline AttribContainer& GenericMap::getAttributeContainer(unsigned int orbit) inline AttribContainer& GenericMap::getAttributeContainer(unsigned int orbit)
{ {
assert(isOrbitEmbedded(orbit) || !"Invalid parameter: orbit not embedded"); // assert(isOrbitEmbedded(orbit) || !"Invalid parameter: orbit not embedded");
return m_attribs[orbit] ; return m_attribs[orbit] ;
} }
......
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