mirror of https://github.com/CGAL/cgal
Remove references to Lapack in doc and examples
This commit is contained in:
parent
63f77a05a5
commit
e4c990f16d
|
|
@ -509,15 +509,6 @@ and the \ref PkgRidges_3 packages.
|
||||||
|
|
||||||
The \sc{Eigen} web site is <A HREF="http://eigen.tuxfamily.org">`http://eigen.tuxfamily.org`</A>.
|
The \sc{Eigen} web site is <A HREF="http://eigen.tuxfamily.org">`http://eigen.tuxfamily.org`</A>.
|
||||||
|
|
||||||
\subsection thirdpartyLapack Lapack
|
|
||||||
|
|
||||||
\sc{Lapack} is a `Fortran` library for linear algebra.
|
|
||||||
|
|
||||||
In \cgal, \sc{Lapack} is an alternative to \sc{Eigen} for singular value decomposition for the \ref
|
|
||||||
PkgJet_fitting_3 and the \ref PkgRidges_3 packages.
|
|
||||||
|
|
||||||
The \sc{Lapack} web site is <A HREF="http://www.netlib.org/lapack/">`http://www.netlib.org/lapack/`</A>.
|
|
||||||
|
|
||||||
\subsection thirdpartylibQGLViewer libQGLViewer
|
\subsection thirdpartylibQGLViewer libQGLViewer
|
||||||
|
|
||||||
libQGLViewer is a 3D widget based on \sc{Qt} 4's `QGLWidget`. In case of \sc{Qt}5 used, libQGLViewer needs to be recompiled with the proper \sc{Qt}5 version.
|
libQGLViewer is a 3D widget based on \sc{Qt} 4's `QGLWidget`. In case of \sc{Qt}5 used, libQGLViewer needs to be recompiled with the proper \sc{Qt}5 version.
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@
|
||||||
to solve in the least square sense a linear system with a singular value decomposition
|
to solve in the least square sense a linear system with a singular value decomposition
|
||||||
|
|
||||||
\cgalHasModel `CGAL::Eigen_svd`
|
\cgalHasModel `CGAL::Eigen_svd`
|
||||||
\cgalHasModel `CGAL::Lapack_svd`
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
class SvdTraits {
|
class SvdTraits {
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,6 @@
|
||||||
- `CGAL::Eigen_sparse_matrix`
|
- `CGAL::Eigen_sparse_matrix`
|
||||||
- `CGAL::Eigen_sparse_symmetric_matrix`
|
- `CGAL::Eigen_sparse_symmetric_matrix`
|
||||||
- `CGAL::Internal_diagonalize_traits`
|
- `CGAL::Internal_diagonalize_traits`
|
||||||
- `CGAL::Lapack_svd`
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -49,10 +49,8 @@ class:
|
||||||
|
|
||||||
The concept `SvdTraits` defines an interface for solving in the least
|
The concept `SvdTraits` defines an interface for solving in the least
|
||||||
square sense a linear system with a singular value decomposition. The
|
square sense a linear system with a singular value decomposition. The
|
||||||
field type is `double`. We provide two models for this concept:
|
field type is `double`. We provide the model `Eigen_svd` that uses the
|
||||||
|
\ref thirdpartyEigen library.
|
||||||
- `Eigen_svd` uses the \ref thirdpartyEigen library.
|
|
||||||
- `Lapack_svd` uses the \ref thirdpartyLapack library.
|
|
||||||
|
|
||||||
Here is a simple example that shows how to handle matrices, vectors
|
Here is a simple example that shows how to handle matrices, vectors
|
||||||
and this solver:
|
and this solver:
|
||||||
|
|
|
||||||
|
|
@ -16,22 +16,12 @@ if ( CGAL_FOUND )
|
||||||
|
|
||||||
include_directories (BEFORE "../include")
|
include_directories (BEFORE "../include")
|
||||||
|
|
||||||
# Use Eigen or BLAS and LAPACK (optional)
|
# Use Eigen
|
||||||
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
|
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
|
||||||
if (NOT EIGEN3_FOUND)
|
|
||||||
find_package(LAPACK)
|
if (EIGEN3_FOUND)
|
||||||
if(LAPACK_FOUND)
|
|
||||||
include( ${LAPACK_USE_FILE} )
|
|
||||||
endif(LAPACK_FOUND)
|
|
||||||
else()
|
|
||||||
include( ${EIGEN3_USE_FILE} )
|
include( ${EIGEN3_USE_FILE} )
|
||||||
endif()
|
|
||||||
|
|
||||||
if(EIGEN3_FOUND OR LAPACK_FOUND)
|
|
||||||
create_single_source_cgal_program( "singular_value_decomposition.cpp" )
|
create_single_source_cgal_program( "singular_value_decomposition.cpp" )
|
||||||
endif()
|
|
||||||
|
|
||||||
if(EIGEN3_FOUND)
|
|
||||||
create_single_source_cgal_program( "sparse_solvers.cpp" )
|
create_single_source_cgal_program( "sparse_solvers.cpp" )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,8 @@
|
||||||
// If Eigen is available, use it, otherwise switch to Lapack
|
|
||||||
#ifdef CGAL_EIGEN3_ENABLED
|
#ifdef CGAL_EIGEN3_ENABLED
|
||||||
#include <CGAL/Eigen_matrix.h>
|
#include <CGAL/Eigen_matrix.h>
|
||||||
#include <CGAL/Eigen_vector.h>
|
#include <CGAL/Eigen_vector.h>
|
||||||
#include <CGAL/Eigen_svd.h>
|
#include <CGAL/Eigen_svd.h>
|
||||||
typedef CGAL::Eigen_svd Svd;
|
typedef CGAL::Eigen_svd Svd;
|
||||||
|
|
||||||
#else
|
|
||||||
#ifdef CGAL_LAPACK_ENABLED
|
|
||||||
#include <CGAL/Lapack_svd.h>
|
|
||||||
typedef CGAL::Lapack_svd Svd;
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef Svd::FT FT;
|
typedef Svd::FT FT;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue