Skip to content

GitLab

Coupure prévue mardi 3 Août au matin pour maintenance du serveur. Nous faisons au mieux pour que celle-ci soit la plus brève possible.

Commit acd4feb8 authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

optim gestion plongement dans operateurs EmbeddedMap2

parent 17225370
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 47 deletions
Apps/deprecated/tp_master.cpp
View file @ acd4feb8
......@@ -92,7 +92,7 @@ private:
// Assigne un nouveau plongement au sommet. Les anciens plongements sont libérés.
void newVertex(Dart d) {
setOrbitEmbeddingNewCell<VERTEX>(d);
setOrbitEmbeddingOnNewCell<VERTEX>(d);
}
public:
......
Apps/deprecated/tutoriel.cpp
View file @ acd4feb8
......@@ -95,7 +95,7 @@ private:
// Assigne un nouveau plongement au sommet. Les anciens plongements sont libérés.
void newVertex(Dart d) {
setOrbitEmbeddingNewCell(VERTEX,d);
setOrbitEmbeddingOnNewCell(VERTEX,d);
}
public:
......
include/Algo/Decimation/edgeSelector.hpp
View file @ acd4feb8
......@@ -898,7 +898,7 @@ void EdgeSelector_Curvature<PFP>::computeEdgeInfo(Dart d, EdgeInfo& einfo)
Dart d2 = m.phi2(m.phi_1(d)) ;
Dart dd2 = m.phi2(m.phi_1(dd)) ;
m.extractTrianglePair(d) ;
unsigned int newV = m.template setOrbitEmbeddingNewCell<VERTEX>(d2) ;
unsigned int newV = m.template setOrbitEmbeddingOnNewCell<VERTEX>(d2) ;
this->m_position[newV] = m_positionApproximator->getApprox(d) ;
// compute things on the coarse version of the mesh
......
include/Algo/Decimation/geometryApproximator.hpp
View file @ acd4feb8
......@@ -211,7 +211,7 @@ void Approximator_MidEdge<PFP>::approximate(Dart d)
// temporary edge collapse
m.extractTrianglePair(d) ;
unsigned int newV = m.template setOrbitEmbeddingNewCell<VERTEX>(d2) ;
unsigned int newV = m.template setOrbitEmbeddingOnNewCell<VERTEX>(d2) ;
this->m_attrV[0]->operator[](newV) = this->m_approx[0][d] ;
// compute the detail vector
......@@ -260,7 +260,7 @@ void Approximator_HalfCollapse<PFP>::approximate(Dart d)
// temporary edge collapse
m.extractTrianglePair(d) ;
unsigned int newV = m.template setOrbitEmbeddingNewCell<VERTEX>(d2) ;
unsigned int newV = m.template setOrbitEmbeddingOnNewCell<VERTEX>(d2) ;
for (unsigned int i = 0 ; i < this->m_attrV.size() ; ++i)
{
this->m_attrV[i]->operator[](newV) = this->m_approx[i][d] ;
......
include/Algo/ImplicitHierarchicalMesh/ihm.hpp
View file @ acd4feb8
......@@ -349,7 +349,7 @@ T& AttributeHandler_IHM<T, ORBIT>::operator[](Dart d)
if(index == EMBNULL)
{
index = m->setOrbitEmbeddingNewCell<ORBIT>(d) ;
index = m->setOrbitEmbeddingOnNewCell<ORBIT>(d) ;
m->m_nextLevelCell[orbit]->operator[](index) = EMBNULL ;
}
......
include/Algo/ImplicitHierarchicalMesh/ihm3.hpp
View file @ acd4feb8
......@@ -616,7 +616,7 @@ T& AttributeHandler_IHM<T, ORBIT>::operator[](Dart d)
if(index == EMBNULL)
{
index = m->setOrbitEmbeddingNewCell<ORBIT>(d) ;
index = m->setOrbitEmbeddingOnNewCell<ORBIT>(d) ;
m->m_nextLevelCell[orbit]->operator[](index) = EMBNULL ;
}
......
include/Algo/Modelisation/primitives3d.hpp
View file @ acd4feb8
......@@ -176,7 +176,7 @@ void Primitive3D<PFP>::embedHexaGrid(float x, float y, float z)
typename PFP::VEC3 pos(-x/2.0f + dx*float(k), -y/2.0f + dy*float(j), -z/2.0f + dz*float(i));
Dart d = m_tableVertDarts[ i*nbs+j*(m_nx+1)+k ];
m_map.template setOrbitEmbeddingNewCell<VERTEX>(d);
m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(d);
m_positions[d] = pos;
}
}
......
include/Algo/Multiresolution/Map2MR/map2MR_PrimalRegular.hpp
View file @ acd4feb8
......@@ -69,9 +69,9 @@ void Map2MR<PFP>::addNewLevel(bool triQuad, bool embedNewVertices)
if(!shareVertexEmbeddings && embedNewVertices)
{
if(m_map.template getEmbedding<VERTEX>(d) == EMBNULL)
m_map.template setOrbitEmbeddingNewCell<VERTEX>(d) ;
m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(d) ;
if(m_map.template getEmbedding<VERTEX>(m_map.phi1(d)) == EMBNULL)
m_map.template setOrbitEmbeddingNewCell<VERTEX>(d) ;
m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(d) ;
}
m_map.cutEdge(d) ;
......@@ -79,7 +79,7 @@ void Map2MR<PFP>::addNewLevel(bool triQuad, bool embedNewVertices)
travE.skip(m_map.phi1(d)) ;
if(embedNewVertices)
m_map.template setOrbitEmbeddingNewCell<VERTEX>(m_map.phi1(d)) ;
m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(m_map.phi1(d)) ;
}
// split faces
......@@ -124,7 +124,7 @@ void Map2MR<PFP>::addNewLevel(bool triQuad, bool embedNewVertices)
travF.skip(dd) ;
if(embedNewVertices)
m_map.template setOrbitEmbeddingNewCell<VERTEX>(m_map.phi1(ne)) ;
m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(m_map.phi1(ne)) ;
dd = m_map.phi1(m_map.phi1(next)) ;
while(dd != ne) // turn around the face and insert new edges
......@@ -169,7 +169,7 @@ void Map2MR<PFP>::addNewLevelSqrt3(bool embedNewVertices)
Dart cd = m_map.phi2(x);
if(embedNewVertices)
m_map.template setOrbitEmbeddingNewCell<VERTEX>(cd) ;
m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(cd) ;
Dart fit = cd ;
do
......
include/Algo/Multiresolution/Map3MR/map3MR_PrimalAdapt.hpp
View file @ acd4feb8
......@@ -83,7 +83,7 @@ void Map3MR<PFP>::swapEdges(Dart d, Dart e)
}
if(m_map.template isOrbitEmbedded<VOLUME>())
m_map.template setOrbitEmbeddingNewCell<VOLUME>(d);
m_map.template setOrbitEmbeddingOnNewCell<VOLUME>(d);
// propagateDartRelation(d, m_phi2) ;
......
include/Algo/Multiresolution/Map3MR/map3MR_PrimalRegular.hpp
View file @ acd4feb8
......@@ -73,7 +73,7 @@ void Map3MR<PFP>::swapEdges(Dart d, Dart e)
}
if(m_map.template isOrbitEmbedded<VOLUME>())
m_map.template setOrbitEmbeddingNewCell<VOLUME>(d);
m_map.template setOrbitEmbeddingOnNewCell<VOLUME>(d);
}
}
......@@ -203,9 +203,9 @@ void Map3MR<PFP>::addNewLevelTetraOcta(bool embedNewVertices)
// if(!shareVertexEmbeddings)
// {
// if(getEmbedding<VERTEX>(d) == EMBNULL)
// setOrbitEmbeddingNewCell<VERTEX>(d) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(d) ;
// if(getEmbedding<VERTEX>(phi1(d)) == EMBNULL)
// setOrbitEmbeddingNewCell<VERTEX>(d) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(d) ;
// }
m_map.cutEdge(d) ;
......@@ -214,7 +214,7 @@ void Map3MR<PFP>::addNewLevelTetraOcta(bool embedNewVertices)
// When importing MR files
// if(embedNewVertices)
// m_map.template setOrbitEmbeddingNewCell<VERTEX>(m_map.phi1(d)) ;
// m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(m_map.phi1(d)) ;
}
//2. split faces - triangular faces
......@@ -332,7 +332,7 @@ void Map3MR<PFP>::addNewLevelTetraOcta(bool embedNewVertices)
// When importing MR files
//if(embedNewVertices)
// m_map.template setOrbitEmbeddingNewCell<VERTEX>(x) ;
// m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(x) ;
}
m_map.setCurrentLevel(m_map.getMaxLevel() - 1) ;
}
......@@ -368,9 +368,9 @@ void Map3MR<PFP>::addNewLevelHexa(bool embedNewVertices)
// if(!shareVertexEmbeddings)
// {
// if(getEmbedding<VERTEX>(d) == EMBNULL)
// setOrbitEmbeddingNewCell<VERTEX>(d) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(d) ;
// if(getEmbedding<VERTEX>(phi1(d)) == EMBNULL)
// setOrbitEmbeddingNewCell<VERTEX>(phi1(d)) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(phi1(d)) ;
// }
m_map.cutEdge(d) ;
......@@ -379,7 +379,7 @@ void Map3MR<PFP>::addNewLevelHexa(bool embedNewVertices)
// When importing MR files : activated for DEBUG
// if(embedNewVertices)
// setOrbitEmbeddingNewCell<VERTEX>(phi1(d)) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(phi1(d)) ;
}
//2. split faces - quadrangule faces
......@@ -400,7 +400,7 @@ void Map3MR<PFP>::addNewLevelHexa(bool embedNewVertices)
// When importing MR files : activated for DEBUG
// if(embedNewVertices)
// setOrbitEmbeddingNewCell<VERTEX>(phi1(ne)) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(phi1(ne)) ;
dd = m_map.phi1(m_map.phi1(next)) ;
while(dd != ne) // turn around the face and insert new edges
......@@ -530,9 +530,9 @@ void Map3MR<PFP>::addNewLevelHexa(bool embedNewVertices)
// if(!shareVertexEmbeddings)
// {
// if(getEmbedding<VERTEX>(d) == EMBNULL)
// setOrbitEmbeddingNewCell<VERTEX>(d) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(d) ;
// if(getEmbedding<VERTEX>(phi1(d)) == EMBNULL)
// setOrbitEmbeddingNewCell<VERTEX>(d) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(d) ;
// }
//
// cutEdge(d) ;
......@@ -541,7 +541,7 @@ void Map3MR<PFP>::addNewLevelHexa(bool embedNewVertices)
//
//// When importing MR files : activated for DEBUG
// if(embedNewVertices)
// setOrbitEmbeddingNewCell<VERTEX>(phi1(d)) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(phi1(d)) ;
// }
//
// //2. split faces - quadrangule faces
......@@ -587,7 +587,7 @@ void Map3MR<PFP>::addNewLevelHexa(bool embedNewVertices)
//
// // When importing MR files : activated for DEBUG
// if(embedNewVertices)
// setOrbitEmbeddingNewCell<VERTEX>(phi1(ne)) ;
// setOrbitEmbeddingOnNewCell<VERTEX>(phi1(ne)) ;
//
// dd = phi1(phi1(next)) ;
// while(dd != ne) // turn around the face and insert new edges
......
include/Algo/ProgressiveMesh/pmesh.hpp
View file @ acd4feb8
......@@ -174,9 +174,9 @@ void ProgressiveMesh<PFP>::createPM(unsigned int percentWantedVertices)
edgeCollapse(vs) ; // collapse edge
unsigned int newV = m_map.template setOrbitEmbeddingNewCell<VERTEX>(d2) ;
unsigned int newE1 = m_map.template setOrbitEmbeddingNewCell<EDGE>(d2) ;
unsigned int newE2 = m_map.template setOrbitEmbeddingNewCell<EDGE>(dd2) ;
unsigned int newV = m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(d2) ;
unsigned int newE1 = m_map.template setOrbitEmbeddingOnNewCell<EDGE>(d2) ;
unsigned int newE2 = m_map.template setOrbitEmbeddingOnNewCell<EDGE>(dd2) ;
vs->setApproxV(newV) ;
vs->setApproxE1(newE1) ;
vs->setApproxE2(newE2) ;
......
include/Algo/VolumetricProgressiveMesh/vpmesh.hpp
View file @ acd4feb8
......@@ -132,9 +132,9 @@ void VolumetricProgressiveMesh<PFP>::createPM(unsigned int percentWantedVertices
edgeCollapse(vs) ; // collapse edge
unsigned int newV = m_map.template setOrbitEmbeddingNewCell<VERTEX>(d2) ;
unsigned int newE1 = m_map.template setOrbitEmbeddingNewCell<EDGE>(d2) ;
unsigned int newE2 = m_map.template setOrbitEmbeddingNewCell<EDGE>(dd2) ;
unsigned int newV = m_map.template setOrbitEmbeddingOnNewCell<VERTEX>(d2) ;
unsigned int newE1 = m_map.template setOrbitEmbeddingOnNewCell<EDGE>(d2) ;
unsigned int newE2 = m_map.template setOrbitEmbeddingOnNewCell<EDGE>(dd2) ;
vs->setApproxV(newV) ;
vs->setApproxE1(newE1) ;
vs->setApproxE2(newE2) ;
......
include/Topology/generic/attribmap.hpp
View file @ acd4feb8
......@@ -121,7 +121,7 @@ void AttribMap::bijectiveOrbitEmbedding()
{
if (counter[d] > 0)
{
unsigned int newEmb = setOrbitEmbeddingNewCell<ORBIT>(d) ;
unsigned int newEmb = setOrbitEmbeddingOnNewCell<ORBIT>(d) ;
copyCell<ORBIT>(newEmb, emb) ;
}
counter[d]++ ;
......
include/Topology/generic/attributeHandler.hpp
View file @ acd4feb8
......@@ -138,7 +138,7 @@ inline T& AttributeHandler<T, ORBIT>::operator[](Dart d)
unsigned int a = m_map->getEmbedding<ORBIT>(d) ;
/*
if (a == EMBNULL)
a = m_map->setOrbitEmbeddingNewCell<ORBIT>(d) ;
a = m_map->setOrbitEmbeddingOnNewCell<ORBIT>(d) ;
*/
return m_attrib->operator[](a) ;
}
......
include/Topology/generic/cellmarker.h
View file @ acd4feb8
......@@ -133,7 +133,7 @@ public:
unsigned int a = m_map.getEmbedding<CELL>(d) ;
// if (a == EMBNULL)
// a = m_map.setOrbitEmbeddingNewCell<CELL>(d) ;
// a = m_map.setOrbitEmbeddingOnNewCell<CELL>(d) ;
m_markVector->operator[](a).setMark(m_mark) ;
}
......@@ -147,7 +147,7 @@ public:
unsigned int a = m_map.getEmbedding<CELL>(d) ;
// if (a == EMBNULL)
// a = m_map.setOrbitEmbeddingNewCell<CELL>(d) ;
// a = m_map.setOrbitEmbeddingOnNewCell<CELL>(d) ;
m_markVector->operator[](a).unsetMark(m_mark) ;
}
......
include/Topology/generic/dartmarker.h
View file @ acd4feb8
......@@ -46,7 +46,6 @@ protected:
Mark m_mark ;
AttributeMultiVector<Mark>* m_markVector ;
unsigned int m_thread ;
// unsigned int m_idReg ;
bool releaseOnDestruct ;
public:
......
include/Topology/generic/ecell.hpp
View file @ acd4feb8
......@@ -146,7 +146,7 @@ ECellDart<DIM> ECellDart<DIM>::operator[](Dart d)
unsigned int a = s_map->getEmbedding(d,DIM);
if (a == EMBNULL)
a = s_map->setOrbitEmbeddingNewCell(DIM, d);
a = s_map->setOrbitEmbeddingOnNewCell(DIM, d);
return ECellDart<DIM>(a);
}
......
include/Topology/generic/genericmap.h
View file @ acd4feb8
......@@ -404,7 +404,7 @@ public:
* @return index of the attribute in table
*/
template <unsigned int ORBIT>
unsigned int setOrbitEmbeddingNewCell(Dart d) ;
unsigned int setOrbitEmbeddingOnNewCell(Dart d) ;
/**
* Associate an new cell to all darts of an orbit
......
include/Topology/generic/genericmap.hpp
View file @ acd4feb8
......@@ -373,7 +373,7 @@ inline void GenericMap::initOrbitEmbedding(Dart d, unsigned int em)
}
template <unsigned int ORBIT>
inline unsigned int GenericMap::setOrbitEmbeddingNewCell(Dart d)
inline unsigned int GenericMap::setOrbitEmbeddingOnNewCell(Dart d)
{
assert(isOrbitEmbedded<ORBIT>() || !"Invalid parameter: orbit not embedded");
unsigned int em = newCell<ORBIT>();
......@@ -396,12 +396,12 @@ inline void GenericMap::copyCell(Dart d, Dart e)
assert(isOrbitEmbedded<ORBIT>() || !"Invalid parameter: orbit not embedded");
unsigned int dE = getEmbedding<ORBIT>(d) ;
unsigned int eE = getEmbedding<ORBIT>(e) ;
if(eE != EMBNULL) // if the source is NULL, nothing to copy
{
if(dE == EMBNULL) // if the dest is NULL, create a new cell
dE = setOrbitEmbeddingNewCell<ORBIT>(d) ;
// if(eE != EMBNULL) // if the source is NULL, nothing to copy
// {
// if(dE == EMBNULL) // if the dest is NULL, create a new cell
// dE = setOrbitEmbeddingOnNewCell<ORBIT>(d) ;
m_attribs[ORBIT].copyLine(dE, eE) ; // copy the data
}
// }
}
template <unsigned int ORBIT>
......
src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
View file @ acd4feb8
......@@ -111,7 +111,7 @@ void ImplicitHierarchicalMap3::swapEdges(Dart d, Dart e)
}
if(isOrbitEmbedded<VOLUME>())
setOrbitEmbeddingNewCell<VOLUME>(d);
setOrbitEmbeddingOnNewCell<VOLUME>(d);
}
}
......
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