diff --git a/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h b/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h index 179b222fab3..cc7f935ee2f 100644 --- a/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h +++ b/Visibility_2/doc/Visibility_2/Concepts/Visibility_2.h @@ -105,7 +105,7 @@ Detaches the arrangement from the visibility object it is currently attached to /*! Access to the attached arrangement */ - const Arrangement_2& arr() const; + const Arrangement_2& arrangement_2() const; /*! Computes the visibility region for the given query point `q` in the @@ -120,7 +120,7 @@ must be mutual convertible to Visibility_2::Traits_2. \param q is the query point \param f is the face of the arrangement in which the visibility region is computed \param out_arr is the output arrangement -\pre `f` is a face of `this->arr()` +\pre `f` is a face of `this->arrangement_2()` \pre `q` is in the interior of the given face `f` \return the face handle to the face in `out_arr` that represents interior of the visibility region */ @@ -143,7 +143,7 @@ must be mutual convertible to Visibility_2::Traits_2. \param q is the query point \param e the halfedge on which `q` is located \param out_arr is the output arrangement -\pre `e` is a halfedge of `this->arr()` +\pre `e` is a halfedge of `this->arrangement_2()` \pre `q` is on `e` \pre `q` equals to `e->target()->point()` if `q` is an endpoint of `e` \return a handle to the face in `out_arr` that represents the interior of the visibility region diff --git a/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h b/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h index df84aa0350c..c5724dbab79 100644 --- a/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h +++ b/Visibility_2/include/CGAL/Preprocessed_rotational_sweep_visibility_2.h @@ -70,7 +70,7 @@ public: p_arr = NULL; } - Input_Arrangement_2 arr() { + Input_Arrangement_2 arrangement_2()() { return *p_arr; } diff --git a/Visibility_2/include/CGAL/Rotational_sweep_visibility_2.h b/Visibility_2/include/CGAL/Rotational_sweep_visibility_2.h index e5389062caa..c3fbc0ffdbe 100644 --- a/Visibility_2/include/CGAL/Rotational_sweep_visibility_2.h +++ b/Visibility_2/include/CGAL/Rotational_sweep_visibility_2.h @@ -397,7 +397,7 @@ void detach() { geom_traits = NULL; } -const Arrangement_2& arr() { +const Arrangement_2& arrangement_2() { return *p_arr; } diff --git a/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h b/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h index c376ce6f21d..c27a4c15e5d 100644 --- a/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h +++ b/Visibility_2/include/CGAL/Simple_polygon_visibility_2.h @@ -105,7 +105,7 @@ public: } /*! Getter method for the input arrangement*/ - const Arrangement_2& arr() { + const Arrangement_2& arrangement_2() { return *p_arr; } diff --git a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h index a3e18a51962..aceee08fac2 100644 --- a/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h +++ b/Visibility_2/include/CGAL/Triangular_expansion_visibility_2.h @@ -103,7 +103,7 @@ public: p_cdt = boost::shared_ptr(); } - const Arrangement_2& arr() { + const Arrangement_2& arrangement_2() { return *p_arr; } diff --git a/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h b/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h index 4a3ce119c18..361b794df12 100644 --- a/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h +++ b/Visibility_2/test/Visibility_2/include/CGAL/test_model_methods.h @@ -48,7 +48,7 @@ void test_model_methods_for_arr( assert(false == visibility.is_attached()); visibility.attach(arr); assert(true == visibility.is_attached()); - assert(true == (CGAL::test_are_equal(arr,visibility.arr()))); + assert(true == (CGAL::test_are_equal(arr,visibility.arrangement_2()))); Visibility_arrangement_2 arr_out; Visibility_arrangement_2 arr_out_check;