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

remove some default parameters in .hpp file

parent c1eda75a
...@@ -112,7 +112,8 @@ void computeCurvatureVertices_NormalCycles( ...@@ -112,7 +112,8 @@ void computeCurvatureVertices_NormalCycles(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select = allDarts, unsigned int thread=0) ; const FunctorSelect& select = allDarts,
unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void computeCurvatureVertex_NormalCycles( void computeCurvatureVertex_NormalCycles(
...@@ -126,7 +127,8 @@ void computeCurvatureVertex_NormalCycles( ...@@ -126,7 +127,8 @@ void computeCurvatureVertex_NormalCycles(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread=0) ; VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void normalCycles_SortAndSetEigenComponents( void normalCycles_SortAndSetEigenComponents(
...@@ -138,13 +140,13 @@ void normalCycles_SortAndSetEigenComponents( ...@@ -138,13 +140,13 @@ void normalCycles_SortAndSetEigenComponents(
typename PFP::VEC3& Kmin, typename PFP::VEC3& Kmin,
typename PFP::VEC3& Knormal, typename PFP::VEC3& Knormal,
const typename PFP::VEC3& normal, const typename PFP::VEC3& normal,
unsigned int thread=0) ; unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void normalCycles_SortTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, unsigned int thread=0) ; void normalCycles_SortTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void normalCycles_ProjectTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, const typename PFP::VEC3& normal_vector, unsigned int thread=0) ; void normalCycles_ProjectTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, const typename PFP::VEC3& normal_vector, unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void computeCurvatureVertices_NormalCycles_Projected( void computeCurvatureVertices_NormalCycles_Projected(
...@@ -158,7 +160,8 @@ void computeCurvatureVertices_NormalCycles_Projected( ...@@ -158,7 +160,8 @@ void computeCurvatureVertices_NormalCycles_Projected(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select = allDarts, unsigned int thread=0) ; const FunctorSelect& select = allDarts,
unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void computeCurvatureVertex_NormalCycles_Projected( void computeCurvatureVertex_NormalCycles_Projected(
...@@ -172,7 +175,8 @@ void computeCurvatureVertex_NormalCycles_Projected( ...@@ -172,7 +175,8 @@ void computeCurvatureVertex_NormalCycles_Projected(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread=0) ; VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread = 0) ;
...@@ -190,7 +194,8 @@ void computeCurvatureVertices_NormalCycles( ...@@ -190,7 +194,8 @@ void computeCurvatureVertices_NormalCycles(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select = allDarts, unsigned int thread=0) ; const FunctorSelect& select = allDarts,
unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void computeCurvatureVertex_NormalCycles( void computeCurvatureVertex_NormalCycles(
...@@ -204,7 +209,8 @@ void computeCurvatureVertex_NormalCycles( ...@@ -204,7 +209,8 @@ void computeCurvatureVertex_NormalCycles(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread=0) ; VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void computeCurvatureVertices_NormalCycles_Projected( void computeCurvatureVertices_NormalCycles_Projected(
...@@ -218,7 +224,8 @@ void computeCurvatureVertices_NormalCycles_Projected( ...@@ -218,7 +224,8 @@ void computeCurvatureVertices_NormalCycles_Projected(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select = allDarts, unsigned int thread=0) ; const FunctorSelect& select = allDarts,
unsigned int thread = 0) ;
template <typename PFP> template <typename PFP>
void computeCurvatureVertex_NormalCycles_Projected( void computeCurvatureVertex_NormalCycles_Projected(
...@@ -232,7 +239,8 @@ void computeCurvatureVertex_NormalCycles_Projected( ...@@ -232,7 +239,8 @@ void computeCurvatureVertex_NormalCycles_Projected(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread=0) ; VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread = 0) ;
namespace Parallel namespace Parallel
...@@ -249,7 +257,8 @@ void computeCurvatureVertices_NormalCycles( ...@@ -249,7 +257,8 @@ void computeCurvatureVertices_NormalCycles(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select = allDarts, unsigned int nbth = 0) ; const FunctorSelect& select = allDarts,
unsigned int nbth = 0) ;
template <typename PFP> template <typename PFP>
void computeCurvatureVertices_QuadraticFitting( void computeCurvatureVertices_QuadraticFitting(
...@@ -260,7 +269,8 @@ void computeCurvatureVertices_QuadraticFitting( ...@@ -260,7 +269,8 @@ void computeCurvatureVertices_QuadraticFitting(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
const FunctorSelect& select = allDarts, unsigned int nbth=0); const FunctorSelect& select = allDarts,
unsigned int nbth = 0);
} // namespace Parallel } // namespace Parallel
......
...@@ -27,14 +27,6 @@ ...@@ -27,14 +27,6 @@
#include "Topology/generic/traversorCell.h" #include "Topology/generic/traversorCell.h"
#include "Topology/generic/traversor2.h" #include "Topology/generic/traversor2.h"
extern "C"
{
#include "C_BLAS_LAPACK/INCLUDE/f2c.h"
#include "C_BLAS_LAPACK/INCLUDE/clapack.h"
}
#undef max
#undef min
namespace CGoGN namespace CGoGN
{ {
...@@ -291,7 +283,8 @@ void computeCurvatureVertices_NormalCycles( ...@@ -291,7 +283,8 @@ void computeCurvatureVertices_NormalCycles(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select, unsigned int thread) const FunctorSelect& select,
unsigned int thread)
{ {
TraversorV<typename PFP::MAP> t(map, select) ; TraversorV<typename PFP::MAP> t(map, select) ;
for(Dart d = t.begin(); d != t.end(); d = t.next()) for(Dart d = t.begin(); d != t.end(); d = t.next())
...@@ -310,7 +303,8 @@ void computeCurvatureVertex_NormalCycles( ...@@ -310,7 +303,8 @@ void computeCurvatureVertex_NormalCycles(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread) VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread)
{ {
typedef typename PFP::REAL REAL ; typedef typename PFP::REAL REAL ;
typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::VEC3 VEC3 ;
...@@ -355,7 +349,8 @@ void computeCurvatureVertices_NormalCycles_Projected( ...@@ -355,7 +349,8 @@ void computeCurvatureVertices_NormalCycles_Projected(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select, unsigned int thread) const FunctorSelect& select,
unsigned int thread)
{ {
TraversorV<typename PFP::MAP> t(map, select) ; TraversorV<typename PFP::MAP> t(map, select) ;
for(Dart d = t.begin(); d != t.end(); d = t.next()) for(Dart d = t.begin(); d != t.end(); d = t.next())
...@@ -374,7 +369,8 @@ void computeCurvatureVertex_NormalCycles_Projected( ...@@ -374,7 +369,8 @@ void computeCurvatureVertex_NormalCycles_Projected(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread) VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread)
{ {
typedef typename PFP::REAL REAL ; typedef typename PFP::REAL REAL ;
typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::VEC3 VEC3 ;
...@@ -412,7 +408,8 @@ void computeCurvatureVertices_NormalCycles( ...@@ -412,7 +408,8 @@ void computeCurvatureVertices_NormalCycles(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select, unsigned int thread) const FunctorSelect& select,
unsigned int thread)
{ {
TraversorV<typename PFP::MAP> t(map, select) ; TraversorV<typename PFP::MAP> t(map, select) ;
for(Dart d = t.begin(); d != t.end(); d = t.next()) for(Dart d = t.begin(); d != t.end(); d = t.next())
...@@ -431,7 +428,8 @@ void computeCurvatureVertex_NormalCycles( ...@@ -431,7 +428,8 @@ void computeCurvatureVertex_NormalCycles(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread) VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread)
{ {
typedef typename PFP::REAL REAL ; typedef typename PFP::REAL REAL ;
typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::VEC3 VEC3 ;
...@@ -465,7 +463,8 @@ void computeCurvatureVertices_NormalCycles_Projected( ...@@ -465,7 +463,8 @@ void computeCurvatureVertices_NormalCycles_Projected(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select, unsigned int thread) const FunctorSelect& select,
unsigned int thread)
{ {
TraversorV<typename PFP::MAP> t(map, select) ; TraversorV<typename PFP::MAP> t(map, select) ;
for(Dart d = t.begin(); d != t.end(); d = t.next()) for(Dart d = t.begin(); d != t.end(); d = t.next())
...@@ -484,7 +483,8 @@ void computeCurvatureVertex_NormalCycles_Projected( ...@@ -484,7 +483,8 @@ void computeCurvatureVertex_NormalCycles_Projected(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, unsigned int thread) VertexAttribute<typename PFP::VEC3>& Knormal,
unsigned int thread)
{ {
typedef typename PFP::REAL REAL ; typedef typename PFP::REAL REAL ;
typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::VEC3 VEC3 ;
...@@ -519,7 +519,7 @@ void normalCycles_SortAndSetEigenComponents( ...@@ -519,7 +519,7 @@ void normalCycles_SortAndSetEigenComponents(
typename PFP::VEC3& Kmin, typename PFP::VEC3& Kmin,
typename PFP::VEC3& Knormal, typename PFP::VEC3& Knormal,
const typename PFP::VEC3& normal, const typename PFP::VEC3& normal,
unsigned int thread=0) unsigned int thread)
{ {
// sort eigen components : ev[inormal] has minimal absolute value ; kmin = ev[imin] <= ev[imax] = kmax // sort eigen components : ev[inormal] has minimal absolute value ; kmin = ev[imin] <= ev[imax] = kmax
int inormal=0, imin, imax ; int inormal=0, imin, imax ;
...@@ -549,7 +549,7 @@ void normalCycles_SortAndSetEigenComponents( ...@@ -549,7 +549,7 @@ void normalCycles_SortAndSetEigenComponents(
} }
template <typename PFP> template <typename PFP>
void normalCycles_SortTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, unsigned int thread=0) void normalCycles_SortTensor(Geom::Matrix<3,3,typename PFP::REAL> & tensor, unsigned int thread)
{ {
typedef typename PFP::REAL REAL ; typedef typename PFP::REAL REAL ;
typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::VEC3 VEC3 ;
...@@ -582,7 +582,7 @@ void normalCycles_SortTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, uns ...@@ -582,7 +582,7 @@ void normalCycles_SortTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, uns
} }
template <typename PFP> template <typename PFP>
void normalCycles_ProjectTensor( Geom::Matrix<3,3,typename PFP::REAL> & tensor, const typename PFP::VEC3& normal_vector, unsigned int thread=0) void normalCycles_ProjectTensor(Geom::Matrix<3,3,typename PFP::REAL> & tensor, const typename PFP::VEC3& normal_vector, unsigned int thread)
{ {
Geom::Matrix<3,3,typename PFP::REAL> proj; Geom::Matrix<3,3,typename PFP::REAL> proj;
proj.identity(); proj.identity();
...@@ -647,7 +647,8 @@ void computeCurvatureVertices_NormalCycles( ...@@ -647,7 +647,8 @@ void computeCurvatureVertices_NormalCycles(
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
VertexAttribute<typename PFP::VEC3>& Knormal, VertexAttribute<typename PFP::VEC3>& Knormal,
const FunctorSelect& select, unsigned int nbth) const FunctorSelect& select,
unsigned int nbth)
{ {
// WAHOO BIG PROBLEM WITH LAZZY EMBEDDING !!! // WAHOO BIG PROBLEM WITH LAZZY EMBEDDING !!!
if (!map. template isOrbitEmbedded<VERTEX>()) if (!map. template isOrbitEmbedded<VERTEX>())
...@@ -714,7 +715,8 @@ void computeCurvatureVertices_QuadraticFitting( ...@@ -714,7 +715,8 @@ void computeCurvatureVertices_QuadraticFitting(
VertexAttribute<typename PFP::REAL>& kmin, VertexAttribute<typename PFP::REAL>& kmin,
VertexAttribute<typename PFP::VEC3>& Kmax, VertexAttribute<typename PFP::VEC3>& Kmax,
VertexAttribute<typename PFP::VEC3>& Kmin, VertexAttribute<typename PFP::VEC3>& Kmin,
const FunctorSelect& select, unsigned int nbth) const FunctorSelect& select,
unsigned int nbth)
{ {
FunctorComputeCurvatureVertices_QuadraticFitting<PFP> funct(map, position, normal, kmax, kmin, Kmax, Kmin); FunctorComputeCurvatureVertices_QuadraticFitting<PFP> funct(map, position, normal, kmax, kmin, Kmax, Kmin);
Algo::Parallel::foreach_cell<typename PFP::MAP,VERTEX>(map, funct, nbth, true, select); Algo::Parallel::foreach_cell<typename PFP::MAP,VERTEX>(map, funct, nbth, true, select);
......
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