diff --git a/Skin_surface_3/doc_tex/Skin_surface_3/PkgDescription.tex b/Skin_surface_3/doc_tex/Skin_surface_3/PkgDescription.tex index c0fd6d3700d..66d76ce67e5 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3/PkgDescription.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3/PkgDescription.tex @@ -4,10 +4,10 @@ Skin surfaces are used for modeling large molecules in biological computing. The surface is defined by a set of balls, representing the atoms of the molecule, and a shrink factor that determines the - size of the smooth patches glueing the balls together. + size of the smooth patches gluing the balls together. The construction of a triangular mesh of a smooth skin surface is - often necessary for further analysis and for fast visualisation. + often necessary for further analysis and for fast visualization. This package provides functions to construct a triangular mesh approximating the skin surface from a set of balls and a shrink factor. It also contains code to subdivide the mesh efficiently. diff --git a/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex b/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex index 904e0d210ad..84a9aceefed 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3/SkinSurface3.tex @@ -256,7 +256,7 @@ GHz, with 1 Gb of memory. \begin{center} \begin{tabular}{|l|c|c|c|} \hline - Dataset & Number of weighted points & Coarse mesh & first subdivision step\\ + Data set & Number of weighted points & Coarse mesh & first subdivision step\\ \hline \hline Caffeine& 23 & 0.2 sec. & 0.05 sec.\\ diff --git a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Compute_anchor_3.tex b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Compute_anchor_3.tex index 28735f62b09..8f37da2585b 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Compute_anchor_3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Compute_anchor_3.tex @@ -23,7 +23,7 @@ center of the simplex (cell) or with the center of one of its faces. The class \ccRefName\ defines functions for the computation of the anchor point of a given Regular simplex (Power cell). Given a Regular -simplex, it returns the lowest dimesional simplex that has the same +simplex, it returns the lowest dimensional simplex that has the same anchor point. For Voronoi cells, it returns the dual Regular simplex of the lowest dimensional Voronoi cell with the same anchor point. diff --git a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Construct_anchor_point_3.tex b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Construct_anchor_point_3.tex index 40f2bed76a5..24f0b1258ee 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Construct_anchor_point_3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Construct_anchor_point_3.tex @@ -37,7 +37,7 @@ from the centers of a Delaunay simplex and a Voronoi cell. \ccConstructor{Construct_anchor_point_3(RT shrink);}{The function object is - initialised with the shrink factor.} + initialized with the shrink factor.} \ccOperations diff --git a/Skin_surface_3/doc_tex/Skin_surface_3_ref/MarchingTetrahedraTraits_3.tex b/Skin_surface_3/doc_tex/Skin_surface_3_ref/MarchingTetrahedraTraits_3.tex index 77d1b5859ac..9f015f5eb6d 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3_ref/MarchingTetrahedraTraits_3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3_ref/MarchingTetrahedraTraits_3.tex @@ -30,7 +30,7 @@ triangulation. % the \ccc{triangulation} to points defined by the \ccc{HDS}} \ccNestedType{Triangulation;}{The type of the triangulation} -\ccNestedType{Halfedge_DS;}{The type of the halfedge data structure} +\ccNestedType{Halfedge_DS;}{The type of the half-edge data structure} \ccNestedType{Cell_handle;}{handle to the Cell type of the triangulation} % \ccGlue diff --git a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_quadratic_surface_3.tex b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_quadratic_surface_3.tex index 5be23172948..970c59cf1c8 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_quadratic_surface_3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_quadratic_surface_3.tex @@ -45,7 +45,7 @@ The geometric types used by the quadratic surface: \ccCreationVariable{surf} %% choose variable name \ccConstructor{Skin_surface_quadratic_surface_3(RT Q[], Point a, RT - c);}{Constucts a quadratic surface with defining matrix $Q$, apex + c);}{Constructs a quadratic surface with defining matrix $Q$, apex $a$ and function value $c$ at the apex.} %\ccOperations diff --git a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_sphere_3.tex b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_sphere_3.tex index c69a247f6f2..192dc52cf54 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_sphere_3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Skin_surface_sphere_3.tex @@ -69,7 +69,7 @@ The geometric types used by the sphere: \ccc{to_surface(s.source(), s.target())}.} The following two functions give an implicit representation of the -skin surface. Each quadratic surface is defined as the zeroset of a +skin surface. Each quadratic surface is defined as the zero set of a scalar valued function. Using the mixed complex, we define the skin surface as a piecewise implicit function, and this function is $C^1$. diff --git a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Triangulation_incremental_builder_3.tex b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Triangulation_incremental_builder_3.tex index 47ae814b793..3ce5077d4d8 100644 --- a/Skin_surface_3/doc_tex/Skin_surface_3_ref/Triangulation_incremental_builder_3.tex +++ b/Skin_surface_3/doc_tex/Skin_surface_3_ref/Triangulation_incremental_builder_3.tex @@ -52,7 +52,7 @@ to be positive. \ccOperations -\ccMethod{void begin_triangulation(int dim);}{Initialises the +\ccMethod{void begin_triangulation(int dim);}{Initializes the triangulation and sets the dimension to \ccc{dim}.} \ccMethod{void end_triangulation();}{Finalizes the triangulation.} diff --git a/Skin_surface_3/include/CGAL/Skin_surface_3.h b/Skin_surface_3/include/CGAL/Skin_surface_3.h index a56b517ba33..fea4bfb1857 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_3.h @@ -98,8 +98,8 @@ Skin_surface_3(WP_iterator begin, WP_iterator end, FT shrink, bool grow_balls, Gt gt_, - bool verbose) - : Base(begin, end, shrink, grow_balls, gt_, verbose) { + bool verbose_) + : Base(begin, end, shrink, grow_balls, gt_, verbose_) { // Construct the Triangulated_mixed_complex: Triangulated_mixed_complex_observer_3 observer(shrink_factor()); diff --git a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h index c3ad592a9cd..65e363e42df 100644 --- a/Skin_surface_3/include/CGAL/Skin_surface_base_3.h +++ b/Skin_surface_3/include/CGAL/Skin_surface_base_3.h @@ -188,10 +188,10 @@ private: template template < class WP_iterator > Skin_surface_base_3:: -Skin_surface_base_3(WP_iterator begin, WP_iterator end, FT shrink, +Skin_surface_base_3(WP_iterator begin, WP_iterator end, FT shrink_, bool grow_balls, Gt gt_, bool verbose_) -: shrink(shrink), gt(gt_), verbose(verbose_) +: shrink(shrink_), gt(gt_), verbose(verbose_) { gt.set_shrink(shrink); CGAL_assertion(begin != end);