From 2848158354cff1436e0b4322aa12476a81dbc93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Mon, 20 May 2019 08:54:04 +0200 Subject: [PATCH] Fix typos --- ...Advancing_front_surface_reconstruction.txt | 2 +- .../Algebraic_foundations.txt | 2 +- .../Algebraic_kernel_d/Shear_controller.h | 2 +- .../include/CGAL/_test_algebraic_kernel_1.h | 2 +- .../Apollonius_graph_2/Finite_edge_test8_C2.h | 4 +-- .../Apollonius_graph_2/Finite_edge_test_C2.h | 6 ++-- Arrangement_on_surface_2/TODO | 2 +- .../xalci/data/test_sequence | 2 +- .../Arrangement_on_surface_2.txt | 2 +- .../Arr_geometry_traits/Bezier_x_monotone_2.h | 10 +++---- .../Arr_lm_nearest_neighbor.h | 2 +- .../CGAL/Arr_point_location/Td_traits.h | 2 +- .../Trapezoidal_decomposition_2.h | 2 +- .../include/CGAL/Arr_polycurve_traits_2.h | 4 +-- .../CGAL/Arrangement_2/Arr_traits_adaptor_2.h | 2 +- .../Arrangement_on_surface_2_global.h | 14 +++++----- .../Arrangement_on_surface_2_impl.h | 8 +++--- ...ltered_curved_kernel_via_analysis_2_impl.h | 2 +- .../gfx/Curve_renderer_2.h | 2 +- .../include/CGAL/IO/Arrangement_2_reader.h | 2 +- .../include/CGAL/IO/Fig_stream.h | 2 +- .../cgal_test_with_cmake | 2 +- ...st_unbounded_rational_direct_insertion.cpp | 2 +- .../test_unbounded_rational_insertion.cpp | 2 +- BGL/include/CGAL/boost/graph/selection.h | 12 ++++---- .../Barycentric_coordinates_2.txt | 22 +++++++-------- .../help/index.html | 2 +- .../Boolean_set_operations_2/Gps_agg_op.h | 2 +- .../Gps_on_surface_base_2.h | 4 +-- .../doc/Bounding_volumes/Bounding_volumes.txt | 2 +- .../Khachiyan_approximation_impl.h | 2 +- CGAL_Core/include/CGAL/CORE/CoreIO_impl.h | 2 +- CGAL_Core/include/CGAL/CORE/poly/Sturm.h | 2 +- .../include/CGAL/constructions/kernel_ftC2.h | 4 +-- .../benchmark/arrangement_traits/benchmark.h | 2 +- .../incremental_insertion/benchmark.h | 2 +- .../benchmark/parser/benchmark_visitor.h | 2 +- .../intersecting_spheres.cpp | 2 +- .../Combinatorial_map/map_3_foreach.cpp | 10 +++---- .../include/CGAL/Combinatorial_map.h | 4 +-- .../CGAL/Combinatorial_map_insertions.h | 4 +-- Documentation/doc/biblio/geom.bib | 2 +- .../Env_divide_and_conquer_2_impl.h | 2 +- .../Envelope_2/test_envelope_segments.cpp | 2 +- Envelope_3/doc/Envelope_3/Envelope_3.txt | 2 +- .../Envelope_divide_and_conquer_3.h | 22 +++++++-------- .../Envelope_3/Envelope_element_visitor_3.h | 2 +- .../include/CGAL/Generalized_map.h | 4 +-- Generator/include/CGAL/point_generators_3.h | 4 +-- .../CGAL/Qt/GraphicsViewNavigation_impl.h | 2 +- GraphicsView/include/CGAL/Qt/camera.h | 2 +- GraphicsView/include/CGAL/Qt/camera_impl.h | 4 +-- HalfedgeDS/include/CGAL/HalfedgeDS_list.h | 6 ++-- HalfedgeDS/include/CGAL/HalfedgeDS_vector.h | 6 ++-- INSTALL.md | 2 +- Installation/CHANGES.md | 2 +- ...CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp | 2 +- .../include/CGAL/auto_link/auto_link.h | 2 +- Interpolation/TODO | 4 +-- ...s_for_voronoi_intersection_cartesian_2_3.h | 4 +-- .../include/CGAL/Interval_skip_list.h | 2 +- .../doc/Jet_fitting_3/Jet_fitting_3.txt | 2 +- Kernel_23/doc/Kernel_23/CGAL/Vector_2.h | 2 +- Kernel_23/doc/Kernel_23/CGAL/Vector_3.h | 2 +- Kernel_d/doc/Kernel_d/CGAL/Epick_d.h | 6 ++-- .../CGAL/Kernel_d/function_objectsCd.h | 2 +- .../CGAL/Linear_cell_complex_constructors.h | 2 +- Mesh_3/archive/applications/thread_queue.h | 2 +- Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h | 4 +-- .../CGAL/Mesh_3/Protect_edges_sizing_field.h | 2 +- .../CGAL/Mesh_3/Triangulation_helpers.h | 4 +-- .../doc/Minkowski_sum_2/Minkowski_sum_2.txt | 12 ++++---- .../include/CGAL/minkowski_sum_2.h | 2 +- Nef_2/doc/Nef_2/Nef_2.txt | 4 +-- Nef_2/include/CGAL/Nef_2/gen_point_location.h | 2 +- Nef_3/doc/Nef_3/Nef_3.txt | 2 +- Nef_S2/doc/Nef_S2/Nef_S2.txt | 2 +- Number_types/include/CGAL/Mpzf.h | 2 +- .../Protect_edges_sizing_field.h | 2 +- ...eriodic_3_triangulation_ds_vertex_base_3.h | 2 +- .../Point_set_processing_3.txt | 6 ++-- .../include/CGAL/remove_outliers.h | 2 +- .../include/CGAL/structure_point_set.h | 2 +- Polygon/doc/Polygon/Polygon.txt | 2 +- .../Polygon_mesh_processing.txt | 2 +- .../Corefinement/Face_graph_output_builder.h | 4 +-- .../internal/Snapping/snap.h | 14 +++++----- .../test_merging_border_vertices.cpp | 2 +- .../Scene_polyhedron_selection_item.cpp | 2 +- Polyhedron/demo/Polyhedron/TODO | 2 +- Polyhedron/include/CGAL/Polyhedron_3.h | 6 ++-- .../CGAL/IO/Polyhedron_builder_from_STL.h | 2 +- .../PackageDescription.txt | 2 +- Polytope_distance_d/include/CGAL/Width_3.h | 2 +- QP_solver/doc/QP_solver/CGAL/QP_models.h | 28 +++++++++---------- .../fig_src/documentation/Degeneracies.tex | 8 +++--- .../fig_src/documentation/UpperBounding.tex | 2 +- .../CGAL/QP_solver/QP_full_filtered_pricing.h | 2 +- .../QP_solver/QP_partial_filtered_pricing.h | 4 +-- QP_solver/test/QP_solver/README | 4 +-- QP_solver/test/QP_solver/test_solver.cpp | 2 +- .../masters/cgal/QPE_solver_example_bug.mps | 2 +- Ridges_3/include/CGAL/Ridges.h | 4 +-- Ridges_3/include/CGAL/Umbilics.h | 2 +- .../include/CGAL/Compact_container.h | 2 +- .../include/CGAL/Handle_with_policy.h | 2 +- STL_Extension/include/CGAL/Multiset.h | 6 ++-- .../Scale_space_reconstruction_3.txt | 2 +- Scripts/developer_scripts/autotest_cgal | 4 +-- .../doc/SearchStructures/SearchStructures.txt | 2 +- .../Set_movable_separability_2.txt | 4 +-- .../iso_rectangle_2_query_2.cpp | 2 +- .../Straight_skeleton_2.txt | 6 ++-- .../predicates/Straight_skeleton_pred_ftC2.h | 4 +-- .../doc/Surface_mesh/Surface_mesh.txt | 6 ++-- .../Surface_Mesh_Segmentation.txt | 6 ++-- .../Alpha_expansion_graph_cut.h | 2 +- .../test/Surface_mesh_segmentation/Utils.h | 2 +- .../Surface_mesh_shortest_path.h | 2 +- Surface_mesher/TODO | 2 +- .../include/CGAL/enriched_polyhedron.h | 4 +-- .../Surface_mesher/mesh_a_3d_gray_image.cpp | 2 +- .../CGAL/No_intersection_surface_sweep_2.h | 2 +- .../Surface_sweep_2/No_overlap_subcurve.h | 2 +- .../Surface_sweep_2/Surface_sweep_2_impl.h | 4 +-- TDS_2/doc/TDS_2/TDS_2.txt | 2 +- Three/include/CGAL/Three/Scene_item.h | 2 +- .../Concepts/TriangulationDataStructure.h | 4 +-- .../doc/Triangulation/Triangulation.txt | 2 +- Triangulation/include/CGAL/Triangulation.h | 2 +- .../include/CGAL/Triangulation_ds_vertex.h | 2 +- .../include/CGAL/Regular_triangulation_2.h | 2 +- Triangulation_3/TODO | 4 +-- .../demo/Triangulation_3/Scene.cpp | 4 +-- .../include/CGAL/_test_cls_delaunay_3.h | 2 +- 135 files changed, 250 insertions(+), 250 deletions(-) diff --git a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt index 8f71b5472ae..822c484934a 100644 --- a/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt +++ b/Advancing_front_surface_reconstruction/doc/Advancing_front_surface_reconstruction/Advancing_front_surface_reconstruction.txt @@ -130,7 +130,7 @@ We define the *plausibility* grade \f$ p(t) \f$ as \f$ 1/r_t \f$, if Let's have a look at the figure below. \cgalFigureBegin{figAFSRplausible,wedges.png} -Plausibility. Triangle `t'` and incidident triangles sharing edge `e` seen from the side. +Plausibility. Triangle `t'` and incident triangles sharing edge `e` seen from the side. \cgalFigureEnd \f$ \alpha_\mathrm{sliver}\f$ corresponds to the red wedge. The algorithm will never select triangle `t1` diff --git a/Algebraic_foundations/doc/Algebraic_foundations/Algebraic_foundations.txt b/Algebraic_foundations/doc/Algebraic_foundations/Algebraic_foundations.txt index 6e08371d24e..b15d831286c 100644 --- a/Algebraic_foundations/doc/Algebraic_foundations/Algebraic_foundations.txt +++ b/Algebraic_foundations/doc/Algebraic_foundations/Algebraic_foundations.txt @@ -145,7 +145,7 @@ but does not provide any arithmetic operations. As for algebraic structures this concept is also traits class oriented. The main functionality related to `RealEmbeddable` is gathered in -the class `Real_embeddable_traits`. In particular, it porivdes the boolean +the class `Real_embeddable_traits`. In particular, it provides the boolean tag `Is_real_embeddable` indicating whether a type is a model of `RealEmbeddable`. The comparison operators are required to be realized via \cpp operator overloading. diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h index 1c4c16fa68b..8635c252d0b 100644 --- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h +++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Shear_controller.h @@ -110,7 +110,7 @@ namespace CGAL { int pos_next_factor; - // Unsuccessfull shear factors + // Unsuccessful shear factors std::set bad_shears; }; diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h index b84293b0c69..53e07a6c1f5 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_algebraic_kernel_1.h @@ -339,7 +339,7 @@ void test_algebraic_kernel_1(const AlgebraicKernel_d_1& ak_1){ c0i != coeffs.end(); c0i++) { for (typename std::vector< int >::const_iterator c2i = coeffs.begin(); c2i != coeffs.end(); c2i++) { - // we basically test a quadratic polynomial (with choosen small and large + // we basically test a quadratic polynomial (with chosen small and large // quadratic and constant coefficient, which is disturbed by a root close to zero). //Polynomial_1 poly((*c2i*x*x - *c0i) * (c*x-1)); Polynomial_1 poly((*c2i*x*x - *c0i) * (c*x-1)); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h index bdff3dbd9e2..04552d6598d 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test8_C2.h @@ -386,7 +386,7 @@ public: // both circles exist - // check whether the shadow region is connected, i.e., wether it is + // check whether the shadow region is connected, i.e., whether it is // of the form (a, b) or (-oo, a) U (b, +oo) Bitangent_line bl_12(p1, p2); @@ -524,7 +524,7 @@ public: // both circles exist - // check whether the shadow region is connected, i.e., wether it is + // check whether the shadow region is connected, i.e., whether it is // of the form (a, b) or (-oo, a) U (b, +oo) Bitangent_line bl_12(p1, p2); diff --git a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h index 097c507ff49..ed326d992ac 100644 --- a/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h +++ b/Apollonius_graph_2/include/CGAL/Apollonius_graph_2/Finite_edge_test_C2.h @@ -383,7 +383,7 @@ public: // both circles exist - // check whether the shadow region is connected, i.e., wether it is + // check whether the shadow region is connected, i.e., whether it is // of the form (a, b) or (-oo, a) U (b, +oo) Bitangent_line bl_12(p1, p2); @@ -507,7 +507,7 @@ public: // both circles exist - // check whether the shadow region is connected, i.e., wether it is + // check whether the shadow region is connected, i.e., whether it is // of the form (a, b) or (-oo, a) U (b, +oo) Bitangent_line bl_12(p1, p2); @@ -581,7 +581,7 @@ public: // both circles exist - // check whether the shadow region is connected, i.e., wether it is + // check whether the shadow region is connected, i.e., whether it is // of the form (a, b) or (-oo, a) U (b, +oo) return !b; diff --git a/Arrangement_on_surface_2/TODO b/Arrangement_on_surface_2/TODO index fdd2033cfa3..8a6f37d6457 100644 --- a/Arrangement_on_surface_2/TODO +++ b/Arrangement_on_surface_2/TODO @@ -125,7 +125,7 @@ pair of begin/end functions can be changed, so that they return a range of objects that represent either edges or vertices. - The second problem can be fixed by introducing a heirarchy of 2 layers + The second problem can be fixed by introducing a hierarchy of 2 layers to the arrangement with history. The top layer represent the split of general curves into x-monotone curves, and the one below represents the split at intersection points. As a response to a user request for the items diff --git a/Arrangement_on_surface_2/archive/demo/Arr_algebraic_segment_traits_2/xalci/data/test_sequence b/Arrangement_on_surface_2/archive/demo/Arr_algebraic_segment_traits_2/xalci/data/test_sequence index 472cfb8be36..9ac0c3de83b 100644 --- a/Arrangement_on_surface_2/archive/demo/Arr_algebraic_segment_traits_2/xalci/data/test_sequence +++ b/Arrangement_on_surface_2/archive/demo/Arr_algebraic_segment_traits_2/xalci/data/test_sequence @@ -7,7 +7,7 @@ Curve_analyser INPUT "P[6(0,P[6(0,34186452217925)(1,-47333108912824)(2,859012718 // Same with some content Curve_analyser INPUT "P[6(0,P[10(0,239305165525475)(1,-433891119043543)(2,-105547852922974)(3,544084567642102)(4,-168636318668897)(5,-121992740815323)(6,34879008294620)(7,11799206430140)(8,-36175872)(9,85786624)(10,33947648)])(1,P[9(0,-54239848065004)(1,99913497126828)(2,19760931822856)(3,-122064771317912)(4,42619705096452)(5,24317888697724)(6,-8140916911648)(7,-2166674406544)(8,128057344)(9,59899904)])(2,P[8(0,7433741935312)(1,-9062611931072)(2,-7038911122368)(3,10741692910944)(4,-394721728272)(5,-1679188229536)(6,-164069376)(7,107249664)(8,54984704)])(3,P[7(0,-218665076224)(1,264879835136)(2,207970109440)(3,-313676665856)(4,10561338880)(5,48743222272)(6,133627904)(7,53608448)])(4,P[6(0,68812800)(1,23724032)(2,52953088)(3,-109314048)(4,-168689664)(5,85590016)(6,46923776)])(5,P[5(1,219054080)(2,-93880320)(3,-281640960)(4,93880320)(5,62586880)])(6,P[4(0,28672000)(1,-12288000)(2,-36864000)(3,12288000)(4,8192000)])]" -hmm smth realy heavy... +hmm smth really heavy... P[34(0,P[34(0,12952101536523102192492711540000000)(1,-84147098480789650665250232160000000)(2,-69088664533801811202671946450000000)(3,-12990598879942044092505125010000000)(4,27052642714728288021127698670000000)(5,26683266093731013401148721880000000)(6,5372171464167151111739335793000000)(7,-8934425711222817088377016721000000)(8,-8465742196405103553796952613000000)(9,-1737345552069859077855633714000000)(10,2393898184518898797964635987000000)(11,2234406641615936885853597509000000)(12,479873852041504440602579852100000)(13,-547557654615450328195988452500000)(14,-514849404082170848294946339800000)(15,-115417366169449334489378073500000)(16,113234224818672992436814644400000)(17,107962164812116405549461548900000)(18,25135425283858380820959007860000)(19,-21694664362506393046334314800000)(20,-21025627462526285456489755280000)(21,-5057323915115735386146156273000)(22,3901460484323335482987702100000)(23,3846534854318572165730297444000)(24,950752053910955172204451437900)(25,-665241246757279897517641949200)(26,-666960287213849591322741077200)(27,-168596633306616989111809611900)(28,108415065221291211390422093200)(29,110420084629074642463546936400)(30,28431730759059073988652406240)(31,-16992776198434916741021022360)(32,-17557477656685153453414375500)(33,-4588689239444215584479993393)(34,2574250362779616822482848012)])(2,P[0(0,-123917486647761741318703576800000000)])(4,P[0(0,79246903881551255661144190100000000)])(6,P[0(0,2186663392639010037975810829000000)])(8,P[0(0,-30912413603643981961132659450000000)])(10,P[0(0,22784177877224038711887972820000000)])(12,P[0(0,-8699274014787859551101246025000000)])(14,P[0(0,836940561843498171726587625200000)])(16,P[0(0,1367060050733175030564444040000000)])(18,P[0(0,-1171114486352462799313004128000000)])(20,P[0(0,567955949125204086770735562700000)])(22,P[0(0,-181911283701056707932126214300000)])(24,P[0(0,25732945948997554536421517900000)])(26,P[0(0,13209567106923403694087544950000)])(28,P[0(0,-13184322903675827636908029720000)])(30,P[0(0,6798109015505303221533146500000)])(32,P[0(0,-2528588426392935931038968129000)])(34,P[0(0,669962430844565364862639688900)])] Maldenbrot's curve: 0 segments ? diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt index dc4d957e931..8611c6bc49e 100644 --- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt +++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Arrangement_on_surface_2.txt @@ -782,7 +782,7 @@ ability to answer such queries effectively. The `Arrangement_2` class template does not support point-location queries directly, as the arrangement representation is decoupled from the geometric algorithms that operate on it. The 2D Arrangements -package includes a set of classe templates that are capable of +package includes a set of class templates that are capable of answering such queries; all are models of the concept `ArrangementPointLocation_2`. Each model employs a different algorithm or strategy for answering queries. A model of this diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h index ae06841ffea..c47a5dc5096 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Bezier_x_monotone_2.h @@ -590,7 +590,7 @@ private: * \param cache Caches the vertical tangency points and intersection points. * \param ipts Output: A vector of intersection points + multiplicities. * \param ovlp_cv Output: An overlapping subcurve (if exists). - * \return Whether an overlap has occured. + * \return Whether an overlap has occurred. */ bool _intersect (const Self& cv, Intersection_map& inter_map, @@ -1488,14 +1488,14 @@ bool _Bezier_x_monotone_2::_is_in_range if ((p_gt_ps && p_lt_pt) || (p_lt_ps && p_gt_pt)) { - // The point p is definately in the x-range of the subcurve, as its + // The point p is definitely in the x-range of the subcurve, as its // parameter is between the source and target parameters. return (true); } if ((p_lt_ps && p_lt_pt) || (p_gt_ps && p_gt_pt)) { - // The point p is definately not in the x-range of the subcurve, + // The point p is definitely not in the x-range of the subcurve, // as its parameter is smaller than both source and target parameter // (or greater than both of them). return (false); @@ -1562,14 +1562,14 @@ bool _Bezier_x_monotone_2::_is_in_range if ((p_gt_ps && p_lt_pt) || (p_lt_ps && p_gt_pt)) { - // The point p is definately in the x-range of the subcurve, as its + // The point p is definitely in the x-range of the subcurve, as its // parameter is between the source and target parameters. return (true); } if ((p_lt_ps && p_lt_pt) || (p_gt_ps && p_gt_pt)) { - // The point p is definately not in the x-range of the subcurve, + // The point p is definitely not in the x-range of the subcurve, // as its parameter is smaller than both source and target parameter // (or greater than both of them). return (false); diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h index 9fc37cacd11..5c97ae275dd 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_nearest_neighbor.h @@ -42,7 +42,7 @@ namespace CGAL { /*! \class * A class that answers nearest neighbor queries. - * It recieves a set of points, and builds a kd-tree for them. + * It receives a set of points, and builds a kd-tree for them. * Given a query point, it finds the closest point to the query. */ template diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h index 3d7d706e655..03d229e8aa6 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Td_traits.h @@ -719,7 +719,7 @@ public: m_traits->construct_min_vertex_2_object()( ce2.cv()) : m_traits->construct_max_vertex_2_object()( ce2.cv()) ), ce1.cv(), ce1.ce()); - //need to return the opposite because the function recieved + //need to return the opposite because the function received // the curve ends in a reverse order if (res != EQUAL) return (res == SMALLER) ? LARGER : SMALLER; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h index 5a95a74b6fb..02f099b8b54 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h @@ -1899,7 +1899,7 @@ public: return old; } - //This method occasionaly(!) checks the guarantees + //This method occasionally(!) checks the guarantees // It is currently not in use, since the guarantees are constantly checked in O(1) time bool needs_update() { diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h index c1271e03fc5..ba5c3a9b30b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h @@ -878,7 +878,7 @@ public: // The left point of the current subcurve of one polycurve // coincides with the current subcurve of the other polycurve. if (left_overlap) { - // An overlap occured at the previous iteration: + // An overlap occurred at the previous iteration: // Output the overlapping polycurve. CGAL_assertion(ocv.number_of_subcurves() > 0); *oi++ = make_object(ocv); @@ -887,7 +887,7 @@ public: else { // The left point of the current subcurve of one // polycurve coincides with the current subcurve of the - // other polycurve, and no overlap occured at the + // other polycurve, and no overlap occurred at the // previous iteration: Output the intersection // point. The derivative of at least one of the // polycurves is not defined at this point, so we give diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h index aac94d85371..139a06473f6 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h @@ -251,7 +251,7 @@ public: if (is_vertical(xcv1)) return (is_vertical(xcv2)) ? EQUAL : SMALLER; else if (is_vertical(xcv2)) return (LARGER); - // Perform the comparison based on the existance of bounded left + // Perform the comparison based on the existence of bounded left // endpoints. if (has_left1 && has_left2) { // Obtain the left endpoints of xcv1 and xcv2. diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h index c624e260824..c686a0f553c 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h +++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arrangement_on_surface_2_global.h @@ -240,7 +240,7 @@ void insert(Arrangement_on_surface_2& arr, /*! Insert a range of x-monotone curves into an empty arrangement * \param arr the resulting arrangement - * \param begin the begining of the curve range + * \param begin the beginning of the curve range * \param end past-the-end curve range */ template & arr, /*! Insert a range of x-monotone curves and a range of isolated points into * an empty arrangement * \param arr the resulting arrangement - * \param begin_xcurves the begining of the curve range + * \param begin_xcurves the beginning of the curve range * \param end_xcurves past-the-end curve range - * \param begin_points the begining of the point range + * \param begin_points the beginning of the point range * \param end_points past-the-end point range */ template & /*! Insert a range of x-monotone curves into a non-empty arrangement * \param arr the resulting arrangement - * \param begin the begining of the curve range + * \param begin the beginning of the curve range * \param end past-the-end curve range */ template :: remove_edge(Halfedge_handle e, bool remove_source, bool remove_target) { // Comment EBEB 2012-08-06: this has become a simple forwarding function - // the intelligence of wether to swap he with he->opposite() + // the intelligence of whether to swap he with he->opposite() // has been moved to _remove_edge itself, as additional computed // data is reused there @@ -2495,7 +2495,7 @@ _insert_at_vertices(DHalfedge* he_to, DInner_ccb* hole2 = (prev2->is_on_inner_ccb()) ? prev2->inner_ccb() : NULL; if ((hole1 == hole2) && (hole1 != NULL)) { - // .. only in this special case, we have to check wether swapping should + // .. only in this special case, we have to check whether swapping should // take place // EBEB 2012-07-26 the following code enables optimizations: @@ -4245,7 +4245,7 @@ _remove_edge(DHalfedge* e, bool remove_source, bool remove_target) } else { // If f1 == f2 (same_face-case), then we consider two loops that occur when - // he1 and he2 get removed; if f1 != f2, then he1 and he2 seperates the two + // he1 and he2 get removed; if f1 != f2, then he1 and he2 separates the two // faces that will be merged upon their removal---here both he1 and he2 // belong to a full cycle, and THAT IS WHY we give the f1 == f2 test to // determine whether end of loop should be he1->opposite() and @@ -4753,7 +4753,7 @@ _remove_edge(DHalfedge* e, bool remove_source, bool remove_target) // As the outer CCB of f1 may be represented by any of the // halfedges in between he1 -> ... -> he2 (the halfedges in between // are on the new outer CCB we have just created), we represent the - // former outer CCB by prev1, which definately stays on it. + // former outer CCB by prev1, which definitely stays on it. oc1->set_halfedge(prev1); // Notify the observers that a new outer CCB has been formed. diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h index 899f0903976..5c6a11da847 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/Filtered_curved_kernel_via_analysis_2_impl.h @@ -511,7 +511,7 @@ public: }; -//! checks wether and how two arcs are intersection - with first filtering +//! checks whether and how two arcs are intersection - with first filtering template < class CurvedKernelViaAnalysis_2, class FunctorBase > class Intersect_2 : public FunctorBase::Intersect_2 { diff --git a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h index da01afea544..1a1172b9ce6 100644 --- a/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Curved_kernel_via_analysis_2/gfx/Curve_renderer_2.h @@ -1200,7 +1200,7 @@ Lexit: } // while(!s_stack.empty()) std::reverse(rev_points.begin(), rev_points.end()); - // resize rev_points to accomodate the size of points vector + // resize rev_points to accommodate the size of points vector unsigned rsize = rev_points.size(); rev_points.resize(rsize + points.size()); std::copy(points.begin(), points.end(), rev_points.begin() + rsize); diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h b/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h index 39fec110b09..f54b55599eb 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Arrangement_2_reader.h @@ -251,7 +251,7 @@ namespace CGAL { { formatter.read_face_begin(); - // Allocate a new face and determine whether it is unbounded and wether it + // Allocate a new face and determine whether it is unbounded and whether it // is valid (non-fictitious). DFace* new_f = m_arr_access.new_face(); const bool is_unbounded = (formatter.read_vertex_index() != 0); diff --git a/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h b/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h index 739bc40f2e1..32d878ee56e 100644 --- a/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h +++ b/Arrangement_on_surface_2/include/CGAL/IO/Fig_stream.h @@ -514,7 +514,7 @@ public: } /*! - * Get the arrow drawing mode (this mode is relevent when drawing segments, + * Get the arrow drawing mode (this mode is relevant when drawing segments, * polylines, circular arcs or splines). */ Fig_arrow_mode arrow_mode () const diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake index 33cd53adeea..78c93619658 100755 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake @@ -1751,7 +1751,7 @@ compile_and_run test_io compile_and_run test_sgm -# if any error occured then append the full error description file to error file +# if any error occurred then append the full error description file to error file if [ -f $FULL_ERROR_DESCRIPTION_FILE ] ; then echo "******************** appending all error outputs ********************" >> $ERRORFILE diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp index dd3d5db1936..6b2cfc97cfc 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_direct_insertion.cpp @@ -107,7 +107,7 @@ int main() } } - // If a failure has already occured, abort. + // If a failure has already occurred, abort. if (result < 0) return result; std::cout << std::endl; diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp index 227b37602b3..a280ee88c83 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_unbounded_rational_insertion.cpp @@ -106,7 +106,7 @@ int main() } } - // If a failure has already occured, abort. + // If a failure has already occurred, abort. if (result < 0) return result; std::cout << std::endl; diff --git a/BGL/include/CGAL/boost/graph/selection.h b/BGL/include/CGAL/boost/graph/selection.h index 7768d62b792..720516f283c 100644 --- a/BGL/include/CGAL/boost/graph/selection.h +++ b/BGL/include/CGAL/boost/graph/selection.h @@ -85,7 +85,7 @@ Each new face added in the selection is added exactly once in `out`. \param fg the graph containing the selected faces. \param k the number of times the expansion procedure is iteratively applied. \param is_selected indicates if a face is part of the selection. It is updated by the function - to accomodate new faces added to the selection. + to accommodate new faces added to the selection. \param out new faces added to the selection are added exactly once in `out`. */ template @@ -154,7 +154,7 @@ Each face removed from the selection is added exactly once in `out`. \param fg the graph containing the selected faces. \param k the number of times the reduction procedure is iteratively applied. \param is_selected indicates if a face is part of the selection. It is updated by the function - to accomodate faces removed from the selection. + to accommodate faces removed from the selection. \param out faces removed from the selection are added exactly once in `out`. */ template @@ -271,7 +271,7 @@ Each new edge added in the selection is added exactly once in `out`. \param fg the graph containing the selected edges. \param k the number of times the expansion procedure is iteratively applied. \param is_selected indicates if an edge is part of the selection. It is updated by the function - to accomodate new edges added to the selection. + to accommodate new edges added to the selection. \param out new edges added to the selection are added exactly once in `out`. */ template @@ -337,7 +337,7 @@ Each edge removed from the selection is added exactly once in `out`. \param fg the graph containing the selected edges. \param k the number of times the reduction procedure is iteratively applied. \param is_selected indicates if an edge is part of the selection. It is updated by the function - to accomodate edges removed from the selection. + to accommodate edges removed from the selection. \param out edges removed from the selection are added exactly once in `out`. */ template @@ -424,7 +424,7 @@ Each new vertex added in the selection is added exactly once in `out`. \param fg the graph containing the selected vertices. \param k the number of times the expansion procedure is iteratively applied. \param is_selected indicates if a vertex is part of the selection. It is updated by the function - to accomodate new vertices added to the selection. + to accommodate new vertices added to the selection. \param out new vertices added to the selection are added exactly once in `out`. */ template @@ -478,7 +478,7 @@ Each vertex removed from the selection is added exactly once in `out`. \param fg the graph containing the selected vertices. \param k the number of times the reduction procedure is iteratively applied. \param is_selected indicates if a vertex is part of the selection. It is updated by the function - to accomodate vertices removed from the selection. + to accommodate vertices removed from the selection. \param out vertices removed from the selection are added exactly once in `out`. */ template diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt index 9ec647a34eb..f68af835919 100644 --- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt +++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Barycentric_coordinates_2.txt @@ -10,7 +10,7 @@ namespace CGAL { \section gbc_introduction Introduction -The package 2D Generalized Barycentric Coordinates offers an efficient and robust implementation of two-dimensional closed-form generalized barycentric coordinates defined for simple two-dimensional polygons. If coordinates with respect to multivariate scattered points instead of a polygon are required, please refer to natural neighbour coordinates from the package \ref PkgInterpolation2 "2D and Surface Function Interpolation". +The package 2D Generalized Barycentric Coordinates offers an efficient and robust implementation of two-dimensional closed-form generalized barycentric coordinates defined for simple two-dimensional polygons. If coordinates with respect to multivariate scattered points instead of a polygon are required, please refer to natural neighbor coordinates from the package \ref PkgInterpolation2 "2D and Surface Function Interpolation". In particular, the package includes an implementation of \ref wp_example "Wachspress", \ref mv_example "mean value", and \ref dh_example "discrete harmonic" coordinates and provides some extra functions to compute barycentric coordinates with respect to segments (\ref seg_example "segment coordinates") and triangles (\ref tri_example "triangle coordinates"). The section \ref gbc_theory gives a short introduction to the topic of barycentric coordinates. @@ -33,7 +33,7 @@ The output of the computation is a set of coordinate values at the current query \section gbc_examples Examples \subsection seg_example Segment Coordinates -This is a simple example to show the use of the global function \ref seg_coord_global "CGAL::Barycentric_coordinates::compute_segment_coordinates_2()". We compute coordinates at three green points along the segment \f$[v_0, v_1]\f$ and at two blue points outside this segment but along its supporting line. We use the exact kernel and return coordinates as an array of two values. Again, the symmetry of the query points helps us to recognize errors that may have occured during the computation. +This is a simple example to show the use of the global function \ref seg_coord_global "CGAL::Barycentric_coordinates::compute_segment_coordinates_2()". We compute coordinates at three green points along the segment \f$[v_0, v_1]\f$ and at two blue points outside this segment but along its supporting line. We use the exact kernel and return coordinates as an array of two values. Again, the symmetry of the query points helps us to recognize errors that may have occurred during the computation. \anchor seg_coord_example \cgalFigureBegin{seg__example,segment_coordinates_example.png} @@ -79,7 +79,7 @@ Example's point pattern. \subsection height_inter_example Height Interpolation for Terrain Modeling -This is an advanced example that shows how to use generalized barycentric coordinates for height interpolation with applications to terrain modelling. It also shows how to use a non-default traits class with our package instead of a `Kernel` traits class. Suppose we know the boundary of three-dimensional piece of terrain that can be represented as a polygon with several three-dimensional vertices, where the third dimension gives the corresponding height. The task is to propagate the height from the known sample points on the boundary to the polygon's interior. This gives an approximate estimation of the terrain's surface in this region. +This is an advanced example that shows how to use generalized barycentric coordinates for height interpolation with applications to terrain modeling. It also shows how to use a non-default traits class with our package instead of a `Kernel` traits class. Suppose we know the boundary of three-dimensional piece of terrain that can be represented as a polygon with several three-dimensional vertices, where the third dimension gives the corresponding height. The task is to propagate the height from the known sample points on the boundary to the polygon's interior. This gives an approximate estimation of the terrain's surface in this region. \cgalFigureBegin{terrain__example,terrain.png} A 2D polygon with 50 vertices representing a piece of terrain with convex and concave parts. The height is not shown. @@ -92,7 +92,7 @@ In this example we project a three-dimensional polygon orthogonally onto the two As a result we get a smooth function inside the polygon that approximates the underlying terrain's surface. \cgalFigureBegin{terrain__inter__example,terrain_interpolated.png} -The interpolated data. The colour bar represents the corresponding height. +The interpolated data. The color bar represents the corresponding height. \cgalFigureEnd \section gbc_degeneracies Degeneracies and Special Cases @@ -201,7 +201,7 @@ are also normalized. Note that they are unstable if a query point is closer than \section gbc_performance Performance -Apart from the most important requirement on barycentric coordinates to be as precise as possible, it is very important for them to be as fast as possible to evaluate. These coordinates are used in many applications where they must be computed for millions of points and, thus, the real time usage of coordinates is crucial. When writing the code, we tried to fulfil this important requirement, and in this section we present a few results about the computation times of the implemented coordinates. +Apart from the most important requirement on barycentric coordinates to be as precise as possible, it is very important for them to be as fast as possible to evaluate. These coordinates are used in many applications where they must be computed for millions of points and, thus, the real time usage of coordinates is crucial. When writing the code, we tried to fulfill this important requirement, and in this section we present a few results about the computation times of the implemented coordinates. The structure of the speed test that we ran for all functions consists of computing coordinate values (or weights) at >= 1 million strictly interior points with respect to some polygon (or triangle, or segment). At each iteration of the loop we create a query point, pass it to the function, and compute all the related coordinates. We run this loop 10 times in a row, and the time presented in the log-log scale plot at the end of the section is the arithmetic mean of all trials. @@ -244,16 +244,16 @@ Segment coordinates (blue) for all the segment points (green) with respect to th If we want to plot triangle coordinates, we follow a similar approach. We take \ref fig__tri__example "a triangle" \f$[v_0, v_1, v_2]\f$ in the plane and sample its interior and boundary with a number of points. Once we have this sampling, we plot one of the triangle coordinate functions (here with respect to the third vertex of the triangle) at all the defined sample points. Likewise, we can plot the coordinate function with respect to the first or second vertex. The resulting function is linear (shown in the figure below) that grows from zero along the first edge \f$[v_0, v_1]\f$ to one at the chosen vertex \f$v_2\f$. \cgalFigureBegin{tri__coord__interp,tri__coord__interp.png} -Triangle coordinates with respect to \f$v_2 = (1.0,\ 2.0)\f$. The colour bar indicates the range of values for the chosen coordinate. +Triangle coordinates with respect to \f$v_2 = (1.0,\ 2.0)\f$. The color bar indicates the range of values for the chosen coordinate. \cgalFigureEnd Since many applications require to work with more complex planar geometric shapes than segments and triangles, it seems natural to investigate a generalized version of triangle coordinates with respect to arbitrary polygons. The first attempt was taken in 1975 by E. L. Wachspress \cite cgal:bc:w-rfeb-75, and the resulting generalized barycentric coordinates are now called Wachspress coordinates \cite cgal:bc:mlbd-gbcip-02. \ref gbc_deg_wachspress_coordinates "These coordinates" are well-defined for arbitrary strictly convex polygons and have all the properties of triangle coordinates \cite cgal:bc:fhk-gcbcocp-06. Unfortunately, they are not well-defined for weakly convex and concave polygons. -Analogously to the previous cases, we want to plot the Wachspress coordinates and see how they look like. Let us choose a \ref wp_polygon "non-regular hexagon", slightly rotate it, and move one of its vertices towards the line through its two adjacent neighbours. We sample the interior and the boundary of this polygon as before and plot the coordinate function with respect to the vertex that we moved at all the sample points. We see that we get a smooth function, which is linear along all edges and grows from zero to one, as the colour bar indicates. +Analogously to the previous cases, we want to plot the Wachspress coordinates and see how they look like. Let us choose a \ref wp_polygon "non-regular hexagon", slightly rotate it, and move one of its vertices towards the line through its two adjacent neighbors. We sample the interior and the boundary of this polygon as before and plot the coordinate function with respect to the vertex that we moved at all the sample points. We see that we get a smooth function, which is linear along all edges and grows from zero to one, as the color bar indicates. \anchor wp_plot \cgalFigureBegin{wp__coord__interp,wp__coord__interp.png} -The Wachspress coordinate function with respect to the indicated vertex with values from zero to one as the colour bar indicates. +The Wachspress coordinate function with respect to the indicated vertex with values from zero to one as the color bar indicates. \cgalFigureEnd Another type of generalized barycentric coordinates goes back to Pinkall and Polthier in 1993 \cite cgal:pp-cdmsc-93 and Eck et al. in 1995 \cite cgal:bc:eddhls-maam-95 in the context of \ref PkgSurfaceMeshParameterization "triangle mesh parameterization". They are called discrete harmonic coordinates. \ref gbc_deg_discrete_harmonic_coordinates "These coordinates" are well-defined, similarly to Wachspress coordinates, for arbitrary strictly convex polygons and inherit all the properties of triangle coordinates apart from the positivity inside a polygon because they can take on negative values \ref gbc_deg_discrete_harmonic_coordinates "for some polygons". Another interesting property of these coordinate functions is that they coincide with Wachspress coordinates for any polygon whose vertices lie on a common circle. @@ -262,15 +262,15 @@ To plot discrete harmonic coordinates we take \ref wp_plot "the same polygon" as \anchor dh_plot \cgalFigureBegin{dh__coord__interp,dh__coord__interp.png} -The discrete harmonic coordinate function with respect to the indicated vertex with values from zero to one as the colour bar indicates. +The discrete harmonic coordinate function with respect to the indicated vertex with values from zero to one as the color bar indicates. \cgalFigureEnd The last type of generalized barycentric coordinates that we discuss are mean value coordinates \cite cgal:f-mvc-03 proposed by M. Floater in 2003. Based on the mean value theorem, \ref gbc_deg_mean_value_coordinates "these coordinates", unlike Wachspress and discrete harmonic coordinates, are well-defined for arbitrary simple polygons, inherit all the properties of triangle coordinates for any convex polygon, and lack only the positivity property for general concave polygons. Hormann and Floater prove in \cite cgal:bc:hf-mvcapp-06 that these coordinates are positive inside the kernel of a star-shaped polygon. They are also positive in the closure of any quadrilateral. Like discrete harmonic weights, mean value weights are often used in the context of \ref PkgSurfaceMeshParameterization "triangle mesh parameterization." -In order to show the particular behaviour of mean value coordinates with an application to concave polygons, we take \ref fig__mv__example "a star-shaped polygon" with ten vertices \f$[v_0, \dots, v_9]\f$, sample its interior and boundary, and plot the coordinate function with respect to the fourth vertex \f$v_3\f$. As the colour bar indicates, the obtained function grows from a slightly negative value to one at the chosen vertex. It is also smooth inside the polygon and linear along all edges. +In order to show the particular behaviour of mean value coordinates with an application to concave polygons, we take \ref fig__mv__example "a star-shaped polygon" with ten vertices \f$[v_0, \dots, v_9]\f$, sample its interior and boundary, and plot the coordinate function with respect to the fourth vertex \f$v_3\f$. As the color bar indicates, the obtained function grows from a slightly negative value to one at the chosen vertex. It is also smooth inside the polygon and linear along all edges. \cgalFigureBegin{mv__coord__interp,mv__coord__interp.png} -Mean value coordinates with respect to \f$v_3\f$. The colour bar indicates the range of values for the chosen coordinate function. +Mean value coordinates with respect to \f$v_3\f$. The color bar indicates the range of values for the chosen coordinate function. \cgalFigureEnd Interesting fact: all the coordinates discussed in this section and implemented in the package come from one and the same family of generalized barycentric coordinates named 3-point family of coordinates \cite cgal:bc:fhk-gcbcocp-06. diff --git a/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/help/index.html b/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/help/index.html index 8f530e6a2fd..1d2af17bc30 100644 --- a/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/help/index.html +++ b/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/help/index.html @@ -94,7 +94,7 @@ Close the current window

Press Ctrl+X combination keys or go to File menu and choose "Close". You may do it for any window other than the initial one, this operation will - close only the one you have choosen. If you do this for the initial parent + close only the one you have chosen. If you do this for the initial parent window, it will close the others too.

diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h index fbb71764dda..2d29616f8f7 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_op.h @@ -130,7 +130,7 @@ public: Edge_iterator itr = arr->edges_begin(); for(; itr != arr->edges_end(); ++itr) { - // take only relevant edges (which seperate between contained and + // take only relevant edges (which separate between contained and // non-contained faces. Halfedge_iterator he = itr; if(he->face()->contained() == he->twin()->face()->contained()) diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h index 24435cb3c3b..a603269074d 100644 --- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h +++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_on_surface_base_2.h @@ -51,7 +51,7 @@ \file Gps_on_surface_base_2.h \brief A class that allows Boolean set operations. This class is the base class for General_polygon_set_on_surface_2 and - recieves extra template parameter which allows different validation + receives extra template parameter which allows different validation policies. If you do not want validation then use the default validation policy. A different validation policy example can be found in General_polygon_set_on_surface_2. @@ -75,7 +75,7 @@ namespace Boolean_set_operation_2_internal //! General_polygon_set_on_surface_2 /*! This class is the base class for General_polygon_set_on_surface_2 and - recieves extra template parameter which allows different validation + receives extra template parameter which allows different validation policies. If you do not want validation then use the default validation policy. A different validation policy example can be found in General_polygon_set_on_surface_2. diff --git a/Bounding_volumes/doc/Bounding_volumes/Bounding_volumes.txt b/Bounding_volumes/doc/Bounding_volumes/Bounding_volumes.txt index e187c78077f..5cb61190869 100644 --- a/Bounding_volumes/doc/Bounding_volumes/Bounding_volumes.txt +++ b/Bounding_volumes/doc/Bounding_volumes/Bounding_volumes.txt @@ -70,7 +70,7 @@ allows to increase it easily. Bounding volumes also define geometric "center points" of objects. For example, if two objects are to be matched (approximately), one -approch is to first apply the translation that maps the centers of +approach is to first apply the translation that maps the centers of their smallest enclosing spheres onto each other. Simpler centers are possible, of course (center of gravity, center of bounding box), but more advanced bounding volumes might give better results in some diff --git a/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h b/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h index fdfd2763bc7..d925cacec31 100644 --- a/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h +++ b/Bounding_volumes/include/CGAL/Approximate_min_ellipsoid_d/Khachiyan_approximation_impl.h @@ -183,7 +183,7 @@ namespace CGAL { // Since the transformations we apply do not change the solution // space of the intermediate systems, we can say: The system t x = // e_j has, for any i in {1,...,d}, the same solution space as I x - // = n_i (with n_i being the i-th colum of N); it follows that + // = n_i (with n_i being the i-th column of N); it follows that // x=n_i. // store the identity matrix in mi: diff --git a/CGAL_Core/include/CGAL/CORE/CoreIO_impl.h b/CGAL_Core/include/CGAL/CORE/CoreIO_impl.h index bbc582fa808..ace587c3f7c 100644 --- a/CGAL_Core/include/CGAL/CORE/CoreIO_impl.h +++ b/CGAL_Core/include/CGAL/CORE/CoreIO_impl.h @@ -217,7 +217,7 @@ void read_base_number(std::istream& in, BigInt& m, long length, long maxBits) { core_io_error_handler("CoreIO::read_from_file()","bad big number format."); delete[] buffer; - // shift left if neccessary + // shift left if necessary if (offset > 0 && base != 10) { m <<= offset; } diff --git a/CGAL_Core/include/CGAL/CORE/poly/Sturm.h b/CGAL_Core/include/CGAL/CORE/poly/Sturm.h index dd0b328613d..90671fcd332 100644 --- a/CGAL_Core/include/CGAL/CORE/poly/Sturm.h +++ b/CGAL_Core/include/CGAL/CORE/poly/Sturm.h @@ -944,7 +944,7 @@ std::cout << "In newtonRefine, input J=" << J.first // Newton might bring x very close to one endpoint, but it can be // because the root is near there! In any case, // by setting x to the center of J, you only gain at most - // one bit of accuracy, but you stand to loose an + // one bit of accuracy, but you stand to lose an // arbitrary amount of bits of accuracy if you are unlucky! // So I will comment out the next line. --Chee (Aug 9, 2004). // diff --git a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h index 9373f9feeda..52ff6916622 100644 --- a/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h +++ b/Cartesian_kernel/include/CGAL/constructions/kernel_ftC2.h @@ -64,7 +64,7 @@ circumcenter_translateC2(const FT &dqx, const FT &dqy, CGAL_kernel_assertion ( ! CGAL_NTS is_zero(den) ); // One possible optimization here is to precompute 1/den, to avoid one - // division. However, we loose precision, and it's maybe not worth it (?). + // division. However, we lose precision, and it's maybe not worth it (?). dcx = determinant (dry, dqy, r2, q2) / den; dcy = - determinant (drx, dqx, r2, q2) / den; } @@ -440,7 +440,7 @@ weighted_circumcenter_translateC2(const RT &dqx, const RT &dqy, const RT &dqw, CGAL_assertion ( den != RT(0) ); // One possible optimization here is to precompute 1/den, to avoid one - // division. However, we loose precision, and it's maybe not worth it (?). + // division. However, we lose precision, and it's maybe not worth it (?). dcx = determinant (dry, dqy, r2, q2) / den; dcy = - determinant (drx, dqx, r2, q2) / den; } diff --git a/Circular_kernel_2/benchmark/arrangement_traits/benchmark.h b/Circular_kernel_2/benchmark/arrangement_traits/benchmark.h index 9ba0d3c9522..fdef99c0247 100644 --- a/Circular_kernel_2/benchmark/arrangement_traits/benchmark.h +++ b/Circular_kernel_2/benchmark/arrangement_traits/benchmark.h @@ -177,7 +177,7 @@ class Bench texout << " & " < -struct Take_adress : public CGAL::cpp98::unary_function +struct Take_address : public CGAL::cpp98::unary_function { T* operator() (T& t) const { return &t; } @@ -97,14 +97,14 @@ int main() std::vector toremove; // Copy in vector toremove one dart per face - std::copy(boost::transform_iterator, + std::copy(boost::transform_iterator, CMap_3::One_dart_per_cell_range<2>::iterator> (cmap.one_dart_per_cell<2>().begin(), - Take_adress()), - boost::transform_iterator, + Take_address()), + boost::transform_iterator, CMap_3::One_dart_per_cell_range<2>::iterator> (cmap.one_dart_per_cell<2>().end(), - Take_adress()), + Take_address()), back_inserter(toremove)); // Remove each face sequentially. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map.h b/Combinatorial_map/include/CGAL/Combinatorial_map.h index c951257df00..7b594d2ad16 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map.h @@ -4194,7 +4194,7 @@ namespace CGAL { /** Test if a 2-cell can be inserted onto a given 3-cell along * a path of edges. - * @param afirst iterator on the begining of the path. + * @param afirst iterator on the beginning of the path. * @param alast iterator on the end of the path. * @return true iff a 2-cell can be inserted along the path. */ @@ -4239,7 +4239,7 @@ namespace CGAL { } /** Insert a 2-cell in a given 3-cell along a path of darts. - * @param afirst iterator on the begining of the path. + * @param afirst iterator on the beginning of the path. * @param alast iterator on the end of the path. * @param update_attributes a boolean to update the enabled attributes * @return a dart of the new 2-cell. diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_insertions.h b/Combinatorial_map/include/CGAL/Combinatorial_map_insertions.h index be01902792e..32a2fb8973e 100644 --- a/Combinatorial_map/include/CGAL/Combinatorial_map_insertions.h +++ b/Combinatorial_map/include/CGAL/Combinatorial_map_insertions.h @@ -121,7 +121,7 @@ insert_cell_1_in_cell_2(CMap& amap, /** Test if a 2-cell can be inserted onto a given 3-cell along * a path of edges. * @param amap the used combinatorial map. - * @param afirst iterator on the begining of the path. + * @param afirst iterator on the beginning of the path. * @param alast iterator on the end of the path. * @return true iff a 2-cell can be inserted along the path. */ @@ -134,7 +134,7 @@ CGAL_DEPRECATED bool is_insertable_cell_2_in_cell_3 /** Insert a 2-cell in a given 3-cell along a path of darts. * @param amap the used combinatorial map. - * @param afirst iterator on the begining of the path. + * @param afirst iterator on the beginning of the path. * @param alast iterator on the end of the path. * @param update_attributes a boolean to update the enabled attributes * (deprecated, now we use are_attributes_automatically_managed()) diff --git a/Documentation/doc/biblio/geom.bib b/Documentation/doc/biblio/geom.bib index d4bf473db7f..ffacc230cfe 100644 --- a/Documentation/doc/biblio/geom.bib +++ b/Documentation/doc/biblio/geom.bib @@ -1645,7 +1645,7 @@ cell neighborhood in $O(m)$ time." , succeeds = "aaas-lpmpc-97" , precedes = "aas-lpocp-98" , update = "01.04 icking, 98.11 bibrelex, 98.03 agarwal" -, annote = "Corrects and supercedes parts of \cite{aaas-lpmpc-97}" +, annote = "Corrects and supersedes parts of \cite{aaas-lpmpc-97}" } @article{aas-mpcpp-99 diff --git a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h index 86a9a6ca97b..2acab99affd 100644 --- a/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h +++ b/Envelope_2/include/CGAL/Envelope_2/Env_divide_and_conquer_2_impl.h @@ -830,7 +830,7 @@ _merge_two_intervals(Edge_const_handle e1, bool is_leftmost1, Vertex_handle new_v = _append_vertex(out_d, p_right, e1); new_v->left()->add_curves(e2->curves_begin(), e2->curves_end()); - // We are not at v becuase p_right is smaller than v. + // We are not at v because p_right is smaller than v. // The special case that we are at v is handled in the next // condition. // If we were at v, then this was a special case that is handled diff --git a/Envelope_2/test/Envelope_2/test_envelope_segments.cpp b/Envelope_2/test/Envelope_2/test_envelope_segments.cpp index ba607181e80..b2ceb918ba2 100644 --- a/Envelope_2/test/Envelope_2/test_envelope_segments.cpp +++ b/Envelope_2/test/Envelope_2/test_envelope_segments.cpp @@ -92,7 +92,7 @@ bool read_segments (const char* filename, /*! * Check if a $x$-monotone curve with the same associated data as the input * curve is in the given range. - * \param begin The begining of the range. + * \param begin The beginning of the range. * \param end Passed-the-end iterator. * \param c The curve, the data of which we are searching. * \return True if we found an $x$-monotone curve with the same data. diff --git a/Envelope_3/doc/Envelope_3/Envelope_3.txt b/Envelope_3/doc/Envelope_3/Envelope_3.txt index ceeba66eb74..d5a7d6aa4e3 100644 --- a/Envelope_3/doc/Envelope_3/Envelope_3.txt +++ b/Envelope_3/doc/Envelope_3/Envelope_3.txt @@ -252,7 +252,7 @@ printing the diagrams, we just output the labels of the triangles: The next example demonstrates how to instantiate and use the envelope-traits class for spheres, based on the -`Arr_conic_traits_2` class that handles the projected intersecion +`Arr_conic_traits_2` class that handles the projected intersection curves. The program reads a set of spheres from an input file and constructs their lower envelope: diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h index 0bc094544f1..025d8d4b4ad 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_divide_and_conquer_3.h @@ -65,7 +65,7 @@ // - remove edges between faces with the same envelope data, which do not // contribute to the shape of the envelope (i.e. have the same envelope data // as their adjacent faces) -// - remove unneccessary vertices of two kinds: +// - remove unnecessary vertices of two kinds: // a. vertices which have degree 2, the 2 incident edges can be geometrically // merged, and has the same envelope data as both these edges // b. isolated vertices which have the same envelope data as their incident @@ -641,16 +641,16 @@ public: // make sure the aux flags are correctly after all resolvings //CGAL_assertion(verify_aux_flags(result)); - // finally, remove unneccessary edges, between faces with the same surface + // finally, remove unnecessary edges, between faces with the same surface // (and which are not degenerate) - remove_unneccessary_edges(result); + remove_unnecessary_edges(result); CGAL_expensive_assertion_msg(result.is_valid(), "after remove edges result is not valid"); - // also remove unneccessary vertices (that were created in the process of + // also remove unnecessary vertices (that were created in the process of // vertical decomposition but the vertical edge was removed) - remove_unneccessary_vertices(result); + remove_unnecessary_vertices(result); CGAL_expensive_assertion_msg(result.is_valid(), "after remove vertices result is not valid"); @@ -728,9 +728,9 @@ protected: return has_eq; } - // Remove unneccessary edges, between faces with the same surface + // Remove unnecessary edges, between faces with the same surface // (and which are not degenerate) - void remove_unneccessary_edges(Minimization_diagram_2& result) + void remove_unnecessary_edges(Minimization_diagram_2& result) { // collect all those edges in this list, and remove them all at the end // (thus, not destroying the iterator) @@ -1009,18 +1009,18 @@ protected: return (equal_first && equal_second); } - // Remove unneccessary vertices, which have degree 2, and the 2 curves + // Remove unnecessary vertices, which have degree 2, and the 2 curves // can be merged // (and which are not degenerate) - void remove_unneccessary_vertices(Minimization_diagram_2& result) + void remove_unnecessary_vertices(Minimization_diagram_2& result) { - // we have 2 types of unneccessary vertices: those with degree 2 (that + // we have 2 types of unnecessary vertices: those with degree 2 (that // satisfy all the conditions below), and isolated vertices that have the // same envelope information as the face they're contained in. // all the vertices that don't have their data set, are those vertices // on vertical edges, created in the decomposition process, - // and are not neccessary + // and are not necessary // also those vertices with degree 2, that can merge their 2 edges and // with same data as both these edges, can be removed diff --git a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h index d3c3663b70d..d9b979dd2a9 100644 --- a/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h +++ b/Envelope_3/include/CGAL/Envelope_3/Envelope_element_visitor_3.h @@ -654,7 +654,7 @@ public: // remember the envelope decision over the first & last parts, to // be able to copy it to the original endpoints // TODO: the initial value is only needed to shut up the compiler - // TODO: is this realy needed, or we can use the decision made on "edge" + // TODO: is this really needed, or we can use the decision made on "edge" // (is "edge" always the first part? ) Comparison_result first_part_res = EQUAL; diff --git a/Generalized_map/include/CGAL/Generalized_map.h b/Generalized_map/include/CGAL/Generalized_map.h index cfd6b756803..7ab7f4eadda 100644 --- a/Generalized_map/include/CGAL/Generalized_map.h +++ b/Generalized_map/include/CGAL/Generalized_map.h @@ -3322,7 +3322,7 @@ namespace CGAL { /** Test if a 2-cell can be inserted onto a given 3-cell along * a path of edges. - * @param afirst iterator on the begining of the path. + * @param afirst iterator on the beginning of the path. * @param alast iterator on the end of the path. * @return true iff a 2-cell can be inserted along the path. * the path is a sequence of dartd, one per edge @@ -3365,7 +3365,7 @@ namespace CGAL { /** Insert a 2-cell in a given 3-cell along a path of darts. * @param amap the used generalized map. - * @param afirst iterator on the begining of the path. + * @param afirst iterator on the beginning of the path. * @param alast iterator on the end of the path. * the path is a sequence of darts, one per edge * where the face will be inserted. diff --git a/Generator/include/CGAL/point_generators_3.h b/Generator/include/CGAL/point_generators_3.h index 7e83b1dab3c..0f0bfa943ce 100644 --- a/Generator/include/CGAL/point_generators_3.h +++ b/Generator/include/CGAL/point_generators_3.h @@ -65,7 +65,7 @@ template < class P, class Creator > void Random_points_in_sphere_3:: generate_point() { - // A strip between z and z+dz has an area independant of z + // A strip between z and z+dz has an area independent of z typedef typename Creator::argument_type T; double alpha = this->_rnd.get_double() * 2.0 * CGAL_PI; double z = 2 * this->_rnd.get_double() - 1.0; @@ -104,7 +104,7 @@ template < class P, class Creator > void Random_points_on_sphere_3:: generate_point() { - // A strip between z and z+dz has an area independant of z + // A strip between z and z+dz has an area independent of z typedef typename Creator::argument_type T; double alpha = this->_rnd.get_double() * 2.0 * CGAL_PI; double z = 2 * this->_rnd.get_double() - 1.0; diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h index 78a01f7d735..1d3bcef0287 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h @@ -302,7 +302,7 @@ namespace Qt { v->centerOn(new_center); // QGraphicsView::centerOn makes rounding errors. - // The following two "if" make them unnoticable when dx==0 or dy==0. + // The following two "if" make them unnoticeable when dx==0 or dy==0. if(dx == 0) { v->horizontalScrollBar()->setValue(horizontalScrollBarValue); } diff --git a/GraphicsView/include/CGAL/Qt/camera.h b/GraphicsView/include/CGAL/Qt/camera.h index 5d621bd5d0e..293c1abb52c 100644 --- a/GraphicsView/include/CGAL/Qt/camera.h +++ b/GraphicsView/include/CGAL/Qt/camera.h @@ -230,7 +230,7 @@ public: The near (resp. far) clipping plane is positioned at a distance equal to zClippingCoefficient() * sceneRadius() in front of (resp. behind) the - sceneCenter(). This garantees an optimal use of the z-buffer range and + sceneCenter(). This guarantees an optimal use of the z-buffer range and minimizes aliasing. See the zNear() and zFar() documentations. Default value is square root of 3.0 (so that a cube of size sceneRadius() is diff --git a/GraphicsView/include/CGAL/Qt/camera_impl.h b/GraphicsView/include/CGAL/Qt/camera_impl.h index 2241ca9a40e..0352d541744 100644 --- a/GraphicsView/include/CGAL/Qt/camera_impl.h +++ b/GraphicsView/include/CGAL/Qt/camera_impl.h @@ -162,7 +162,7 @@ Camera &Camera::operator=(const Camera &camera) { You should not call this method when the Camera is associated with a CGAL::QGLViewer, since the latter automatically updates these values when it is resized (hence -overwritting your values). +overwriting your values). Non-positive dimension are silently replaced by a 1 pixel value to ensure frustrum coherence. @@ -260,7 +260,7 @@ void Camera::setFieldOfView(qreal fov) { /*! Defines the Camera type(). Changing the camera Type alters the viewport and the objects' sizes can be -changed. This method garantees that the two frustum match in a plane normal to +changed. This method guarantees that the two frustum match in a plane normal to viewDirection(), passing through the pivotPoint(). Prefix the type with \c Camera if needed, as in: diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_list.h b/HalfedgeDS/include/CGAL/HalfedgeDS_list.h index 03dbb6ae8c5..c0672e25a8a 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_list.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_list.h @@ -646,7 +646,7 @@ public: // number of border halfedges. An edge with no incident face // counts as two border halfedges. Precondition: `normalize_border()' // has been called and no halfedge insertion or removal and no - // change in border status of the halfedges have occured since + // change in border status of the halfedges have occurred since // then. size_type size_of_border_edges() const { return nb_border_edges;} @@ -655,7 +655,7 @@ public: // face on one side and to a hole on the other side. // Precondition: `normalize_border()' has been called and no // halfedge insertion or removal and no change in border status of - // the halfedges have occured since then. + // the halfedges have occurred since then. Halfedge_iterator border_halfedges_begin() { // halfedge iterator starting with the border edges. The range [ @@ -664,7 +664,7 @@ public: // halfedges_end()') denotes all border edges. Precondition: // `normalize_border()' has been called and no halfedge insertion // or removal and no change in border status of the halfedges have - // occured since then. + // occurred since then. return border_halfedges; } diff --git a/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h b/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h index 4ba4261741a..337e5ac8e02 100644 --- a/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h +++ b/HalfedgeDS/include/CGAL/HalfedgeDS_vector.h @@ -490,7 +490,7 @@ public: // number of border halfedges. An edge with no incident face // counts as two border halfedges. Precondition: `normalize_border()' // has been called and no halfedge insertion or removal and no - // change in border status of the halfedges have occured since + // change in border status of the halfedges have occurred since // then. size_type size_of_border_edges() const { return nb_border_edges;} @@ -499,7 +499,7 @@ public: // face on one side and to a hole on the other side. // Precondition: `normalize_border()' has been called and no // halfedge insertion or removal and no change in border status of - // the halfedges have occured since then. + // the halfedges have occurred since then. Halfedge_iterator border_halfedges_begin() { // halfedge iterator starting with the border edges. The range [ @@ -508,7 +508,7 @@ public: // halfedges_end()') denotes all border edges. Precondition: // `normalize_border()' has been called and no halfedge insertion // or removal and no change in border status of the halfedges have - // occured since then. + // occurred since then. return border_halfedges; } diff --git a/INSTALL.md b/INSTALL.md index 3ac7e62e3a4..ca09f887112 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -13,7 +13,7 @@ Branch Build of CGAL The cmake script at the root of the repository is the one to use to build the CGAL library from a branch. It will collect the list of packages of the branch and will append their include folder to the include path. -This is main noticable difference with a build using a regular *flat* release. +This is main noticeable difference with a build using a regular *flat* release. Here is an example of how to build the library in Debug: ``` {.bash} diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index 3fd388b7f71..398fe8765b0 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -3791,7 +3791,7 @@ static runtime (/ML). algorithm for placing streamlines in 2D vector fields. It generates a list of streamlines corresponding to an input flow using a specified separating distance. The algorithm uses a Delaunay - triangulation to model objects and adress different queries, and + triangulation to model objects and address different queries, and relies on choosing the centers of the biggest empty circles to start the integration of the streamlines. - Kinetic Data Structures (new package) diff --git a/Installation/cmake/modules/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp b/Installation/cmake/modules/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp index 93b4e6040c0..03efd23fbe0 100644 --- a/Installation/cmake/modules/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp +++ b/Installation/cmake/modules/config/testfiles/CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG.cpp @@ -41,7 +41,7 @@ main() } catch ( ... ) { - // Sets the rounding mode to 0 and show that it's realy the case. + // Sets the rounding mode to 0 and show that it's really the case. _controlfp( 0, _MCW_RC ); } diff --git a/Installation/include/CGAL/auto_link/auto_link.h b/Installation/include/CGAL/auto_link/auto_link.h index fdb428ec014..f09070d95a6 100644 --- a/Installation/include/CGAL/auto_link/auto_link.h +++ b/Installation/include/CGAL/auto_link/auto_link.h @@ -1,6 +1,6 @@ // This header file is a copy of "boost/config/auto_link.hpp" // from boost version 1.44.0 -// but slightly modified to accomodate CGAL libraries. +// but slightly modified to accommodate CGAL libraries. // Before CGAL-4.7-beta1, it has been synchronized with // libs/config/ version boost-1.58.0-39-g15d56c9, file diff --git a/Interpolation/TODO b/Interpolation/TODO index 0d20a8aba13..b1cde04626a 100644 --- a/Interpolation/TODO +++ b/Interpolation/TODO @@ -1,4 +1,4 @@ -Here follows 3 reviews which have been recieved following the submission +Here follows 3 reviews which have been received following the submission of the Interpolation package to the editorial board. They have not been completely implemented or replied, so we keep them here in order for the next one who will work on the package to know @@ -96,7 +96,7 @@ method to use under which circumstance. The examples need explanation. The indentation needs work. At the end of the second example, there is a branch that warns if the -interpolation was not succesful due to missing function gradients. Can +interpolation was not successful due to missing function gradients. Can this really occur, given the rest of the program? If not, I would remove it. If it can occur, I would draw more attention to this fact. diff --git a/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h b/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h index 8066eac9c22..98b33997e76 100644 --- a/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h +++ b/Interpolation/include/CGAL/predicates/predicates_for_voronoi_intersection_cartesian_2_3.h @@ -76,7 +76,7 @@ side_of_plane_centered_sphereC3(const RT &ax, const RT &ay, const RT &az, // //method: // - tranlation of p to the origin. - // - seperate computation of det and norm of the expression + // - separate computation of det and norm of the expression return side_of_plane_centered_sphere_translateC3(ax-px, ay-py, az-pz, nx, ny, nz, @@ -145,7 +145,7 @@ side_of_plane_centered_sphereC3(const RT &ax, const RT &ay, const RT &az, // //method: // - tranlation of p to the origin. - // - seperate computation of det and nom of the expression + // - separate computation of det and nom of the expression return side_of_plane_centered_sphere_translateC3(ax-px, ay-py, az-pz, nx, ny, nz, diff --git a/Interval_skip_list/include/CGAL/Interval_skip_list.h b/Interval_skip_list/include/CGAL/Interval_skip_list.h index ae93d920fbf..ddc63f06b82 100644 --- a/Interval_skip_list/include/CGAL/Interval_skip_list.h +++ b/Interval_skip_list/include/CGAL/Interval_skip_list.h @@ -842,7 +842,7 @@ template update[i]->eqMarkers->insert(m->getInterval()); // Place markers on x for all intervals the cross x. - // (Since x is a new node, every marker comming into x must also leave x). + // (Since x is a new node, every marker coming into x must also leave x). for(i=0; ilevel(); i++) x->eqMarkers->copy(x->markers[i]); 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 d89781711dc..00fe950e3a9 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 @@ -279,7 +279,7 @@ computed using rings on the triangulation. Results are twofold:

  • a human readable text file featuring the `::CGAL::Monge_via_jet_fitting::Monge_form` and numerical informations on the computation: condition number and the PCA basis; -
  • another text file that records raw data (better for a vizualization +
  • another text file that records raw data (better for a visualization post-processing). diff --git a/Kernel_23/doc/Kernel_23/CGAL/Vector_2.h b/Kernel_23/doc/Kernel_23/CGAL/Vector_2.h index 6a408bacab3..8685468fbdb 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Vector_2.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Vector_2.h @@ -85,7 +85,7 @@ Vector_2(const Kernel::FT &x, const Kernel::FT &y); /// There are two sets of coordinate access functions, namely to the /// homogeneous and to the %Cartesian coordinates. They can be used /// independently from the chosen kernel model. Note that you do not -/// loose information with the homogeneous representation, because the +/// lose information with the homogeneous representation, because the /// `FieldNumberType` is a quotient. /// @{ diff --git a/Kernel_23/doc/Kernel_23/CGAL/Vector_3.h b/Kernel_23/doc/Kernel_23/CGAL/Vector_3.h index f6bf36679c4..2dec956a656 100644 --- a/Kernel_23/doc/Kernel_23/CGAL/Vector_3.h +++ b/Kernel_23/doc/Kernel_23/CGAL/Vector_3.h @@ -87,7 +87,7 @@ Vector_3(const Kernel::FT &x, const Kernel::FT &y, const Kernel::FT &z); /// There are two sets of coordinate access functions, namely to the /// homogeneous and to the %Cartesian coordinates. They can be used /// independently from the chosen kernel model. Note that you do not -/// loose information with the homogeneous representation, because the +/// lose information with the homogeneous representation, because the /// `FieldNumberType` is a quotient. /// @{ diff --git a/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h b/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h index ce9133544be..7b733fe2f87 100644 --- a/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h +++ b/Kernel_d/doc/Kernel_d/CGAL/Epick_d.h @@ -96,7 +96,7 @@ double weight() const; class Construct_circumcenter_d { public: /*! returns the center of the sphere defined by `A=tuple[first,last)`. The sphere is centered in the affine hull of A and passes through all the points of A. The order of the points of A does not matter. - \pre A is affinely independant. + \pre A is affinely independent. \tparam ForwardIterator has `Epick_d::Point_d` as value type. */ template @@ -105,7 +105,7 @@ Point_d operator()(ForwardIterator first, ForwardIterator last); class Compute_squared_radius_d { public: /*! returns the radius of the sphere defined by `A=tuple[first,last)`. The sphere is centered in the affine hull of A and passes through all the points of A. The order of the points of A does not matter. - \pre A is affinely independant. + \pre A is affinely independent. \tparam ForwardIterator has `Epick_d::Point_d` as value type. */ template @@ -116,7 +116,7 @@ Point_d operator()(ForwardIterator first, ForwardIterator last); class Side_of_bounded_sphere_d { public: /*! returns the relative position of point p to the sphere defined by `A=tuple[first,last)`. The sphere is centered in the affine hull of A and passes through all the points of A. The order of the points of A does not matter. - \pre A is affinely independant. + \pre A is affinely independent. \tparam ForwardIterator has `Epick_d::Point_d` as value type. */ template diff --git a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h index fe13b716697..c54058d4123 100644 --- a/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h +++ b/Kernel_d/include/CGAL/Kernel_d/function_objectsCd.h @@ -412,7 +412,7 @@ public: /* This predicates takes k+1 points defining a k-sphere in d-dim space, and a * point |x| (assumed to lie in the same affine subspace spanned by the - * k-sphere). It tests wether the point |x| lies in the positive or negative + * k-sphere). It tests whether the point |x| lies in the positive or negative * side of the k-sphere. * The parameter |axis| contains the indices of k axis of the canonical base of * R^d, on which the affine subspace projects homeomorphically. We can thus diff --git a/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h b/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h index 84ff459693c..aee2132dc85 100644 --- a/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h +++ b/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h @@ -243,7 +243,7 @@ namespace CGAL { std::cerr << " " << std::endl; std::cerr << "Polyhedron_scan_OFF::" << std::endl; std::cerr << "operator()(): input error: cannot " - "succesfully remove isolated vertices." + "successfully remove isolated vertices." << std::endl; } B.rollback(); diff --git a/Mesh_3/archive/applications/thread_queue.h b/Mesh_3/archive/applications/thread_queue.h index 9fd01f88a37..258ecf4ab72 100644 --- a/Mesh_3/archive/applications/thread_queue.h +++ b/Mesh_3/archive/applications/thread_queue.h @@ -143,7 +143,7 @@ std::string format(std::string input, bool remove_template) if ( input.at(input.size()-1) != '\n' ) input.push_back('\n'); - // Add " ! " at the begining of each line + // Add " ! " at the beginning of each line size_t prev = 0; pos = input.find("\n"); while ( pos != std::string::npos ) diff --git a/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h b/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h index 014b0672808..5116be3239e 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h +++ b/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h @@ -204,8 +204,8 @@ private: { const Vertex_handle& v1 = (*cit)->vertex((k+i)&3); - std::pair is_insert_succesful = treated_vertices.insert(v1); - if ( ! is_insert_succesful.second ) // vertex has already been treated + std::pair is_insert_successful = treated_vertices.insert(v1); + if ( ! is_insert_successful.second ) // vertex has already been treated continue; // Vertex has not been treated: turn around edge(v,v1) diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h index 5d26b1f5af8..01a3643937c 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h +++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h @@ -310,7 +310,7 @@ private: Curve_index curve_index) const; /// Walk along the edge from \c start, following the direction \c start to - /// \c next, and fills \c out with the vertices which do not fullfill + /// \c next, and fills \c out with the vertices which do not fulfill /// the sampling conditions. /// /// \param orientation Orientation of the curve segment between \c v1 and diff --git a/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h b/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h index 18f90d9f115..bea16f4fa07 100644 --- a/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h +++ b/Mesh_3/include/CGAL/Mesh_3/Triangulation_helpers.h @@ -509,8 +509,8 @@ get_sq_distance_to_closest_vertex(const Tr& tr, tr.is_infinite(vn)) continue; - std::pair is_insert_succesful = treated_vertices.insert(vn); - if(! is_insert_succesful.second) // vertex has already been treated + std::pair is_insert_successful = treated_vertices.insert(vn); + if(! is_insert_successful.second) // vertex has already been treated continue; const Point& wpvn = tr.point(c, n); diff --git a/Minkowski_sum_2/doc/Minkowski_sum_2/Minkowski_sum_2.txt b/Minkowski_sum_2/doc/Minkowski_sum_2/Minkowski_sum_2.txt index 6aa716ec4ec..22388d7d7b6 100644 --- a/Minkowski_sum_2/doc/Minkowski_sum_2/Minkowski_sum_2.txt +++ b/Minkowski_sum_2/doc/Minkowski_sum_2/Minkowski_sum_2.txt @@ -363,9 +363,9 @@ Decomposition methods that handle polygons with holes are typically more costly than decomposition methods that handle only simple polygons. The hole filtration (see \ref mink_ssec_hole_filter) is applied before the actual construction starts (be it convolution -based or decomposition based). The filteration may result with a +based or decomposition based). The filtration may result with a polygon that does not have holes, or even a convex polygon, but this -is unkown at the time of the call. To this end, we introduce the +is unknown at the time of the call. To this end, we introduce the overloaded function template \link minkowski_sum_by_decomposition_2() `minkowski_sum_by_decomposition_2(P, Q, no_holes_decomp, with_holes_decomp)`\endlink, where `no_holes_decomp` and `with_holes_decomp` are objects that model @@ -478,7 +478,7 @@ rational number. Therefore, the line segments that compose the offset boundaries cannot be represented as segments of lines with rational coefficients. In Section \ref mink_ssec_exact_offset we use the line-pair representation -to construct the offset polygonin an exact manner using the traits class +to construct the offset polygon in an exact manner using the traits class for conic arcs. @@ -601,10 +601,10 @@ handles polygons with holes, such as the An operation closely related to the (outer) offset computation, is computing the inner offset of a polygon, or insetting it by a given radius. The inset of a polygon \f$ P\f$ with radius -\f$ r\f$ is the set of points iside \f$ P\f$ the distance of which +\f$ r\f$ is the set of points inside \f$ P\f$ the distance of which from the polygon boundary, denoted \f$ \partial P\f$, is at least \f$ r\f$, namely: \f$ \{ p \in P \;|\; {\rm dist}(p, \partial P) \geq r \}\f$. -Note that the resulting point set may be dicconnected when \f$ P\f$ is a +Note that the resulting point set may be disconnected when \f$ P\f$ is a non-convex polygon that has some narrow components. In such a case the resulting set is characterized by a (possibly empty) set of polygons the edges of which are line segments and circular arcs of radius \f$ r\f$. @@ -659,7 +659,7 @@ millennium with his research work about Minkowski sum construction using the decomposition approach. However, it was only a few years later when Ron Wein developed the first version of this package, which was introduced with release 3.3. The first version of the package contained functionality for -computeing the Minkowski sum of two polygons, computing the offset of +computing the Minkowski sum of two polygons, computing the offset of a polygon by a disk, and approximating the offset of a polygon by a disk. Release 3.4 contained an enhancement of the offset computation, which allowed for polygon with holes as operands. Release 3.4 also featured new functionality diff --git a/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h b/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h index 1d267473b13..f5ba38e184b 100644 --- a/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h +++ b/Minkowski_sum_2/include/CGAL/minkowski_sum_2.h @@ -321,7 +321,7 @@ minkowski_sum_2(const Polygon_2& pgn1, * const typename Minkowski_sum_by_decomposition_2::Traits_2> - * are exchangable except for in one case, where there is an ambiguity. + * are exchangeable except for in one case, where there is an ambiguity. * Thus, we use the former, even though it is less generic, as change to the * traits type in Minkowski_sum_by_decomposition_2 would require a similar * change here. diff --git a/Nef_2/doc/Nef_2/Nef_2.txt b/Nef_2/doc/Nef_2/Nef_2.txt index 6ef4527417a..a153fe9dad2 100644 --- a/Nef_2/doc/Nef_2/Nef_2.txt +++ b/Nef_2/doc/Nef_2/Nef_2.txt @@ -21,7 +21,7 @@ of a nonempty finite set of points. Convex polytopes are compact closed and manifold sets.
  • elementary polyhedra normally defined as the union of a finite number of convex polytopes. -
  • polyhedral sets nomally defined as the intersection +
  • polyhedral sets normally defined as the intersection of a finite number of closed halfspaces. Such sets are closed and convex but need not to be compact.
  • linear polyhedra normally defined as the set of all @@ -61,7 +61,7 @@ the corresponding reference pages. \cgalExample{Nef_2/nef_2_construction.cpp} -Planar halfspaces (as used in the definition) are modelled by oriented +Planar halfspaces (as used in the definition) are modeled by oriented lines. In the previous example `N1` is the Nef polyhedron representing the full plane, `N2` is the closed halfspace left of the oriented line with equation \f$ 2x + 4y + 2 = 0\f$ including the line, diff --git a/Nef_2/include/CGAL/Nef_2/gen_point_location.h b/Nef_2/include/CGAL/Nef_2/gen_point_location.h index 1915a8e0bf0..355327a786c 100644 --- a/Nef_2/include/CGAL/Nef_2/gen_point_location.h +++ b/Nef_2/include/CGAL/Nef_2/gen_point_location.h @@ -332,7 +332,7 @@ class PointLocator { |PLocTraits| which widely controls its behaviour. The traits may even change the return type of a query and its semantics. There are predined traits classes for the LEDA graph types, which are - described below in a seperate section. + described below in a separate section. }*/ public: // copied types from PLocTraits diff --git a/Nef_3/doc/Nef_3/Nef_3.txt b/Nef_3/doc/Nef_3/Nef_3.txt index 8fff20623fe..b1bd50533b8 100644 --- a/Nef_3/doc/Nef_3/Nef_3.txt +++ b/Nef_3/doc/Nef_3/Nef_3.txt @@ -57,7 +57,7 @@ generality. Starting from halfspaces (and also directly from oriented 2-manifolds), we can work with set union, set intersection, set difference, set complement, interior, exterior, boundary, closure, and regularization operations (see Section \ref sectoinRegularized -for an explaination of regularized +for an explanation of regularized set operations). In essence, we can evaluate a CSG-tree with halfspaces as primitives and convert it into a B-rep representation. diff --git a/Nef_S2/doc/Nef_S2/Nef_S2.txt b/Nef_S2/doc/Nef_S2/Nef_S2.txt index ac85f5915bd..0f08b31eb02 100644 --- a/Nef_S2/doc/Nef_S2/Nef_S2.txt +++ b/Nef_S2/doc/Nef_S2/Nef_S2.txt @@ -129,7 +129,7 @@ Afterwards the iterator can be casted to the proper handle type. \subsection Nef_S2PointLocation Point Location -Using the `locate` function, it is possible to retrive an item at a +Using the `locate` function, it is possible to retrieve an item at a certain location on the sphere. In the following example, the item at location `Sphere_point(1,0,0)` in a random `Nef_polyhedron_S2` is retrieved. `locate` returns an instance of type `Nef_polyhedron_S2::Object_handle`, which diff --git a/Number_types/include/CGAL/Mpzf.h b/Number_types/include/CGAL/Mpzf.h index 73fe360be9f..568765e9828 100644 --- a/Number_types/include/CGAL/Mpzf.h +++ b/Number_types/include/CGAL/Mpzf.h @@ -145,7 +145,7 @@ template struct pool1 { template std::vector pool1::data; // Use an intrusive single-linked list instead (allocate one more limb and use -// it to store the pointer to next), the difference isn't that noticable (still +// it to store the pointer to next), the difference isn't that noticeable (still // the list wins). Neither is thread-safe (both can be with threadlocal, and // the list can be with an atomic compare-exchange (never tried)). With gcc, // TLS has a large effect on classes with constructor/destructor, but is free diff --git a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h index 73f85e6f82a..19b7cad9bd5 100644 --- a/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h +++ b/Periodic_3_mesh_3/include/CGAL/Periodic_3_mesh_3/Protect_edges_sizing_field.h @@ -319,7 +319,7 @@ private: Curve_index curve_index) const; /// Walk along the edge from \c start, following the direction \c start to - /// \c next, and fills \c out with the vertices which do not fullfill + /// \c next, and fills \c out with the vertices which do not fulfill /// the sampling conditions. /// /// \param orientation Orientation of the curve segment between \c v1 and diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h index e1be0bf137f..5c7e21ae5d5 100644 --- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h +++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_ds_vertex_base_3.h @@ -107,7 +107,7 @@ public: // it will have been marked as already visited, and bugs appear... #ifdef CGAL_PERIODIC_TRIANGULATION_USE_VISITED_VERTEX_BOOLEAN // The typedef and the bool are used by Triangulation_data_structure::Vertex_extractor - // The names are choosen complicated so that we do not have to document them + // The names are chosen complicated so that we do not have to document them // (privacy by obfuscation) typedef bool Has_visited_for_vertex_extractor; bool visited_for_vertex_extractor; diff --git a/Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt b/Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt index 23cbd2c4c57..9c73842c113 100644 --- a/Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt +++ b/Point_set_processing_3/doc/Point_set_processing_3/Point_set_processing_3.txt @@ -388,7 +388,7 @@ parameter: \f$10\f$, \f$100\f$ and \f$1000\f$. In the 3 cases, \subsubsection Point_set_processing_3Hierarchy_simplification_parameter_var_max Parameter: var_max In addition to the size parameter, a variation parameter allows to -increase simplification in monotoneous regions. For each cluster, a +increase simplification in monotonous regions. For each cluster, a surface variation measure is computed using the sorted eigenvalues of the covariance matrix: \f[ \sigma(p) = \frac{\lambda_0}{\lambda_0 + \lambda_1 + \lambda_2}. \f] @@ -564,7 +564,7 @@ Upsampling for different sharpness_angle parameter values. The input containing \cgalFigureEnd \subsubsection Point_set_processing_3upsample_neighborhood_size Parameter: neighbor_radius -Usually, the neighborhood of sample points should include at least one ring of neighboring sample points. Using small neighborhood size may not be able to insert new points. Using big neighborhood size can fill small holes, but points inserted on the edges could be irregular. The function will use a neigbhorhood size estimation if this parameter value is set to default or smaller than zero. +Usually, the neighborhood of sample points should include at least one ring of neighboring sample points. Using small neighborhood size may not be able to insert new points. Using big neighborhood size can fill small holes, but points inserted on the edges could be irregular. The function will use a neighborhood size estimation if this parameter value is set to default or smaller than zero. \cgalFigureBegin{Point_set_processing_3figupsample_neighborhood_size, upsample_neighborhood_size.jpg} Comparison between different sizes of neighbor radius. @@ -665,7 +665,7 @@ Thanks to the carriage return character `\r`, the lines are overwritten and the Pierre Alliez and Laurent Saboret contributed the initial component. Nader Salman contributed the grid simplification. Started from GSoC'2013, three new algorithms were implemented by Shihao Wu and Clément Jamin: WLOP, bilateral smoothing and upsampling. -Started from GSoC'2014, Jocelyn Meyron with the help of Quentin Mérigot introduced the computation of the Voronoi covarience measure of a point set, +Started from GSoC'2014, Jocelyn Meyron with the help of Quentin Mérigot introduced the computation of the Voronoi covariance measure of a point set, as well as the normal and feature edge estimation functions based on it. Florent Lafarge with the help of Simon Giraudot contributed the point set structuring algorithm. diff --git a/Point_set_processing_3/include/CGAL/remove_outliers.h b/Point_set_processing_3/include/CGAL/remove_outliers.h index 5e781975b4c..f28776a2dec 100644 --- a/Point_set_processing_3/include/CGAL/remove_outliers.h +++ b/Point_set_processing_3/include/CGAL/remove_outliers.h @@ -139,7 +139,7 @@ compute_avg_knn_sq_distance_3( \note There are two thresholds that can be used: `threshold_percent` and `threshold_distance`. This function returns the smallest number of outliers such that at least one of - these threshold is fullfilled. This means that if + these threshold is fulfilled. This means that if `threshold_percent=100`, only `threshold_distance` is taken into account; if `threshold_distance=0` only `threshold_percent` is taken into account. diff --git a/Point_set_processing_3/include/CGAL/structure_point_set.h b/Point_set_processing_3/include/CGAL/structure_point_set.h index 9c0f3108d1b..3af43b3ef69 100644 --- a/Point_set_processing_3/include/CGAL/structure_point_set.h +++ b/Point_set_processing_3/include/CGAL/structure_point_set.h @@ -62,7 +62,7 @@ detected planes. Given a point set in 3D space along with a set of fitted planes, this class stores a simplified and structured version of the point set. Each output point is assigned to one, two or more primitives -(depending wether it belongs to a planar section, an edge or a if it +(depending whether it belongs to a planar section, an edge or a if it is a vertex). The implementation follow \cgalCite{cgal:la-srpss-13}. \tparam Kernel a model of `ShapeDetectionTraits` that must provide in diff --git a/Polygon/doc/Polygon/Polygon.txt b/Polygon/doc/Polygon/Polygon.txt index 44e90d92af8..279d24c457f 100644 --- a/Polygon/doc/Polygon/Polygon.txt +++ b/Polygon/doc/Polygon/Polygon.txt @@ -64,7 +64,7 @@ Polygons may be contours of a 3D object, where the contours are organized in parallel slices, generated by segmentation of image data from a scanner. -In order to avoid an explixit projection on the \c xy plane, one can +In order to avoid an explicit projection on the \c xy plane, one can use the traits class `Projection_traits_xy_3` which is part of the 2D and 3D Linear Geometric %Kernel. diff --git a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt index 004aad17948..7c2bf8ab4e2 100644 --- a/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt +++ b/Polygon_mesh_processing/doc/Polygon_mesh_processing/Polygon_mesh_processing.txt @@ -484,7 +484,7 @@ described in \cgalCite{gueziec2001cutting}. To deal with polygon soups that cannot be converted to a combinatorially manifold surface, some points must be duplicated. Because a polygon soup does not have any connectivity (each point -has as many occurences as the number of polygons it belongs to), +has as many occurrences as the number of polygons it belongs to), duplicating one point (or a pair of points) amounts to duplicating the polygon to which it belongs. The duplicated points are either an endpoint of an edge incident to more diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h index 55f3d3dde04..ed08eaef152 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Corefinement/Face_graph_output_builder.h @@ -1197,7 +1197,7 @@ public: // An_edge_per_polyline_map; #ifdef CGAL_COREFINEMENT_POLYHEDRA_DEBUG - #warning add a mechanism to handle the patches independantly \ + #warning add a mechanism to handle the patches independently \ (for example calculating the volume without \ building the polyhedron) \ This can be done by using a functor to which we give \ @@ -1553,7 +1553,7 @@ public: if (used_to_clip_a_surface) { // The following code is here to handle the case when an intersection polyline - // contains some border edges of tm1 that should be considered as an independant polyline. + // contains some border edges of tm1 that should be considered as an independent polyline. // This polyline removal should be handled by remove_unused_polylines. // However, since all nodes are of degree 2 the polyline is not split at // the correct point and trouble happen. Here the workaround consists in diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h index 094ffbb7e0a..3d7632e1f21 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Snapping/snap.h @@ -708,8 +708,8 @@ std::size_t snap_vertex_range_onto_vertex_range_non_conforming(const HalfedgeRan << std::distance(target_hrange.begin(), target_hrange.end()) << std::endl; #endif - typedef std::map > Occurence_map; - Occurence_map occurrences_as_target; + typedef std::map > Occurrence_map; + Occurrence_map occurrences_as_target; for(halfedge_descriptor hd : target_hrange) { vertex_descriptor vd = target(hd, pmt); @@ -717,7 +717,7 @@ std::size_t snap_vertex_range_onto_vertex_range_non_conforming(const HalfedgeRan std::set corresponding_vd; corresponding_vd.insert(vd); - std::pair is_insert_successful = + std::pair is_insert_successful = occurrences_as_target.insert(std::make_pair(get(vpmt, vd), corresponding_vd)); if(!is_insert_successful.second) // point already existed in the map is_insert_successful.first->second.insert(vd); @@ -748,17 +748,17 @@ std::size_t snap_vertex_range_onto_vertex_range_non_conforming(const HalfedgeRan } const Point& query = get(vpms, vd); - const std::set& occurences = occurrences_as_target[query]; + const std::set& occurrences = occurrences_as_target[query]; // Skip points that are already attached to another border. Keeping it in two 'continue' for clarity. // If we are working with a single mesh, the vertex is only blocked if another vertex has the same - // position (that is, if occurences.size() > 1) - if(is_same_mesh && occurences.size() > 1) + // position (that is, if occurrences.size() > 1) + if(is_same_mesh && occurrences.size() > 1) continue; // If it's not the same mesh, then block as soon as a vertex in the target range has already that position - if(!is_same_mesh && !occurences.empty()) + if(!is_same_mesh && !occurrences.empty()) continue; // Skip the source vertex if its two incident halfedges are geometrically identical (it means that diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp index ed21427f4d1..4ae670175e3 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp @@ -31,7 +31,7 @@ void test_merge_duplicated_vertices_in_boundary_cycles(const char* fname, expected_nb_vertices == vertices(mesh).size()); if (expected_nb_vertices==0) { - std::cout << "writting output to out1.off\n"; + std::cout << "writing output to out1.off\n"; std::ofstream output("out1.off"); output << std::setprecision(17); output << mesh; diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp index 7f5eded2882..09270611ceb 100644 --- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp +++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp @@ -1685,7 +1685,7 @@ void Scene_polyhedron_selection_item::selectPath(fg_vertex_descriptor vh) end_of_path_is_prio = false; //makes the end of the path prioritary over the other points when there is a conflict if(it->vertex == first.vertex && - !(it == d->path.begin())&&// makes the begining of the path impossible to move + !(it == d->path.begin())&&// makes the beginning of the path impossible to move end_of_path_is_prio) { if(it!=d->path.end()-1 &&! is_same ) diff --git a/Polyhedron/demo/Polyhedron/TODO b/Polyhedron/demo/Polyhedron/TODO index 77880a99128..8e8b6ee85c2 100644 --- a/Polyhedron/demo/Polyhedron/TODO +++ b/Polyhedron/demo/Polyhedron/TODO @@ -42,5 +42,5 @@ Check what can be pulled in from experimental Mesh_3-protecting branch related to the MERGE with Point_set_demo: - clean up Point_set_3.h and UI_point_3.h - we should probably have a points_item - - Points and normal should be seperated items (pb with select and remove) + - Points and normal should be separated items (pb with select and remove) diff --git a/Polyhedron/include/CGAL/Polyhedron_3.h b/Polyhedron/include/CGAL/Polyhedron_3.h index 3e4cd452af4..17a36363cd0 100644 --- a/Polyhedron/include/CGAL/Polyhedron_3.h +++ b/Polyhedron/include/CGAL/Polyhedron_3.h @@ -1423,7 +1423,7 @@ public: // number of border halfedges. An edge with no incident facet // counts as two border halfedges. Precondition: `normalize_border // ()' has been called and no halfedge insertion or removal and no - // change in border status of the halfedges have occured since + // change in border status of the halfedges have occurred since // then. return hds_.size_of_border_halfedges(); } @@ -1434,7 +1434,7 @@ public: // facet on one side and to a hole on the other side. // Precondition: `normalize_border()' has been called and no // halfedge insertion or removal and no change in border status of - // the halfedges have occured since then. + // the halfedges have occurred since then. return hds_.size_of_border_edges(); } @@ -1445,7 +1445,7 @@ public: // halfedges_end()') denotes all border edges. Precondition: // `normalize_border()' has been called and no halfedge insertion // or removal and no change in border status of the halfedges have - // occured since then. + // occurred since then. return hds_.border_halfedges_begin(); } Halfedge_const_iterator border_halfedges_begin() const { diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h index 122f901fcf9..da9dd7ebcbc 100644 --- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h +++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_builder_from_STL.h @@ -67,7 +67,7 @@ public: } if(B.error()) { - std::cerr << "An error occured while creating a Polyhedron" << std::endl; + std::cerr << "An error occurred while creating a Polyhedron" << std::endl; B.rollback(); } diff --git a/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt b/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt index 260792a0c3a..0b4088ce277 100644 --- a/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt +++ b/Polytope_distance_d/doc/Polytope_distance_d/PackageDescription.txt @@ -9,7 +9,7 @@ \cgalPkgPicture{dist.png} \cgalPkgSummaryBegin \cgalPkgAuthors{Kaspar Fischer, Bernd Gärtner, Thomas Herrmann, Michael Hoffmann, and Sven Schönherr} -\cgalPkgDesc{This package provides algorithms for computing the distance between the convex hulls of two point sets in d-dimensional space, without explicitely constructing the convex hulls. It further provides an algorithm to compute the width of a point set, and the furthest point for each vertex of a convex polygon. } +\cgalPkgDesc{This package provides algorithms for computing the distance between the convex hulls of two point sets in d-dimensional space, without explicitly constructing the convex hulls. It further provides an algorithm to compute the width of a point set, and the furthest point for each vertex of a convex polygon. } \cgalPkgManuals{Chapter_Optimal_Distances,PkgPolytopeDistanceDRef} \cgalPkgSummaryEnd \cgalPkgShortInfoBegin diff --git a/Polytope_distance_d/include/CGAL/Width_3.h b/Polytope_distance_d/include/CGAL/Width_3.h index 25f877c9b0e..4d227d26a43 100644 --- a/Polytope_distance_d/include/CGAL/Width_3.h +++ b/Polytope_distance_d/include/CGAL/Width_3.h @@ -777,7 +777,7 @@ class Width_3 { #endif DEBUGENDL(INITIAL_VF_PAIR,"Initial plane E1:",A<<" "<nt0) { // update row and column maxima @@ -388,7 +388,7 @@ pricing_helper(int& direction, Tag_false /*is_in_standard_form*/ ) } } - // certify non-existance of entering variable, if necessary + // certify non-existence of entering variable, if necessary if ( min_j == -1) { // update row and column maxima diff --git a/QP_solver/test/QP_solver/README b/QP_solver/test/QP_solver/README index 84b59df326e..e97b2082afa 100644 --- a/QP_solver/test/QP_solver/README +++ b/QP_solver/test/QP_solver/README @@ -65,12 +65,12 @@ MPS-files in test_solver_data/masters/cgal/ and for each of them make sure that all its derivatives are present (generating them if need be, see below); finally, it collects a list of all these master and derivative filenames and stores it in test_solver.cin. The test_solver.cin file obtained in this way -is what gets commited to the CGAL repository. +is what gets committed to the CGAL repository. In contrast to this, "./create_test_solver_cin all 0" collects all master MPS-files (i.e., all MPS-files in test_solver_data/masters/), generates (if needed) the derivatives and puts the list of the names of all these files into -test_solver.cin. The resulting test_solver.cin should usually not be commited +test_solver.cin. The resulting test_solver.cin should usually not be committed to the CGAL repository (it takes too long to run this suite); so you would run "./test_solver < test_solver.cin" only locally. diff --git a/QP_solver/test/QP_solver/test_solver.cpp b/QP_solver/test/QP_solver/test_solver.cpp index 6fee93f375e..94ba061df45 100644 --- a/QP_solver/test/QP_solver/test_solver.cpp +++ b/QP_solver/test/QP_solver/test_solver.cpp @@ -376,7 +376,7 @@ bool process(const std::string& filename, // print program (using QMATRIX format), read it back in and check // whether it still agrees with the original program std::stringstream inout; - // if we have doubles, adjust precision to accomodate high-precision doubles + // if we have doubles, adjust precision to accommodate high-precision doubles if (is_double(IT())) inout << std::setprecision (12); CGAL::QP_functions_detail::print_program (inout, qp, std::string("test_io_mps"), diff --git a/QP_solver/test/QP_solver/test_solver_data/masters/cgal/QPE_solver_example_bug.mps b/QP_solver/test/QP_solver/test_solver_data/masters/cgal/QPE_solver_example_bug.mps index 92e7a6fe765..3b56f88742b 100644 --- a/QP_solver/test/QP_solver/test_solver_data/masters/cgal/QPE_solver_example_bug.mps +++ b/QP_solver/test/QP_solver/test_solver_data/masters/cgal/QPE_solver_example_bug.mps @@ -1,5 +1,5 @@ * Number-type: integer -* Description: Original example where the omission first occured. Forces an Z1 update +* Description: Original example where the omission first occurred. Forces an Z1 update * Generated-by: Generated by QPE_solver_example_bug.mw NAME QPE_solver_example_bug ROWS diff --git a/Ridges_3/include/CGAL/Ridges.h b/Ridges_3/include/CGAL/Ridges.h index 410ace65db9..e49e9eff128 100644 --- a/Ridges_3/include/CGAL/Ridges.h +++ b/Ridges_3/include/CGAL/Ridges.h @@ -238,7 +238,7 @@ class Ridge_approximation protected: const TriangleMesh& P; FT squared_model_size;//squared radius of the smallest enclosing sphere of the TriangleMesh - //used to make the sharpness scale independant and iso indep + //used to make the sharpness scale independent and iso indep Ridge_order tag_order; typedef std::map Facet2bool_map_type; @@ -437,7 +437,7 @@ compute_ridges(Ridge_interrogation_type r_type, OutputIterator ridge_lines_it, R Ridge_type cur_ridge_type = facet_ridge_type(f,h1,h2,r_type); if ( cur_ridge_type == NO_RIDGE ) continue; - //a ridge_line is begining and stored + //a ridge_line is beginning and stored Ridge_line* cur_ridge_line = new Ridge_line(P); init_ridge_line(cur_ridge_line, h1, h2, cur_ridge_type); *ridge_lines_it++ = cur_ridge_line; diff --git a/Ridges_3/include/CGAL/Umbilics.h b/Ridges_3/include/CGAL/Umbilics.h index 96431b1c170..d72b66c9bbb 100644 --- a/Ridges_3/include/CGAL/Umbilics.h +++ b/Ridges_3/include/CGAL/Umbilics.h @@ -89,7 +89,7 @@ operator<<(std::ostream& out_stream, const Umbilic& umbilic) case CGAL::NON_GENERIC_UMBILIC: out_stream << "non generic" << std::endl; break; case CGAL::ELLIPTIC_UMBILIC: out_stream << "elliptic" << std::endl; break; case CGAL::HYPERBOLIC_UMBILIC: out_stream << "hyperbolic" << std::endl; break; - default : out_stream << "Something wrong occured for sure..." << std::endl; break; + default : out_stream << "Something wrong occurred for sure..." << std::endl; break; } return out_stream; } diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h index 2cbc38a0a34..48263271f2c 100644 --- a/STL_Extension/include/CGAL/Compact_container.h +++ b/STL_Extension/include/CGAL/Compact_container.h @@ -164,7 +164,7 @@ struct Constant_size_policy }; // The following base class can be used to easily add a squattable pointer -// to a class (maybe you loose a bit of compactness though). +// to a class (maybe you lose a bit of compactness though). // TODO : Shouldn't adding these bits be done automatically and transparently, // based on the traits class info ? class Compact_container_base diff --git a/STL_Extension/include/CGAL/Handle_with_policy.h b/STL_Extension/include/CGAL/Handle_with_policy.h index 2f7d04a727f..46397e37050 100644 --- a/STL_Extension/include/CGAL/Handle_with_policy.h +++ b/STL_Extension/include/CGAL/Handle_with_policy.h @@ -540,7 +540,7 @@ public: while ( new_rep->next != 0) new_rep = static_cast(new_rep->next); // path compression: assign new rep to all reps seen on the path - // update reference count properly: all reps on the path loose + // update reference count properly: all reps on the path lose // one reference, and the new_rep gains all of them unless // the rep on the path get actually deleted. Rep* rep = h.ptr_; diff --git a/STL_Extension/include/CGAL/Multiset.h b/STL_Extension/include/CGAL/Multiset.h index da0ec9bf16f..13e92cb45d0 100644 --- a/STL_Extension/include/CGAL/Multiset.h +++ b/STL_Extension/include/CGAL/Multiset.h @@ -48,7 +48,7 @@ namespace CGAL { * It has to support the default constructor, the copy constructor and * the assignment operator (operator=). * - Compare is a three-valued functor used to define the order of objects of - * class Type: It has to support an operator() that recieves two objects from + * class Type: It has to support an operator() that receives two objects from * the Type class and returns SMALLER, EQUAL or LARGER, depending on the * comparison result. * In case the deafult parameter is supplied, the Type class has to support @@ -2007,7 +2007,7 @@ Multiset::insert_after (iterator position, if (rootP == NULL) { - // In case the tree is empty, make sure that we did not recieve a valid + // In case the tree is empty, make sure that we did not receive a valid // iterator. CGAL_multiset_precondition (nodeP == NULL); @@ -2105,7 +2105,7 @@ Multiset::insert_before (iterator position, if (rootP == NULL) { - // In case the tree is empty, make sure that we did not recieve a valid + // In case the tree is empty, make sure that we did not receive a valid // iterator. CGAL_multiset_precondition (nodeP == NULL); diff --git a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Scale_space_reconstruction_3.txt b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Scale_space_reconstruction_3.txt index 658a9b11c06..ee08e5682ed 100644 --- a/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Scale_space_reconstruction_3.txt +++ b/Scale_space_reconstruction_3/doc/Scale_space_reconstruction_3/Scale_space_reconstruction_3.txt @@ -52,7 +52,7 @@ The point set at the initial scale is equivalent to the input point set. In theo - `CGAL::Scale_space_reconstruction_3::Weighted_PCA_smoother` (default) uses the density-weighted principal component analysis (PCA) of the local neighborhood. If the point set was sampled from a surface for which any unwanted deformation and sampling noise is smaller than the neighborhood size, the scale is coarse enough for mesh reconstruction after a few iterations of increasing the scale. -- `CGAL::Scale_space_reconstruction_3::Jet_smoother` uses the function `CGAL::jet_smooth_point_set()` that projects the point to a local smooth (jet) surface. This smoothing is less agressive and should be used if the point set is not very noisy and if a higher precision is sough. +- `CGAL::Scale_space_reconstruction_3::Jet_smoother` uses the function `CGAL::jet_smooth_point_set()` that projects the point to a local smooth (jet) surface. This smoothing is less aggressive and should be used if the point set is not very noisy and if a higher precision is sough. Users can define their own smoothing operators by following the concept `CGAL::Scale_space_reconstruction_3::Smoother`. diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal index 848566200f7..0cae40110f4 100755 --- a/Scripts/developer_scripts/autotest_cgal +++ b/Scripts/developer_scripts/autotest_cgal @@ -900,14 +900,14 @@ lockfile -r 1 "$LOCK_FILE"; if [ ${?} != 0 ]; then PID=`cat "$LOCK_FILE"` if kill -0 "$PID"; then - log "${ACTUAL_LOGFILE}" "COULD NOT AQUIRE LOCK! LOCKING PROCESS PID=$PID"; + log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID"; exit 1; else # The locking process has died without erasing the lock file rm -f "$LOCK_FILE" lockfile -r 1 "$LOCK_FILE"; if [ ${?} != 0 ]; then - log "${ACTUAL_LOGFILE}" "COULD NOT AQUIRE LOCK!"; + log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK!"; exit 1 fi fi diff --git a/SearchStructures/doc/SearchStructures/SearchStructures.txt b/SearchStructures/doc/SearchStructures/SearchStructures.txt index 6c6cb96281c..67818e9024a 100644 --- a/SearchStructures/doc/SearchStructures/SearchStructures.txt +++ b/SearchStructures/doc/SearchStructures/SearchStructures.txt @@ -132,7 +132,7 @@ window queries, enclosing queries, and inverse range queries on the keys. Clearly, an inverse range query makes only sense in the segment tree. In order to perform an inverse range query, a range query of -\f$ \epsilon\f$ width has to be performed. We prefered not to offer an +\f$ \epsilon\f$ width has to be performed. We preferred not to offer an extra function for this sort of query, since the inverse range query is a special case of the range query. Furthermore, offering an inverse range query in the segment tree class implies offering this diff --git a/Set_movable_separability_2/doc/Set_movable_separability_2/Set_movable_separability_2.txt b/Set_movable_separability_2/doc/Set_movable_separability_2/Set_movable_separability_2.txt index 1e320fd62f3..32e3051acd5 100644 --- a/Set_movable_separability_2/doc/Set_movable_separability_2/Set_movable_separability_2.txt +++ b/Set_movable_separability_2/doc/Set_movable_separability_2/Set_movable_separability_2.txt @@ -16,7 +16,7 @@ while considering different kinds of motions and various definitions of separation. The Moving sofa problem or sofa problem is a classic member of this -class. It is a two-dimensional idealisation of real-life +class. It is a two-dimensional idealization of real-life furniture-moving problems; it asks for the rigid two-dimensional shape of largest area \f$A\f$ that can be maneuvered through an L-shaped planar region with legs of unit width \cgalCite{w-sf-76}. The area @@ -77,7 +77,7 @@ Chapter_2D_Regularized_Boolean_Set-Operations "2D Regularized Boolean Set-Operations" for the precise definition of simple polygons. Secondly, any consecutive three vertices cannot be collinear. If you suspect that the input polygon may not satisfy the -latter condition, pre-process the polygon to elliminate this +latter condition, pre-process the polygon to eliminate this ill-condition. The implementation is based on an algorithm developed by Shamai and diff --git a/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp b/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp index fc3ae4312fc..7cf4213c15d 100644 --- a/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp +++ b/Spatial_searching/test/Spatial_searching/iso_rectangle_2_query_2.cpp @@ -27,7 +27,7 @@ main() { //inserting N points one-by-one, thus the use of "reserve" is recommended, and we use it tree.reserve(N); - //to test wether the tree.capacity() function works properly. + //to test whether the tree.capacity() function works properly. if( tree.capacity() < N) { std::cerr << "ERROR: Something is wrong with allocating points memory." << std::endl; diff --git a/Straight_skeleton_2/doc/Straight_skeleton_2/Straight_skeleton_2.txt b/Straight_skeleton_2/doc/Straight_skeleton_2/Straight_skeleton_2.txt index 108484ae6f3..5ce74a182ba 100644 --- a/Straight_skeleton_2/doc/Straight_skeleton_2/Straight_skeleton_2.txt +++ b/Straight_skeleton_2/doc/Straight_skeleton_2/Straight_skeleton_2.txt @@ -304,7 +304,7 @@ roundoff in the coordinates of the output points will cause parallel edges that almost collapse-but not so-to become really collinear or even cross each other. -Thus, it is neccessary to use a kernel with exact constructions if +Thus, it is necessary to use a kernel with exact constructions if offset polygons must be simple, yet computing a straight skeleton using that kernel is very slow, much more than computing the offset polygons. To help with this, it is possible to construct the straight @@ -411,7 +411,7 @@ Constructing the exterior skeleton of the outer contour is possible by means of To construct exterior offset contours in the inside of each hole you just use the skeleton constructed in the interior, and, if required, revert the orientation of each resulting offset contour. -Constructing exterior offset contours in the outside of the outer contour is just a little bit more involved: Since the contour is placed as a hole of a frame, you will always obtain 2 offset contours for any given distance; one is the offseted frame and the other is the offseted contour. Thus, from the resulting offset contour sequence, you always need to discard the offsetted frame, easily identified as the offset contour with the largest area. +Constructing exterior offset contours in the outside of the outer contour is just a little bit more involved: Since the contour is placed as a hole of a frame, you will always obtain 2 offset contours for any given distance; one is the offsetted frame and the other is the offsetted contour. Thus, from the resulting offset contour sequence, you always need to discard the offsetted frame, easily identified as the offset contour with the largest area. It is necessary to place the frame sufficiently away from the contour. If it is not, it could occur that the outward offset contour collides and merges with the inward offset frame, resulting in 1 instead of 2 offset contours. @@ -441,7 +441,7 @@ On the other hand, only reflex vertices (whose internal angle \f$ > \pi\f$) are the source of deviations of the bisectors from its center location. Therefore, for convex polygons, the straight skeleton, the medial axis and the Voronoi diagram are exactly equivalent, -and, if a non-convex polygon contains only vertices of low +and, if a non-convex polygon contains only vertices of lowfor f in *.txt ; do echo $f ; aspell list < $f | sort | uniq -c ; done reflexivity, the straight skeleton bisectors will be placed nearly equidistant to their defining edges, producing a straight skeleton pretty much alike a proper medial axis. diff --git a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h index 4ff949a6df7..201e2113131 100644 --- a/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h +++ b/Straight_skeleton_2/include/CGAL/predicates/Straight_skeleton_pred_ftC2.h @@ -212,11 +212,11 @@ Uncertain exist_offset_lines_isec2 ( intrusive_ptr< Trisegment_2 > cons } } else{ - CGAL_STSKEL_TRAITS_TRACE("\nDenominator is probably zero (but not exactly), event existance is indeterminate." ) ; + CGAL_STSKEL_TRAITS_TRACE("\nDenominator is probably zero (but not exactly), event existence is indeterminate." ) ; } } else{ - CGAL_STSKEL_TRAITS_TRACE("\nEvent time overflowed, event existance is indeterminate." ) ; + CGAL_STSKEL_TRAITS_TRACE("\nEvent time overflowed, event existence is indeterminate." ) ; } } else diff --git a/Surface_mesh/doc/Surface_mesh/Surface_mesh.txt b/Surface_mesh/doc/Surface_mesh/Surface_mesh.txt index b00d486b22f..9856b42bccc 100644 --- a/Surface_mesh/doc/Surface_mesh/Surface_mesh.txt +++ b/Surface_mesh/doc/Surface_mesh/Surface_mesh.txt @@ -276,7 +276,7 @@ or segmentation algorithms work for `Surface_mesh` and `Polyhedron_3`. BGL algorithms use property maps in order to associate information to vertices and edges. One important property is the index, an integer between `0` and `num_vertices(g)` for the vertices of a graph `g`. -This allows algorithms to create a vector of the approriate size +This allows algorithms to create a vector of the appropriate size in order to store per vertex information. For example a Boolean for storing if a vertex has already been visited during a graph traversal. @@ -303,7 +303,7 @@ this boils down to an identity function as vertices \em are indices. \cgalExample{Surface_mesh/sm_bgl.cpp} -\section sectionSurfaceMesh_memory Memory Managment +\section sectionSurfaceMesh_memory Memory Management Memory management is semi-automatic. Memory grows as more elements are added to the structure but does not shrink when elements are @@ -363,7 +363,7 @@ Result of the run of the draw_surface_mesh program. A window shows the surface m As integer type for the indices we have chosen `boost::uint32_t`. On 64 bit operating systems they take only half the size of a pointer. They still allow to have meshes with 2 billion elements. -We use `std::vector` for storing properties. So by accessing the adress +We use `std::vector` for storing properties. So by accessing the address of the 0th element of a property map you can access the underlying raw array. This may be useful, for example for passing an array of points to OpenGL. diff --git a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Surface_Mesh_Segmentation.txt b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Surface_Mesh_Segmentation.txt index a574e9d53dc..da48b479ff7 100644 --- a/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Surface_Mesh_Segmentation.txt +++ b/Surface_mesh_segmentation/doc/Surface_mesh_segmentation/Surface_Mesh_Segmentation.txt @@ -206,8 +206,8 @@ When using a `Surface_mesh`, you can use the built-in property mechanism. \cgalExample{Surface_mesh_segmentation/segmentation_from_sdf_values_SM_example.cpp} -\subsection Surface_mesh_segmentationIndependantmeshpersegment Independant TriangleMesh per Segment - It is possible to consider each segment as an independant triangle mesh, like in the following example, where the area of each segment is computed. +\subsection Surface_mesh_segmentationIndependentmeshpersegment Independent TriangleMesh per Segment + It is possible to consider each segment as an independent triangle mesh, like in the following example, where the area of each segment is computed. \cgalExample{Surface_mesh_segmentation/extract_segmentation_into_mesh_example.cpp} @@ -280,7 +280,7 @@ A comparison with biased and uniform sampling of points can be seen in \cgalFigu The mesh segmentation problem being ill-posed, the mesh segmentation community have proposed some benchmarks to evaluate the quality of a given algorithm. A benchmark is composed of a set of models and a software responsible for scoring the results. On a particular benchmark \cite Chen2009SegmentationBenchmark, the current implementation obtains the -score of XXX. The code used in the benchmark is provided as an exemple XXX. +score of XXX. The code used in the benchmark is provided as an example XXX. \todo Add the score and the source code used for the benchmark --> diff --git a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h index 43dc6053805..395e46dcf83 100644 --- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h +++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Alpha_expansion_graph_cut.h @@ -276,7 +276,7 @@ public: edge_creation_time += timer.time(); #endif - // initialize vertex indices, it is neccessary since we are using VertexList = listS + // initialize vertex indices, it is necessary since we are using VertexList = listS Vertex_iterator v_begin, v_end; Traits::vertices_size_type index = 0; for(boost::tie(v_begin, v_end) = vertices(graph); v_begin != v_end; ++v_begin) { diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Utils.h b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Utils.h index d5fe1a9c16a..997bb3c5449 100644 --- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Utils.h +++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/Utils.h @@ -7,7 +7,7 @@ bool read_to_polyhedron(const char* file_name, Polyhedron& mesh) std::ifstream input(file_name); if ( !input || !(input >> mesh) || mesh.empty() ){ - std::cerr << "Problem occured while reading off file"; + std::cerr << "Problem occurred while reading off file"; return false; } return true; diff --git a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h index 86169e4583a..ec6f44e5a28 100644 --- a/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h +++ b/Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h @@ -851,7 +851,7 @@ private: // A potential optimization could be made by only expanding in the 'necessary' range (i.e. the range outside of geodesic visibility), but the // benefits may be small, since the node filter would prevent more than one-level propagation. - // It would also be neccessary to distinguish expanding a root vertex node from a pseudo-source node + // It would also be necessary to distinguish expanding a root vertex node from a pseudo-source node do { diff --git a/Surface_mesher/TODO b/Surface_mesher/TODO index 52bae23251b..34a04da7c79 100644 --- a/Surface_mesher/TODO +++ b/Surface_mesher/TODO @@ -5,7 +5,7 @@ Laurent Rineau, 2006/09/14 - use Kernel::Assign_3 instead of CGAL::assign Laurent Rineau, 2006/08/10 -- try to ease the maintainance of Surface_mesher and Mesh_3 demos: +- try to ease the maintenance of Surface_mesher and Mesh_3 demos: - demo/Surface_mesher/implicit_surface_mesher.cpp - demo/Surface_mesher/polyhedral_surface_mesher.cpp - examples/Mesh_3/implicit_surfaces_mesher_3.cpp diff --git a/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h b/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h index cb596b6801f..e1016acde8b 100644 --- a/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h +++ b/Surface_mesher/archive/include/CGAL/enriched_polyhedron.h @@ -67,7 +67,7 @@ public: }; // a refined halfedge with a general tag and -// a binary tag to indicate wether it belongs +// a binary tag to indicate whether it belongs // to the control mesh or not template class Enriched_halfedge : public CGAL::HalfedgeDS_halfedge_base @@ -380,7 +380,7 @@ public : return CGAL::circulator_size(pVertex->vertex_begin()); } - // check wether a vertex is on a boundary or not + // check whether a vertex is on a boundary or not static bool is_border(Vertex_handle pVertex) { Halfedge_around_vertex_circulator pHalfEdge = pVertex->vertex_begin(); diff --git a/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.cpp b/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.cpp index 5a9f7c1e604..5373cf751cd 100644 --- a/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.cpp +++ b/Surface_mesher/examples/Surface_mesher/mesh_a_3d_gray_image.cpp @@ -24,7 +24,7 @@ int main() { // the 'function' is a 3D gray level image Gray_level_image image("data/skull_2.9.inr", 2.9f); - // Carefully choosen bounding sphere: the center must be inside the + // Carefully chosen bounding sphere: the center must be inside the // surface defined by 'image' and the radius must be high enough so that // the sphere actually bounds the whole image. GT::Point_3 bounding_sphere_center(122., 102., 117.); diff --git a/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h b/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h index efac2e8109c..5e91785fbd1 100644 --- a/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h +++ b/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h @@ -452,7 +452,7 @@ protected: /*! Add a subcurve to the right of an event point. * \param event The event point. * \param curve The subcurve to add. - * \return (true) if an overlap occured; (false) otherwise. + * \return (true) if an overlap occurred; (false) otherwise. */ virtual bool _add_curve_to_right(Event* event, Subcurve* curve); diff --git a/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_subcurve.h b/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_subcurve.h index e155d1f1b70..aae2105b266 100644 --- a/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_subcurve.h +++ b/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_subcurve.h @@ -174,7 +174,7 @@ protected: // Data members: X_monotone_curve_2 m_last_curve; // The portion of the curve that lies to // the right of the last event point - // that occured on the curve. + // that occurred on the curve. public: /*! Construct default. */ diff --git a/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h b/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h index e2a75d6375e..229be666185 100644 --- a/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h +++ b/Surface_sweep_2/include/CGAL/Surface_sweep_2/Surface_sweep_2_impl.h @@ -347,7 +347,7 @@ bool Surface_sweep_2::_add_curve_to_right(Event* event, Subcurve* curve) // that the overlapping curve will be added to the right of // `event` because of an adjacency in the status line. - // Indicate that an overlap has occured: + // Indicate that an overlap has occurred: CGAL_SS_PRINT_END_EOL("adding a Curve to the right (overlap)"); return true; } @@ -570,7 +570,7 @@ template // If the two subcurves have a common right-event, and the last intersection // object is a point, we can ignore last intersection (note that in case of - // an overlap that ends at the common endpoint, we definately want to keep + // an overlap that ends at the common endpoint, we definitely want to keep // the intersection object). if (c1->right_event() == c2->right_event()) { vector_inserter vi_last = vi_end; diff --git a/TDS_2/doc/TDS_2/TDS_2.txt b/TDS_2/doc/TDS_2/TDS_2.txt index d650a466019..d5caf752b9e 100644 --- a/TDS_2/doc/TDS_2/TDS_2.txt +++ b/TDS_2/doc/TDS_2/TDS_2.txt @@ -317,7 +317,7 @@ and `TriangulationFaceBase_2`. See Section \ref Section_2D_Triangulations_Flexibility "Flexibility" of the chapter on 2D triangulations -for examples which make use of the flexilibity of the triangulation data structure. +for examples which make use of the flexibility of the triangulation data structure. */ } /* namespace CGAL */ diff --git a/Three/include/CGAL/Three/Scene_item.h b/Three/include/CGAL/Three/Scene_item.h index 1bc24219479..8337c9dfbc3 100644 --- a/Three/include/CGAL/Three/Scene_item.h +++ b/Three/include/CGAL/Three/Scene_item.h @@ -209,7 +209,7 @@ public: virtual bool manipulatable() const { return false; } //!\brief The manipulatedFrame of the item. //! - //! A manipulated frame is an independant system that can be + //! A manipulated frame is an independent system that can be //! translated or rotated using the Ctrl key and the mouse. //!@returns the manipulatedFrame of the item. virtual ManipulatedFrame* manipulatedFrame() { return 0; } diff --git a/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h b/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h index cbbe03db232..5a1b8649f68 100644 --- a/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h +++ b/Triangulation/doc/Triangulation/Concepts/TriangulationDataStructure.h @@ -556,8 +556,8 @@ This method does exactly the opposite of `insert_increase_dimension()`: `v` is removed, full cells not containing `star` are removed, -full cells containing `star` but not `v` loose vertex `star`, -full cells containing `star` and `v` loose vertex `v` +full cells containing `star` but not `v` lose vertex `star`, +full cells containing `star` and `v` lose vertex `v` (see Figure \cgalFigureRef{triangulationfiginsertincreasedim}). \pre All cells contain either `star` or `v`. Edge `star-v` exists in the triangulation diff --git a/Triangulation/doc/Triangulation/Triangulation.txt b/Triangulation/doc/Triangulation/Triangulation.txt index 7155810157a..c3cf1c75e4e 100644 --- a/Triangulation/doc/Triangulation/Triangulation.txt +++ b/Triangulation/doc/Triangulation/Triangulation.txt @@ -193,7 +193,7 @@ full cell. This improves speed a little, but requires more memory. \cgalAdvanced \cgal provides the class template `Triangulation_ds_full_cell` for representing full cells in a -triangulation. Its second template parameter is used to specify wether +triangulation. Its second template parameter is used to specify whether or not the mirror indices should be kept in memory or computed on-the-fly, which is the default case. Please refer to the documentation of that class template for specific details. diff --git a/Triangulation/include/CGAL/Triangulation.h b/Triangulation/include/CGAL/Triangulation.h index 28308eedc23..ccb4249bc8d 100644 --- a/Triangulation/include/CGAL/Triangulation.h +++ b/Triangulation/include/CGAL/Triangulation.h @@ -316,7 +316,7 @@ public: #endif { // We find the vertex at infinity by scanning the vertices of both - // triangulations. This works because Compact_container garantees that + // triangulations. This works because Compact_container guarantees that // the vertices in the copy (*this) are stored in the same order as in // the original triangulation (t2) infinity_ = vertices_begin(); diff --git a/Triangulation/include/CGAL/Triangulation_ds_vertex.h b/Triangulation/include/CGAL/Triangulation_ds_vertex.h index 83ab7f5261d..0c476f6585c 100644 --- a/Triangulation/include/CGAL/Triangulation_ds_vertex.h +++ b/Triangulation/include/CGAL/Triangulation_ds_vertex.h @@ -84,7 +84,7 @@ public: return false; } bool found(false); - // These two typename below are OK because TDS fullfils the + // These two typename below are OK because TDS fulfils the // TriangulationDataStructure concept. typename TDS::Full_cell::Vertex_handle_iterator vit(full_cell()->vertices_begin()); typedef typename TDS::Vertex_handle Vertex_handle; diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_2.h index 51ce3817ddd..0f2a30c720e 100644 --- a/Triangulation_2/include/CGAL/Regular_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Regular_triangulation_2.h @@ -990,7 +990,7 @@ is_valid(bool verbose, int /* level */) const // cannot call for is_valid() of Base Triangulation class // because 1) number of vertices of base class does not match // tds.is_valid calls is_valid for each vertex - // and the test is not fullfilled by hidden vertices ... + // and the test is not fulfilled by hidden vertices ... // result = result && Triangulation_2::is_valid(verbose, level); bool result = true; for(All_faces_iterator fit = all_faces_begin(); diff --git a/Triangulation_3/TODO b/Triangulation_3/TODO index 302b6fba736..93ab1024c36 100644 --- a/Triangulation_3/TODO +++ b/Triangulation_3/TODO @@ -9,11 +9,11 @@ TDS instead of having a cell which stores 4 vertex pointers, it only stores the XOR of them. And a Cell_handle now additionaly stores the 4 vertex pointers of the cell, the "context". - One problem is the Cell_iterator : it looses the context, so I think that + One problem is the Cell_iterator : it loses the context, so I think that one way to work around this is to write the Cell_iterator as based on the Vertex_iterator (a bit like the reverse used to be made) : we iterate over the vertices, and for each vertex, we compute the incident cells, but we - pick only those whose smallest vertex (adress-wise) is the one in question. + pick only those whose smallest vertex (address-wise) is the one in question. T3 - documenter le 2eme tableau de Triangulation_utils diff --git a/Triangulation_3/demo/Triangulation_3/Scene.cpp b/Triangulation_3/demo/Triangulation_3/Scene.cpp index ab6367885cf..50df80a6051 100644 --- a/Triangulation_3/demo/Triangulation_3/Scene.cpp +++ b/Triangulation_3/demo/Triangulation_3/Scene.cpp @@ -183,7 +183,7 @@ void Scene::savePointsOFF(const char* filename) ofstream fout; fout.open( filename ); if( !fout ) { - showError( QObject::tr("Error: cannot open file %1 for writting.").arg(filename) ); + showError( QObject::tr("Error: cannot open file %1 for writing.").arg(filename) ); return; } @@ -221,7 +221,7 @@ void Scene::savePointsXYZ(const char* filename) fout.open( filename ); // Check whether the file is opened properly if( !fout ) { - showError( QObject::tr("Error: cannot open file %1 for writting.").arg(filename) ); + showError( QObject::tr("Error: cannot open file %1 for writing.").arg(filename) ); return; } diff --git a/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_delaunay_3.h b/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_delaunay_3.h index dd437b26bd7..1de9cf3de35 100644 --- a/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_delaunay_3.h +++ b/Triangulation_3/test/Triangulation_3/include/CGAL/_test_cls_delaunay_3.h @@ -297,7 +297,7 @@ _test_cls_delaunay_3(const Triangulation &) /************** and I/O ****************************/ std::cout << " Constructor " << std::endl; - // Begining with an empty triangulation and adding point until reaching + // Beginning with an empty triangulation and adding point until reaching // 3-dimentional triangulation. Cls T0; assert(T0.dimension() == -1);