From b5164ef580fc815c2040ed823e0a1df1d0bc1cb7 Mon Sep 17 00:00:00 2001 From: Daniel Russel Date: Wed, 24 Jan 2007 19:15:59 +0000 Subject: [PATCH] missed a couple --- .../Kinetic_data_structures/random_kds.cpp | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp b/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp index 409eda81694..c1c90481885 100644 --- a/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp +++ b/Kinetic_data_structures/test/Kinetic_data_structures/random_kds.cpp @@ -24,7 +24,7 @@ int main(int, char *[]) { CGAL::Random r(time(NULL)); int which = r.get_int(0,4); - int nump= r.get_int(10,20); + double nump= r.get_int(25,50); double end_time= r.get_double(10,100); if (which ==0) { std::cout << "Checking Delaunay_2" << std::endl; @@ -34,7 +34,7 @@ int main(int, char *[]) { typedef Traits::Kinetic_kernel::Point_2 Point; Traits tr(0, end_time); DS ds(tr); - for (int i=0; i< nump; ++i){ + for (int i=0; i< nump/1.5; ++i){ tr.active_points_2_table_handle()->insert(Point(rp(r, r.get_int(0,5)), rp(r, r.get_int(0,5)))); } @@ -73,7 +73,7 @@ int main(int, char *[]) { typedef Traits::Kinetic_kernel::Point_3 Point; Traits tr(0, end_time); DS ds(tr); - for (int i=0; i< nump; ++i){ + for (int i=0; i< nump/2; ++i){ tr.active_points_3_table_handle()->insert(Point(rp(r, r.get_int(0,5)), rp(r, r.get_int(0,5)), rp(r, r.get_int(0,5)))); @@ -88,7 +88,26 @@ int main(int, char *[]) { } else { std::cout << "Checking regular_3" << std::endl; - + typedef CGAL::Kinetic::Regular_triangulation_exact_simulation_traits Traits; + typedef CGAL::Kinetic::Regular_triangulation_3 DS; + typedef Traits::Kinetic_kernel::Motion_function F; + typedef Traits::Kinetic_kernel::Point_3 Bare_point; + typedef Traits::Kinetic_kernel::Weighted_point_3 Point; + Traits tr(0, end_time); + DS ds(tr); + for (int i=0; i< nump/2.5; ++i){ + tr.active_points_3_table_handle()->insert(Point(Bare_point(rp(r, r.get_int(0,5)), + rp(r, r.get_int(0,5)), + rp(r, r.get_int(0,5))), + rp(r, r.get_int(0,5)))); + } + std::cout << "Points are:\n"; + std::cout << *tr.active_points_3_table_handle() << std::endl; + ds.set_has_certificates(true); + ds.audit(); + tr.simulator_handle()->set_current_time(tr.simulator_handle()->end_time()); + ds.audit(); + std::cout << "Processed " << tr.simulator_handle()->current_event_number() << " events"<