From 289aaa6c97abd3f6aeecd7f20ced15186e7ceaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Fri, 5 May 2017 12:57:46 +0200 Subject: [PATCH] Check if ifstream is well formed --- .../Kinetic_Delaunay_triangulation_2.cpp | 7 +++++-- .../Kinetic_Delaunay_triangulation_3.cpp | 3 +++ .../examples/Kinetic_data_structures/Kinetic_sort.cpp | 3 +++ .../defining_a_simulation_traits.cpp | 10 +++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_2.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_2.cpp index 06f1c046263..8521a9f8d64 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_2.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_2.cpp @@ -15,9 +15,12 @@ int main() kdel.set_has_certificates(false); std::ifstream in("data/points_2"); - in >> *tr.active_points_2_table_handle(); - kdel.set_has_certificates(true); + CGAL_assertion(in.good()); + in >> *tr.active_points_2_table_handle(); + CGAL_assertion(!in.fail()); + + kdel.set_has_certificates(true); std::cout << "Starting to run" << std::endl; while (sp->next_event_time() diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_3.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_3.cpp index 715045059f7..9518972056a 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_3.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_Delaunay_triangulation_3.cpp @@ -15,7 +15,10 @@ int main() Traits::Simulator::Handle sp= tr.simulator_handle(); std::ifstream in("data/points_3"); + CGAL_assertion(in.good()); + in >> *tr.active_points_3_table_handle(); + CGAL_assertion(!in.fail()); kdel.set_has_certificates(true); diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_sort.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_sort.cpp index db5d7486a9a..b21e73e9af1 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_sort.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/Kinetic_sort.cpp @@ -14,7 +14,10 @@ int main() Traits::Simulator::Handle sp= tr.simulator_handle(); std::ifstream in("data/points_1"); + CGAL_assertion(in.good()); + in >> *tr.active_points_1_table_handle(); + CGAL_assertion(!in.fail()); while (sp->next_event_time() != sp->end_time()) { sp->set_current_event_number(sp->current_event_number()+1); diff --git a/Kinetic_data_structures/examples/Kinetic_data_structures/defining_a_simulation_traits.cpp b/Kinetic_data_structures/examples/Kinetic_data_structures/defining_a_simulation_traits.cpp index 72771ed1f00..4d976d61d25 100644 --- a/Kinetic_data_structures/examples/Kinetic_data_structures/defining_a_simulation_traits.cpp +++ b/Kinetic_data_structures/examples/Kinetic_data_structures/defining_a_simulation_traits.cpp @@ -109,19 +109,19 @@ int main() typedef CGAL::Kinetic::Delaunay_triangulation_2 KDel; My_simulation_traits tr(0, 10000); - My_simulation_traits::Simulator::Handle sp= tr.simulator_handle(); + My_simulation_traits::Simulator::Handle sp = tr.simulator_handle(); KDel kdel(tr); kdel.set_has_certificates(false); std::ifstream in("data/points_with_color_2"); + CGAL_assertion(in.good()); + in >> *tr.active_points_2_table_handle(); - - + CGAL_assertion(!in.fail()); kdel.set_has_certificates(true); - - + std::cout << "Starting to run" << std::endl; while (sp->next_event_time() < sp->end_time()) {