diff --git a/Visibility_2/include/CGAL/Simple_visibility_2.h b/Visibility_2/include/CGAL/Simple_visibility_2.h index 9c028cf7e29..bc56a381e5f 100644 --- a/Visibility_2/include/CGAL/Simple_visibility_2.h +++ b/Visibility_2/include/CGAL/Simple_visibility_2.h @@ -148,6 +148,11 @@ public: vertices.push_back(vertices[0]); } + std::cout << "VERTICES: " << vertices.size() << std::endl; + for(unsigned int i = 0 ; i < vertices.size() ; i++) { + std::cout << vertices[i] << std::endl; + } + visibility_region_impl(q); typename std::vector points; @@ -184,6 +189,7 @@ public: segments.end()); CGAL_precondition(out_arr.number_of_isolated_vertices() == 0); conditional_regularize(out_arr, Regularization_tag()); + vertices.clear(); } void visibility_region(const Point_2 &q, const Halfedge_const_handle he, @@ -228,6 +234,11 @@ public: } vertices.push_back(q); + std::cout << "VERTICES: " << vertices.size() << std::endl; + for(unsigned int i = 0 ; i < vertices.size() ; i++) { + std::cout << vertices[i] << std::endl; + } + visibility_region_impl(q); typename std::vector points; diff --git a/Visibility_2/test/Visibility_2/benchmark.cpp b/Visibility_2/test/Visibility_2/benchmark.cpp index 355ceb1eba7..d8763cdc76b 100644 --- a/Visibility_2/test/Visibility_2/benchmark.cpp +++ b/Visibility_2/test/Visibility_2/benchmark.cpp @@ -52,14 +52,14 @@ int main() { std::ifstream input("./data/simple_polygon_test_case_1.in"); CGAL::create_arrangement_from_file(arr, input); Simple_visibility_2 simple_visibility; - Simple_visibility_2 naive_visibility; + Naive_visibility_2 naive_visibility; CGAL::QueryChoice qchoice; qchoice = CGAL::FACE; typename Arrangement_2::Face_const_iterator fit; for (fit = arr.faces_begin(); fit != arr.faces_end(); ++fit) { if (!fit->is_unbounded()) { - CGAL::benchmark + CGAL::benchmark (simple_visibility, naive_visibility, arr, fit, qchoice); } } diff --git a/Visibility_2/test/Visibility_2/include/CGAL/test_utils.h b/Visibility_2/test/Visibility_2/include/CGAL/test_utils.h index b138f07f1a6..64e3057ddd5 100644 --- a/Visibility_2/test/Visibility_2/include/CGAL/test_utils.h +++ b/Visibility_2/test/Visibility_2/include/CGAL/test_utils.h @@ -434,7 +434,7 @@ void benchmark(Visibility_2_fst &visibility_fst, visibility_fst.visibility_region(curr_query_pt, face, out_arr_fst); } else { - visibility_fst.visibility_region(curr_query_pt, he, out_arr_fst); + // visibility_fst.visibility_region(curr_query_pt, he, out_arr_fst); } timer.stop(); @@ -447,12 +447,14 @@ void benchmark(Visibility_2_fst &visibility_fst, visibility_snd.visibility_region(curr_query_pt, face, out_arr_snd); } else { - visibility_snd.visibility_region(curr_query_pt, he, out_arr_snd); +// visibility_snd.visibility_region(curr_query_pt, he, out_arr_snd); } timer.stop(); std::cout << "Time to compute visibility region using second object for " << curr_query_pt << " : " << timer.time() << std::endl; + visibility_fst.print_arrangement(out_arr_fst); + visibility_fst.print_arrangement(out_arr_snd); assert(true == (CGAL::test_are_equal (out_arr_fst, out_arr_snd))); } while (++curr != circ);