songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eigen interface for LSCM

This commit is contained in:
Simon Giraudot 2015-08-07 11:55:00 +02:00
parent 6196c183c7
commit db4a974f64
2 changed files with 54 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Solver_interface/include/CGAL/Eigen_solver_traits.h
View File

@ -53,6 +53,11 @@ namespace internal {
typedef Eigen_sparse_symmetric_matrix<FT> type; typedef Eigen_sparse_symmetric_matrix<FT> type;
}; };
template <class FT,class EigenMatrix>
struct Get_eigen_matrix< ::Eigen::LeastSquaresConjugateGradient<EigenMatrix>,FT>{
typedef Eigen_sparse_matrix<FT> type;
};
template <class FT,class EigenMatrix> template <class FT,class EigenMatrix>
struct Get_eigen_matrix< ::Eigen::SimplicialCholesky<EigenMatrix>,FT>{ struct Get_eigen_matrix< ::Eigen::SimplicialCholesky<EigenMatrix>,FT>{
typedef Eigen_sparse_symmetric_matrix<FT> type; typedef Eigen_sparse_symmetric_matrix<FT> type;

78
Surface_mesh_parameterization/include/CGAL/LSCM_parameterizer_3.h
View File

@ -24,14 +24,22 @@
#include <CGAL/circulator.h> #include <CGAL/circulator.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
#ifdef CGAL_EIGEN3_ENABLED
#include <CGAL/Eigen_solver_traits.h>
#endif
#include <CGAL/OpenNL/linear_solver.h> #include <CGAL/OpenNL/linear_solver.h>
#include <CGAL/Parameterizer_traits_3.h> #include <CGAL/Parameterizer_traits_3.h>
#include <CGAL/Two_vertices_parameterizer_3.h> #include <CGAL/Two_vertices_parameterizer_3.h>
#include <CGAL/surface_mesh_parameterization_assertions.h> #include <CGAL/surface_mesh_parameterization_assertions.h>
#include <CGAL/Parameterization_mesh_feature_extractor.h> #include <CGAL/Parameterization_mesh_feature_extractor.h>
#include <iostream> #include <iostream>
#define DEBUG_TRACE
/// \file LSCM_parameterizer_3.h /// \file LSCM_parameterizer_3.h
namespace CGAL { namespace CGAL {
@ -136,9 +144,13 @@ private:
typedef typename Sparse_LA::Vector Vector; typedef typename Sparse_LA::Vector Vector;
typedef typename Sparse_LA::Matrix Matrix; typedef typename Sparse_LA::Matrix Matrix;
typedef typename OpenNL::LinearSolver<Sparse_LA> typedef Eigen_solver_traits<Eigen::LeastSquaresConjugateGradient<Eigen_sparse_matrix<double>::EigenType> >
LeastSquaresSolver ; LeastSquaresSolver ;
typedef typename LeastSquaresSolver::Matrix LSS_Matrix;
typedef typename LeastSquaresSolver::Vector LSS_Vector;
typedef typename LeastSquaresSolver::NT LSS_Scalar;
// Public operations // Public operations
public: public:
/// Constructor /// Constructor
@ -173,7 +185,8 @@ private:
/// \pre Vertices must be indexed. /// \pre Vertices must be indexed.
/// \pre X and B must be allocated and empty. /// \pre X and B must be allocated and empty.
/// \pre At least 2 border vertices must be parameterized. /// \pre At least 2 border vertices must be parameterized.
void initialize_system_from_mesh_border(LeastSquaresSolver& solver, void initialize_system_from_mesh_border(LSS_Matrix& A,
LSS_Vector& B,
const Adaptor& mesh) ; const Adaptor& mesh) ;
/// Utility for setup_triangle_relations(): /// Utility for setup_triangle_relations():
@ -185,7 +198,7 @@ private:
/// Create two lines in the linear system per triangle (one for u, one for v). /// Create two lines in the linear system per triangle (one for u, one for v).
/// ///
/// \pre vertices must be indexed. /// \pre vertices must be indexed.
Error_code setup_triangle_relations(LeastSquaresSolver& solver, Error_code setup_triangle_relations(LSS_Matrix& A, LSS_Vector& B,
const Adaptor& mesh, const Adaptor& mesh,
Facet_const_handle facet) ; Facet_const_handle facet) ;
@ -288,25 +301,26 @@ parameterize(Adaptor& mesh)
// Create sparse linear system "A*X = B" of size 2*nbVertices x 2*nbVertices // Create sparse linear system "A*X = B" of size 2*nbVertices x 2*nbVertices
// (in fact, we need only 2 lines per triangle x 1 column per vertex) // (in fact, we need only 2 lines per triangle x 1 column per vertex)
LeastSquaresSolver solver(2*nbVertices); LSS_Matrix A (2 * nbVertices, 2 * nbVertices);
solver.set_least_squares(true) ; LSS_Vector B (2 * nbVertices);
// Initialize the "A*X = B" linear system after // Initialize the "A*X = B" linear system after
// (at least two) border vertices parameterization // (at least two) border vertices parameterization
initialize_system_from_mesh_border(solver, mesh); initialize_system_from_mesh_border(A, B, mesh);
// Fill the matrix for the other vertices // Fill the matrix for the other vertices
solver.begin_system() ;
for (Facet_iterator facetIt = mesh.mesh_facets_begin(); for (Facet_iterator facetIt = mesh.mesh_facets_begin();
facetIt != mesh.mesh_facets_end(); facetIt != mesh.mesh_facets_end();
facetIt++) facetIt++)
{ {
// Create two lines in the linear system per triangle (one for u, one for v) // Create two lines in the linear system per triangle (one for u, one for v)
status = setup_triangle_relations(solver, mesh, facetIt); status = setup_triangle_relations(A, B, mesh, facetIt);
if (status != Base::OK) if (status != Base::OK)
return status; return status;
} }
solver.end_system() ;
A.assemble_matrix();
#ifdef DEBUG_TRACE #ifdef DEBUG_TRACE
std::cerr << " matrix filling (" << 2*mesh.count_mesh_facets() << " x " << nbVertices << "): " std::cerr << " matrix filling (" << 2*mesh.count_mesh_facets() << " x " << nbVertices << "): "
<< timer.time() << " seconds." << std::endl; << timer.time() << " seconds." << std::endl;
@ -314,8 +328,12 @@ parameterize(Adaptor& mesh)
#endif #endif
// Solve the "A*X = B" linear system in the least squares sense // Solve the "A*X = B" linear system in the least squares sense
if ( ! solver.solve() ) LSS_Vector X (2 * nbVertices);
LSS_Scalar D;
LeastSquaresSolver solver;
if (!(solver.linear_solver (A, B, X, D)))
status = Base::ERROR_CANNOT_SOLVE_LINEAR_SYSTEM; status = Base::ERROR_CANNOT_SOLVE_LINEAR_SYSTEM;
#ifdef DEBUG_TRACE #ifdef DEBUG_TRACE
std::cerr << " solving linear system: " std::cerr << " solving linear system: "
<< timer.time() << " seconds." << std::endl; << timer.time() << " seconds." << std::endl;
@ -323,7 +341,7 @@ parameterize(Adaptor& mesh)
#endif #endif
if (status != Base::OK) if (status != Base::OK)
return status; return status;
return status;
// Copy X coordinates into the (u,v) pair of each vertex // Copy X coordinates into the (u,v) pair of each vertex
set_mesh_uv_from_system(mesh, solver); set_mesh_uv_from_system(mesh, solver);
#ifdef DEBUG_TRACE #ifdef DEBUG_TRACE
@ -396,7 +414,7 @@ check_parameterize_preconditions(Adaptor& mesh)
template<class Adaptor, class Border_param, class Sparse_LA> template<class Adaptor, class Border_param, class Sparse_LA>
inline inline
void LSCM_parameterizer_3<Adaptor, Border_param, Sparse_LA>:: void LSCM_parameterizer_3<Adaptor, Border_param, Sparse_LA>::
initialize_system_from_mesh_border(LeastSquaresSolver& solver, initialize_system_from_mesh_border(LSS_Matrix& A, LSS_Vector& B,
const Adaptor& mesh) const Adaptor& mesh)
{ {
for (Vertex_const_iterator it = mesh.mesh_vertices_begin(); for (Vertex_const_iterator it = mesh.mesh_vertices_begin();
@ -412,13 +430,12 @@ initialize_system_from_mesh_border(LeastSquaresSolver& solver,
// Write (u,v) in X (meaningless if vertex is not parameterized) // Write (u,v) in X (meaningless if vertex is not parameterized)
// Note : 2*index --> u // Note : 2*index --> u
// 2*index + 1 --> v // 2*index + 1 --> v
solver.variable(2*index ).set_value(uv.x()) ;
solver.variable(2*index + 1).set_value(uv.y()) ;
// Copy (u,v) in B if vertex is parameterized // Copy (u,v) in B if vertex is parameterized
if (mesh.is_vertex_parameterized(it)) { if (mesh.is_vertex_parameterized(it))
solver.variable(2*index ).lock() ; {
solver.variable(2*index + 1).lock() ; B.set (2 * index, uv.x ());
B.set (2 * index + 1, uv.y ());
} }
} }
} }
@ -474,7 +491,7 @@ template<class Adaptor, class Border_param, class Sparse_LA>
inline inline
typename LSCM_parameterizer_3<Adaptor, Border_param, Sparse_LA>::Error_code typename LSCM_parameterizer_3<Adaptor, Border_param, Sparse_LA>::Error_code
LSCM_parameterizer_3<Adaptor, Border_param, Sparse_LA>:: LSCM_parameterizer_3<Adaptor, Border_param, Sparse_LA>::
setup_triangle_relations(LeastSquaresSolver& solver, setup_triangle_relations(LSS_Matrix& A, LSS_Vector& B,
const Adaptor& mesh, const Adaptor& mesh,
Facet_const_handle facet) Facet_const_handle facet)
{ {
@ -537,23 +554,14 @@ setup_triangle_relations(LeastSquaresSolver& solver,
// //
// Real part // Real part
// Note: b = 0 // Note: b = 0
solver.begin_row() ;
solver.add_coefficient(u0_id, -a+c) ; // TODO
solver.add_coefficient(v0_id, b-d) ;
solver.add_coefficient(u1_id, -c) ;
solver.add_coefficient(v1_id, d) ;
solver.add_coefficient(u2_id, a) ;
solver.end_row() ;
// //
// Imaginary part // Imaginary part
// Note: b = 0 // Note: b = 0
solver.begin_row() ;
solver.add_coefficient(u0_id, -b+d) ; // TODO
solver.add_coefficient(v0_id, -a+c) ;
solver.add_coefficient(u1_id, -d) ;
solver.add_coefficient(v1_id, -c) ;
solver.add_coefficient(v2_id, a) ;
solver.end_row() ;
return Base::OK; return Base::OK;
} }
@ -574,8 +582,10 @@ set_mesh_uv_from_system(Adaptor& mesh,
// Note : 2*index --> u // Note : 2*index --> u
// 2*index + 1 --> v // 2*index + 1 --> v
NT u = solver.variable(2*index ).value() ;
NT v = solver.variable(2*index + 1).value() ; double u, v;
// TODO
// Fill vertex (u,v) and mark it as "parameterized" // Fill vertex (u,v) and mark it as "parameterized"
mesh.set_vertex_uv(vertexIt, Point_2(u,v)); mesh.set_vertex_uv(vertexIt, Point_2(u,v));