diff --git a/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Eigen_svd.h b/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Eigen_svd.h index 32b21c3f5da..974d4ffa48a 100644 --- a/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Eigen_svd.h +++ b/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Eigen_svd.h @@ -6,7 +6,7 @@ namespace CGAL { The class `Eigen_svd` provides an algorithm to solve in the least square sense a linear system with a singular value decomposition using -\ref thirdpartyEigen Eigen. The field type is `double`. +\ref thirdpartyEigen. The field type is `double`. \cgalModels `SvdTraits` diff --git a/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Monge_via_jet_fitting.h b/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Monge_via_jet_fitting.h index 221f7854f26..4ef43b7b82d 100644 --- a/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Monge_via_jet_fitting.h +++ b/Jet_fitting_3/doc/Jet_fitting_3/CGAL/Monge_via_jet_fitting.h @@ -93,7 +93,7 @@ Monge_form(); Point on the fitted surface where differential quantities are computed. */ -Point_3 origin(); +Point_3 origin() const; /// @} @@ -103,17 +103,17 @@ Point_3 origin(); /*! */ -Vector_3 maximal_principal_direction(); +Vector_3 maximal_principal_direction() const; /*! */ -Vector_3 minimal_principal_direction(); +Vector_3 minimal_principal_direction() const; /*! */ -Vector_3 normal_direction(); +Vector_3 normal_direction() const; /// @} @@ -123,17 +123,17 @@ Vector_3 normal_direction(); /*! \f$ i=0\f$ for the maximum and \f$ i=1\f$ for the minimum. */ -FT principal_curvatures(size_t i); +FT principal_curvatures(size_t i)const; /*! \f$ 0 \leq i \leq3\f$ */ -FT third_order_coefficients(size_t i); +FT third_order_coefficients(size_t i) const; /*! \f$ 0 \leq i \leq4\f$ */ -FT fourth_order_coefficients(size_t i); +FT fourth_order_coefficients(size_t i) const; /// @} diff --git a/Jet_fitting_3/doc/Jet_fitting_3/Jet_fitting_3.txt b/Jet_fitting_3/doc/Jet_fitting_3/Jet_fitting_3.txt index 7f2bb1342f9..3b0b01bef55 100644 --- a/Jet_fitting_3/doc/Jet_fitting_3/Jet_fitting_3.txt +++ b/Jet_fitting_3/doc/Jet_fitting_3/Jet_fitting_3.txt @@ -152,9 +152,9 @@ vector may not be good. The nearer this direction to the tangent plane the worse the estimation.
  • As observed in \cite cgal:cp-edqpf-05 (section 3.1), the -interpolating problem is not poised if the points project, +interpolating problem is not well posed if the points project, into the fitting frame, onto an algebraic curve of degree \f$ d\f$. More -generally, the problem is ill poised if the condition number is too +generally, the problem is ill posed if the condition number is too large. In these cases, even if a result is provided, the estimation may not @@ -219,14 +219,14 @@ In addition, the class `Monge_via_jet_fitting` stores \subsection Jet_fitting_3TemplateParameters Template Parameters -\subsection Jet_fitting_3TemplateparameterDataKernel Template parameter DataKernel +\subsubsection Jet_fitting_3TemplateparameterDataKernel Template parameter DataKernel This concept provides the types for the input sample points, together with \f$ 3d\f$ vectors and a number type. It is used as template for the class `Monge_via_jet_fitting`. Typically, one can use `Cartesian`. -\subsection Jet_fitting_3TemplateparameterLocalKernel Template parameter LocalKernel +\subsubsection Jet_fitting_3TemplateparameterLocalKernel Template parameter LocalKernel This is a parameter of the class `Monge_via_jet_fitting`. @@ -240,14 +240,14 @@ these types are converted back to `DataKernel` ones. Typically, one can use `Cartesian` which is the default. -\subsection Jet_fitting_3TemplateparameterSvdTraits Template parameter SvdTraits +\subsubsection Jet_fitting_3TemplateparameterSvdTraits Template parameter SvdTraits This concept provides the number, vector and matrix types for algebra operations required by the fitting method in `Monge_via_jet_fitting` . The main method is a linear solver using a singular value decomposition. -\subsection Jet_fitting_3CompatibilityRequirements Compatibility Requirements +\subsubsection Jet_fitting_3CompatibilityRequirements Compatibility Requirements To solve the fitting problem, the sample points are first converted from the `DataKernel` to the `LocalKernel` (this is done using @@ -279,7 +279,7 @@ vertices of a given mesh. The neighborhood of a given vertex is computed using rings on the triangulation. Results are twofold:
    • a human readable text file featuring the `Monge_via_jet_fitting::Monge_form` and -numerical informations on the computation : condition number and the +numerical informations on the computation: condition number and the PCA basis;
    • another text file that records raw data (better for a vizualization post-processing). @@ -308,8 +308,8 @@ The three bases involved in the estimation. \subsection Jet_fitting_3ComputingaBasisfortheFitting Computing a Basis for the Fitting -Input : samples -Output : fitting-basis +Input: samples +Output: fitting-basis Performing a PCA requires diagonalizing a symmetric matrix. This analysis gives an orthonormal basis whose \f$ z\f$-axis is provided by the @@ -331,8 +331,8 @@ direction. \subsection secsolving Solving the Interpolation / Approximation Problem -Input : samples, fitting-basis -Output : coefficients \f$ A_{i,j}\f$ +Input: samples, fitting-basis +Output: coefficients \f$ A_{i,j}\f$ of the bivariate fitted polynomial in the fitting-basis Computations are done in the fitting-basis and the origin is the point @@ -393,7 +393,7 @@ D_r & 0_{r,\ N_d-r}\\ \f$ The number \f$ r\f$, which is the number of non zero singular values, is strictly lower than \f$ N_d\f$ if the system is under constrained. In any -case, the unique solution which minimize \f$ ||A||_2\f$ is given by : +case, the unique solution which minimize \f$ ||A||_2\f$ is given by: \f[ \begin{equation} @@ -433,10 +433,10 @@ condition number of the system. For more on these alternatives, see \subsection Jet_fitting_3PrincipalCurvatureDirections Principal Curvature / Directions -Input : coefficients of the fit \f$ A_{i,j}\f$, +Input: coefficients of the fit \f$ A_{i,j}\f$, fitting-basis -Output : Monge basis wrt fitting-basis and world-basis +Output: Monge basis wrt fitting-basis and world-basis In the fitting basis, we have determined a height function expressed @@ -482,10 +482,10 @@ translated by \f$ p\f$, i.e. the coordinates of the origin point are \subsection Jet_fitting_3ComputingHigherOrderMongeCoefficients Computing Higher Order Monge Coefficients -Input : coefficients of the fit, Monge basis wrt fitting-basis (\f$ P_{F +Input: coefficients of the fit, Monge basis wrt fitting-basis (\f$ P_{F \rightarrow M}\f$) -Output : third and fourth order coefficients of Monge +Output: third and fourth order coefficients of Monge We use explicit formula. The implicit equation of the fitted polynomial surface in the fitting-basis with origin the point @@ -518,7 +518,7 @@ and \f$ g\f$ by \f$ f_{i,j,k}=\frac{\partial^{i+j+k}f}{\partial^ix \f$ g_{0,2}=k_2\f$. The partial derivative of order \f$ n\f$ of \f$ f\f$ depends on the matrix \f$ P_{F\rightarrow M}\f$ and the partial derivatives of order at most \f$ n\f$ of \f$ J_{A,d}\f$. The third and fourth order coefficients of are -computed with the implicit function theorem. For instance : +computed with the implicit function theorem. For instance: \f{eqnarray*}{ &b_0=g_{3,0}=-{\frac { f_{3,0,0} f_{0,0,1} -3\, f_{1,0,1} f_{2,0,0} }{