Skip to content

GitLab

C
CGoGN
Commit d2282716 authored by untereiner's avatar untereiner
Browse files
Options

suppression des vieux embeddedMap + fichier non utilisé

parent 1b6e8c10
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1380 deletions
include/Topology/generic/embeddedMap2.h deleted 100644 → 0
View file @ 1b6e8c10
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-2011, IGG Team, LSIIT, University of Strasbourg *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library is distributed in the hope that it will be useful, but WITHOUT *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.u-strasbg.fr/ *
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#ifndef __EMBEDDED_MAP2_H__
#define __EMBEDDED_MAP2_H__
#include "Topology/generic/genericmap.h"
namespace CGoGN
{
/**
* Class of 2-dimensional maps
* with lazily managed embeddings
*/
template <typename MAP2>
class EmbeddedMap2 : public MAP2
{
public:
typedef MAP2 TOPO_MAP;
/**
* The attributes attached to the old vertex are duplicated on both resulting vertices
* No attribute is attached to the new edge
*/
virtual void splitVertex(Dart d, Dart e) ;
/**
* The attributes attached to the face of d are kept on the resulting face
*/
virtual bool deleteVertex(Dart d) ;
/**
* No attribute is attached to the new edge
* The attributes attached to the face of dart d are kept on the resulting face
*/
virtual void linkVertices(Dart d, Dart e) ;
/**
* No attribute is attached to the new vertex
* The attributes attached to the old edge are duplicated on both resulting edges
*/
virtual void cutEdge(Dart d) ;
/**
* The attributes attached to the edge of d are kept on the resulting edge
*/
virtual void uncutEdge(Dart d) ;
/**
* Check if the edge of d can be collapsed or not based on some topological conditions
* @param d a dart of the edge to test
* @return true if the edge can be collapsed, false otherwise
*/
bool edgeCanCollapse(Dart d) ;
/**
* The attributes attached to the vertex of dart d are kept on the resulting vertex
* See 'collapseDegeneratedFace' to see what can happen to edges attributes
* Nothing has to be done for the faces (some degenerate ones can be deleted)
*/
virtual Dart collapseEdge(Dart d, bool delDegenerateFaces = true) ;
/**
* No cell is created or deleted
*/
virtual bool flipEdge(Dart d) ;
/**
* No cell is created or deleted
*/
virtual bool flipBackEdge(Dart d) ;
/**
* The attributes attached to the vertex of dart d are kept on the resulting vertex
* The attributes attached to the face of dart d are overwritten on the face of dart e
*/
virtual void insertEdgeInVertex(Dart d, Dart e);
/**
* The attributes attached to the vertex of dart d are kept on the resulting vertex
* The attributes attached to the face of dart d are overwritten on the face of dart e
*/
virtual void removeEdgeFromVertex(Dart d);
/**
* The attributes attached to the vertices of the edge of d are kept on the vertices of the resulting edge
* The attributes attached to the edge of d are kept on the resulting edge
*/
virtual void sewFaces(Dart d, Dart e) ;
/**
* The attributes attached to the vertices of the old edge of d are duplicated on the vertices of both resulting edges
* The attributes attached to the old edge are duplicated on both resulting edges
*/
virtual void unsewFaces(Dart d) ;
/**
* The attributes attached to the edge of d are kept on the resulting edge
*/
virtual bool collapseDegeneratedFace(Dart d);
/**
* No attribute is attached to the new edge
* The attributes attached to the old face are duplicated on both resulting faces
*/
virtual void splitFace(Dart d, Dart e) ;
/**
* The attributes attached to the face of dart d are kept on the resulting face
*/
virtual bool mergeFaces(Dart d) ;
/**
* The attributes attached to the vertices of the face of d are kept on the resulting vertices
* The attributes attached to the edges of the face of d are kept on the resulting edges
*/
virtual bool mergeVolumes(Dart d, Dart e) ;
/**
* No attribute is attached to the new face
*/
virtual unsigned int closeHole(Dart d);
virtual bool check() ;
} ;
} // namespace CGoGN
#include "embeddedMap2.hpp"
#endif
include/Topology/generic/embeddedMap2.hpp deleted 100644 → 0
View file @ 1b6e8c10
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-2011, IGG Team, LSIIT, University of Strasbourg *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library is distributed in the hope that it will be useful, but WITHOUT *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.u-strasbg.fr/ *
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#include <vector>
#include <algorithm>
namespace CGoGN
{
template <typename MAP2>
void EmbeddedMap2<MAP2>::splitVertex(Dart d, Dart e)
{
Dart dd = MAP2::phi2(d) ;
Dart ee = MAP2::phi2(e) ;
MAP2::splitVertex(d, e) ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::copyDartEmbedding(VERTEX, MAP2::phi1(dd), d) ;
MAP2::copyDartEmbedding(VERTEX, MAP2::phi1(ee), e) ;
MAP2::embedNewCell(VERTEX, e) ;
MAP2::copyCell(VERTEX, e, d) ;
}
if(MAP2::isOrbitEmbedded(FACE))
{
MAP2::copyDartEmbedding(FACE, MAP2::phi1(dd), dd) ;
MAP2::copyDartEmbedding(FACE, MAP2::phi1(ee), ee) ;
}
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::deleteVertex(Dart d)
{
Dart f = MAP2::phi1(d) ;
if(MAP2::deleteVertex(d))
{
if (MAP2::isOrbitEmbedded(FACE))
{
MAP2::embedOrbit(FACE, f, MAP2::getEmbedding(FACE, f)) ;
}
return true ;
}
return false ;
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::linkVertices(Dart d, Dart e)
{
Dart dNext = MAP2::phi1(d) ;
MAP2::linkVertices(d,e);
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::copyDartEmbedding(VERTEX, MAP2::phi_1(e), d) ;
MAP2::copyDartEmbedding(VERTEX, MAP2::phi_1(d), e) ;
}
if (MAP2::isOrbitEmbedded(FACE))
{
MAP2::embedOrbit(FACE, dNext, MAP2::getEmbedding(FACE, dNext)) ;
}
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::cutEdge(Dart d)
{
MAP2::cutEdge(d) ;
Dart nd = MAP2::phi1(d) ;
if (MAP2::isOrbitEmbedded(EDGE))
{
MAP2::embedNewCell(EDGE, nd) ;
MAP2::copyDartEmbedding(EDGE, MAP2::phi2(d), d) ;
MAP2::copyCell(EDGE, nd, d) ;
}
if(MAP2::isOrbitEmbedded(FACE))
{
MAP2::copyDartEmbedding(FACE, MAP2::phi1(d), d) ;
Dart e = MAP2::phi2(nd) ;
if(e != nd)
MAP2::copyDartEmbedding(FACE, MAP2::phi1(e), e) ;
}
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::uncutEdge(Dart d)
{
bool doSomethg = (d != MAP2::phi2(d)) ;
MAP2::uncutEdge(d) ;
if(doSomethg)
{
if(MAP2::isOrbitEmbedded(EDGE))
MAP2::copyDartEmbedding(EDGE, MAP2::phi2(d), d) ;
}
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::edgeCanCollapse(Dart d)
{
if(MAP2::phi2(d) == d)
return false ;
if(MAP2::isBoundaryVertex(d) || MAP2::isBoundaryVertex(MAP2::phi1(d)))
return false ;
unsigned int val_v1 = MAP2::vertexDegree(d) ;
unsigned int val_v2 = MAP2::vertexDegree(MAP2::phi1(d)) ;
if(val_v1 + val_v2 < 8 || val_v1 + val_v2 > 14)
return false ;
if(MAP2::isFaceTriangle(d))
{
if(MAP2::vertexDegree(MAP2::phi_1(d)) < 4)
return false ;
}
Dart dd = MAP2::phi2(d) ;
if(MAP2::isFaceTriangle(dd))
{
if(MAP2::vertexDegree(MAP2::phi_1(dd)) < 4)
return false ;
}
// Check vertex sharing condition
std::vector<unsigned int> vu1 ;
vu1.reserve(32) ;
Dart vit1 = MAP2::alpha1(MAP2::alpha1(d)) ;
Dart end = MAP2::phi1(dd) ;
do
{
unsigned int ve = MAP2::getEmbedding(VERTEX, MAP2::phi2(vit1)) ;
vu1.push_back(ve) ;
vit1 = MAP2::alpha1(vit1) ;
} while(vit1 != end) ;
end = MAP2::phi1(d) ;
Dart vit2 = MAP2::alpha1(MAP2::alpha1(dd)) ;
do
{
unsigned int ve = MAP2::getEmbedding(VERTEX, MAP2::phi2(vit2)) ;
std::vector<unsigned int>::iterator it = std::find(vu1.begin(), vu1.end(), ve) ;
if(it != vu1.end())
return false ;
vit2 = MAP2::alpha1(vit2) ;
} while(vit2 != end) ;
return true ;
}
template <typename MAP2>
Dart EmbeddedMap2<MAP2>::collapseEdge(Dart d, bool delDegenerateFaces)
{
unsigned int vEmb = EMBNULL ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
vEmb = MAP2::getEmbedding(VERTEX, d) ;
}
Dart dV = MAP2::collapseEdge(d, delDegenerateFaces);
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::embedOrbit(VERTEX, dV, vEmb) ;
}
return dV ;
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::flipEdge(Dart d)
{
if(MAP2::flipEdge(d))
{
Dart e = MAP2::phi2(d) ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::copyDartEmbedding(VERTEX, d, MAP2::phi1(e)) ;
MAP2::copyDartEmbedding(VERTEX, e, MAP2::phi1(d)) ;
}
if (MAP2::isOrbitEmbedded(FACE))
{
MAP2::copyDartEmbedding(FACE, MAP2::phi_1(d), d) ;
MAP2::copyDartEmbedding(FACE, MAP2::phi_1(e), e) ;
}
return true ;
}
return false ;
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::flipBackEdge(Dart d)
{
if(MAP2::flipBackEdge(d))
{
Dart e = MAP2::phi2(d) ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::copyDartEmbedding(VERTEX, d, MAP2::phi1(e)) ;
MAP2::copyDartEmbedding(VERTEX, e, MAP2::phi1(d)) ;
}
if (MAP2::isOrbitEmbedded(FACE))
{
MAP2::copyDartEmbedding(FACE, MAP2::phi1(d), d) ;
MAP2::copyDartEmbedding(FACE, MAP2::phi1(e), e) ;
}
return true ;
}
return false ;
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::insertEdgeInVertex(Dart d, Dart e)
{
MAP2::insertEdgeInVertex(d, e);
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::copyDartEmbedding(VERTEX, e, d) ;
}
if (MAP2::isOrbitEmbedded(FACE))
{
if(!MAP2::sameFace(d,e))
{
MAP2::embedNewCell(FACE, e);
MAP2::copyCell(FACE, e, d) ;
}
else
{
MAP2::embedOrbit(FACE, d, MAP2::getEmbedding(FACE, d)) ;
}
}
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::removeEdgeFromVertex(Dart d)
{
Dart dPrev = MAP2::alpha_1(d);
MAP2::removeEdgeFromVertex(d);
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::embedNewCell(VERTEX, d);
MAP2::copyCell(VERTEX, d, dPrev);
}
if (MAP2::isOrbitEmbedded(FACE))
{
if(!MAP2::sameFace(d, dPrev))
{
MAP2::embedNewCell(FACE, d);
MAP2::copyCell(FACE, d, dPrev) ;
}
else
{
MAP2::embedOrbit(FACE, d, MAP2::getEmbedding(FACE, d)) ;
}
}
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::sewFaces(Dart d, Dart e)
{
unsigned int vEmb1 = EMBNULL ;
unsigned int vEmb2 = EMBNULL ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
vEmb1 = MAP2::getEmbedding(VERTEX, d) ;
vEmb2 = MAP2::getEmbedding(VERTEX, MAP2::phi1(d)) ;
}
MAP2::sewFaces(d, e) ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::embedOrbit(VERTEX, d, vEmb1) ;
MAP2::embedOrbit(VERTEX, e, vEmb2) ;
}
if (MAP2::isOrbitEmbedded(EDGE))
{
MAP2::copyDartEmbedding(EDGE, e, d) ;
}
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::unsewFaces(Dart d)
{
bool boundaryD = false ;
bool boundaryE = false ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
if(MAP2::isBoundaryVertex(d))
boundaryD = true ;
if(MAP2::isBoundaryVertex(MAP2::phi1(d)))
boundaryE = true ;
}
Dart e = MAP2::phi2(d) ;
MAP2::unsewFaces(d) ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
if(boundaryD)
{
if(e != d)
{
Dart ee = MAP2::phi1(e) ;
MAP2::embedNewCell(VERTEX, ee) ;
MAP2::copyCell(VERTEX, ee, d) ;
}
}
if(boundaryE)
{
if(e != d)
{
MAP2::embedNewCell(VERTEX, e) ;
MAP2::copyCell(VERTEX, e, MAP2::phi1(d)) ;
}
}
}
if (MAP2::isOrbitEmbedded(EDGE))
{
MAP2::embedNewCell(EDGE, e) ;
MAP2::copyCell(EDGE, e, d) ;
}
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::collapseDegeneratedFace(Dart d)
{
Dart e = MAP2::phi2(d) ;
if(MAP2::collapseDegeneratedFace(d))
{
if (MAP2::isOrbitEmbedded(EDGE))
{
MAP2::copyDartEmbedding(EDGE, MAP2::phi2(e), e) ;
}
return true ;
}
return false ;
}
template <typename MAP2>
void EmbeddedMap2<MAP2>::splitFace(Dart d, Dart e)
{
MAP2::splitFace(d, e) ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::copyDartEmbedding(VERTEX, MAP2::phi_1(e), d) ;
MAP2::copyDartEmbedding(VERTEX, MAP2::phi_1(d), e) ;
}
if (MAP2::isOrbitEmbedded(FACE))
{
MAP2::embedNewCell(FACE, e) ;
MAP2::copyCell(FACE, e, d) ;
}
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::mergeFaces(Dart d)
{
Dart dNext = MAP2::phi1(d) ;
if(MAP2::mergeFaces(d))
{
if (MAP2::isOrbitEmbedded(FACE))
{
MAP2::embedOrbit(FACE, dNext, MAP2::getEmbedding(FACE, dNext)) ;
}
return true ;
}
return false ;
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::mergeVolumes(Dart d, Dart e)
{
std::vector<Dart> darts ;
std::vector<unsigned int> vEmb ;
std::vector<unsigned int> eEmb ;
Dart fit = d ;
do
{
darts.push_back(MAP2::phi2(fit)) ;
if (MAP2::isOrbitEmbedded(VERTEX))
{
vEmb.push_back(MAP2::getEmbedding(VERTEX, MAP2::phi2(fit))) ;
}
if (MAP2::isOrbitEmbedded(EDGE))
{
eEmb.push_back(MAP2::getEmbedding(EDGE, fit)) ;
}
fit = MAP2::phi1(fit) ;
} while (fit != d) ;
if(MAP2::mergeVolumes(d, e))
{
for(unsigned int i = 0; i < darts.size(); ++i)
{
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::embedOrbit(VERTEX, darts[i], vEmb[i]) ;
}
if (MAP2::isOrbitEmbedded(EDGE))
{
MAP2::embedOrbit(EDGE, darts[i], eEmb[i]) ;
}
}
return true ;
}
return false ;
}
template <typename MAP2>
unsigned int EmbeddedMap2<MAP2>::closeHole(Dart d)
{
unsigned int nbE = MAP2::closeHole(d) ;
Dart dd = MAP2::phi2(d) ;
Dart f = dd ;
do
{
if (MAP2::isOrbitEmbedded(VERTEX))
{
MAP2::copyDartEmbedding(VERTEX, f, MAP2::alpha1(f)) ;
}
if (MAP2::isOrbitEmbedded(EDGE))
{
MAP2::copyDartEmbedding(EDGE, f, MAP2::phi2(f)) ;
}
f = MAP2::phi1(f) ;
} while(dd != f) ;
return nbE ;
}
template <typename MAP2>
bool EmbeddedMap2<MAP2>::check()
{
bool topo = MAP2::check() ;
if (!topo)