Commit e7e2e4e8 authored by Thomas's avatar Thomas

removeAttribute corriger pour mettre a jour le cout mémoire

parent 73378a04
...@@ -75,6 +75,7 @@ class ParticleCell2D : public ParticleBase ...@@ -75,6 +75,7 @@ class ParticleCell2D : public ParticleBase
{ {
changeCell = false ; changeCell = false ;
if(!Geom::arePointsEquals(newCurrent, m_position)) { if(!Geom::arePointsEquals(newCurrent, m_position)) {
// std::cout << "-- " << m_position << "--" << newCurrent << std::endl;
prevPos = m_position; prevPos = m_position;
switch(state) { switch(state) {
......
...@@ -159,6 +159,7 @@ public: ...@@ -159,6 +159,7 @@ public:
* @param attribName name of the attribute to remove * @param attribName name of the attribute to remove
* @return removed or not * @return removed or not
*/ */
template <typename T>
bool removeAttribute(const std::string& attribName); bool removeAttribute(const std::string& attribName);
/** /**
...@@ -166,6 +167,7 @@ public: ...@@ -166,6 +167,7 @@ public:
* @param index index of the attribute to remove * @param index index of the attribute to remove
* @return removed or not * @return removed or not
*/ */
template <typename T>
bool removeAttribute(unsigned int index); bool removeAttribute(unsigned int index);
/************************************** /**************************************
...@@ -192,6 +194,11 @@ public: ...@@ -192,6 +194,11 @@ public:
*/ */
unsigned int memoryTotalSize() const; unsigned int memoryTotalSize() const;
/**
* Memory cost of every used line
*/
unsigned int memorySize() const;
/** /**
* is the line used in the container * is the line used in the container
*/ */
......
...@@ -139,6 +139,57 @@ void AttributeContainer::addAttribute(const std::string& attribName, const std:: ...@@ -139,6 +139,57 @@ void AttributeContainer::addAttribute(const std::string& attribName, const std::
m_nbAttributes++; m_nbAttributes++;
} }
template <typename T>
bool AttributeContainer::removeAttribute(const std::string& attribName)
{
unsigned int index = getAttributeIndex(attribName) ;
if (index == UNKNOWN)
{
std::cerr << "removeAttribute by name: attribute not found" << std::endl ;
return false ;
}
// delete the attribute
delete m_tableAttribs[index] ;
m_tableAttribs[index] = NULL ;
if (index == m_tableAttribs.size() - 1)
m_tableAttribs.pop_back() ;
else
m_freeIndices.push_back(index) ;
--m_nbAttributes ;
m_lineCost -= sizeof(T);
return true ;
}
template <typename T>
bool AttributeContainer::removeAttribute(unsigned int index)
{
if(m_tableAttribs[index] == NULL)
{
std::cerr << "removeAttribute by index: attribute not found" << std::endl ;
return false ;
}
// delete the attribute
delete m_tableAttribs[index] ;
m_tableAttribs[index] = NULL ;
if(index == m_tableAttribs.size() - 1)
m_tableAttribs.pop_back() ;
else
m_freeIndices.push_back(index) ;
--m_nbAttributes ;
m_lineCost -= sizeof(T);
return true ;
}
/************************************** /**************************************
* INFO ABOUT THE CONTAINER * * INFO ABOUT THE CONTAINER *
**************************************/ **************************************/
...@@ -160,7 +211,12 @@ inline unsigned int AttributeContainer::capacity() const ...@@ -160,7 +211,12 @@ inline unsigned int AttributeContainer::capacity() const
inline unsigned int AttributeContainer::memoryTotalSize() const inline unsigned int AttributeContainer::memoryTotalSize() const
{ {
return _BLOCKSIZE_ * (m_holesBlocks.size() * m_lineCost + 8); return capacity() * (m_lineCost + 8);
}
inline unsigned int AttributeContainer::memorySize() const
{
return size() * (m_lineCost + 8);
} }
inline bool AttributeContainer::used(unsigned int index) const inline bool AttributeContainer::used(unsigned int index) const
......
...@@ -36,7 +36,7 @@ Orientation2D testOrientation2D(const VEC3& P, const VEC3& Pa, const VEC3& Pb) ...@@ -36,7 +36,7 @@ Orientation2D testOrientation2D(const VEC3& P, const VEC3& Pa, const VEC3& Pb)
typedef typename VEC3::DATA_TYPE T ; typedef typename VEC3::DATA_TYPE T ;
// const T min = std::numeric_limits<T>::min()*T(100); // const T min = std::numeric_limits<T>::min()*T(100);
const T min = 0.000001; const T min = 0.0001;
// T wsof = (Pa[0]-P[0])*(P[1]-Pb[1])-(P[0]-Pb[0])*(Pa[1]-P[1]); // T wsof = (Pa[0]-P[0])*(P[1]-Pb[1])-(P[0]-Pb[0])*(Pa[1]-P[1]);
T wsof = (P[0]-Pa[0])*(Pb[1]-Pa[1])-(Pb[0]-Pa[0])*(P[1]-Pa[1]); T wsof = (P[0]-Pa[0])*(Pb[1]-Pa[1])-(Pb[0]-Pa[0])*(P[1]-Pa[1]);
......
...@@ -38,7 +38,7 @@ template <typename T> ...@@ -38,7 +38,7 @@ template <typename T>
inline bool AttribMap::removeAttribute(AttributeHandler<T>& attr) inline bool AttribMap::removeAttribute(AttributeHandler<T>& attr)
{ {
assert(attr.isValid() || !"Invalid attribute handler") ; assert(attr.isValid() || !"Invalid attribute handler") ;
return m_attribs[attr.getOrbit()].removeAttribute(attr.getIndex()) ; return m_attribs[attr.getOrbit()].removeAttribute<T>(attr.getIndex()) ;
} }
template <typename T> template <typename T>
......
...@@ -50,56 +50,6 @@ AttributeContainer::~AttributeContainer() ...@@ -50,56 +50,6 @@ AttributeContainer::~AttributeContainer()
{ {
} }
/**************************************
* BASIC FEATURES *
**************************************/
bool AttributeContainer::removeAttribute(const std::string& attribName)
{
unsigned int index = getAttributeIndex(attribName) ;
if (index == UNKNOWN)
{
std::cerr << "removeAttribute by name: attribute not found" << std::endl ;
return false ;
}
// delete the attribute
delete m_tableAttribs[index] ;
m_tableAttribs[index] = NULL ;
if (index == m_tableAttribs.size() - 1)
m_tableAttribs.pop_back() ;
else
m_freeIndices.push_back(index) ;
--m_nbAttributes ;
return true ;
}
bool AttributeContainer::removeAttribute(unsigned int index)
{
if(m_tableAttribs[index] == NULL)
{
std::cerr << "removeAttribute by index: attribute not found" << std::endl ;
return false ;
}
// delete the attribute
delete m_tableAttribs[index] ;
m_tableAttribs[index] = NULL ;
if(index == m_tableAttribs.size() - 1)
m_tableAttribs.pop_back() ;
else
m_freeIndices.push_back(index) ;
--m_nbAttributes ;
return true ;
}
/************************************** /**************************************
* INFO ABOUT ATTRIBUTES * * INFO ABOUT ATTRIBUTES *
**************************************/ **************************************/
......
...@@ -194,7 +194,7 @@ void GenericMap::removeThreadMarker(unsigned int nb) ...@@ -194,7 +194,7 @@ void GenericMap::removeThreadMarker(unsigned int nb)
std::stringstream ss ; std::stringstream ss ;
ss << "Mark_"<< th ; ss << "Mark_"<< th ;
AttributeContainer& cellCont = m_attribs[i] ; AttributeContainer& cellCont = m_attribs[i] ;
cellCont.removeAttribute(ss.str()) ; cellCont.removeAttribute<Mark>(ss.str()) ;
m_markerTables[i][th] = NULL ; m_markerTables[i][th] = NULL ;
} }
} }
......
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