From 8366c4896c0a990d25ad2573c618c2d2f42f844c Mon Sep 17 00:00:00 2001 From: Iordan Iordanov Date: Fri, 9 Mar 2018 11:44:02 +0100 Subject: [PATCH] fixed tests --- .../test_p4ht2_dummy_points.cpp | 1 - .../test_p4ht2_hyperbolic_vs_euclidean.cpp | 1 - .../test_p4ht2_insertion.cpp | 1 - .../test_p4ht2_locate.cpp | 1 - .../test_p4ht2_removal.cpp | 1 - .../test_p4ht2_remove_dummy_points.cpp | 1 - .../test_p4ht2_triangulation.cpp | 1 - .../test_p4ht2_words.cpp | 16 ++++++++-------- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_dummy_points.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_dummy_points.cpp index 5ccafd30f64..4610cd02e18 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_dummy_points.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_dummy_points.cpp @@ -31,7 +31,6 @@ using std::endl; int main(void) { Triangulation tr; - tr.insert_dummy_points(); cout << "Triangulation successfully initialized with dummy points!" << endl << "---------------------------------------------" << endl; cout << "Number of vertices: " << tr.number_of_vertices() << endl; diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_hyperbolic_vs_euclidean.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_hyperbolic_vs_euclidean.cpp index 9b4665c6b1d..f826bb6a1f7 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_hyperbolic_vs_euclidean.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_hyperbolic_vs_euclidean.cpp @@ -84,7 +84,6 @@ int main(int argc, char** argv) { cout << "iteration " << exec << ": inserting into hyperbolic periodic triangulation... "; cout.flush(); Triangulation tr; - tr.insert_dummy_points(true); CGAL::Timer t1; t1.start(); tr.insert(pts.begin(), pts.end()); diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_insertion.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_insertion.cpp index f55f8c34fa0..72fdf5313eb 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_insertion.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_insertion.cpp @@ -97,7 +97,6 @@ int main(int argc, char** argv) { cout << "iteration " << exec << ": inserting into triangulation (rational dummy points)... "; cout.flush(); Triangulation tr; - tr.insert_dummy_points(true); CGAL::Timer tt; tt.start(); diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp index 3838ba67bbc..cdd662ba722 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_locate.cpp @@ -45,7 +45,6 @@ using std::endl; int main(void) { Triangulation tr; - tr.insert_dummy_points(true); assert(tr.is_valid()); diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp index abe0456e0db..8e11c37bb50 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_removal.cpp @@ -36,7 +36,6 @@ int main(int argc, char** argv) { int N = atoi(argv[1]); Triangulation tr; - tr.insert_dummy_points(); cout << "Triangulation successfully initialized with dummy points!" << endl << "---------------------------------------------" << endl; cout << "Number of vertices: " << tr.number_of_vertices() << endl; diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_remove_dummy_points.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_remove_dummy_points.cpp index ddfece99dfa..896c91fbb10 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_remove_dummy_points.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_remove_dummy_points.cpp @@ -50,7 +50,6 @@ int main(int argc, char** argv) { Hyperbolic_random_points_in_disc_2_double(v, N, -1, 0.159); Triangulation tr; - tr.insert_dummy_points(true); assert(tr.is_valid(true)); int cnt = 0; diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_triangulation.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_triangulation.cpp index 5b63e8cffb3..7f3087b3d07 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_triangulation.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_triangulation.cpp @@ -21,7 +21,6 @@ int main(void) { typedef CGAL::Periodic_4_hyperbolic_Delaunay_triangulation_2 Triangulation; Triangulation tr; - tr.insert_dummy_points(false); CGAL_assertion(tr.is_valid()); cout << "triangulation works!" << diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_words.cpp b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_words.cpp index 22efcc55c1d..770bb7d0200 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_words.cpp +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/test_p4ht2_words.cpp @@ -18,16 +18,16 @@ int main(void) { typedef Hyperbolic_octagon_translation Word; Word w; - cout << "empty word: " << w << ", matrix: " << w.matrix() << endl; + // cout << "empty word: " << w << ", matrix: " << w.matrix() << endl; Word a(0), ab(0, 5), abc(0, 5, 2), abcd(0, 5, 2, 7), dcb(7, 2, 5), dc(7, 2), d(7); - cout << "a = " << a << ", matrix: " << a.matrix() << endl; - cout << "ab = " << ab << ", matrix: " << ab.matrix() << endl; - cout << "abc = " << abc << ", matrix: " << abc.matrix() << endl; - cout << "abcd = " << abcd << ", matrix: " << abcd.matrix() << endl; - cout << "dcb = " << dcb << ", matrix: " << dcb.matrix() << endl; - cout << "dc = " << dc << ", matrix: " << dc.matrix() << endl; - cout << "d = " << d << ", matrix: " << d.matrix() << endl; + // cout << "a = " << a << ", matrix: " << a.matrix() << endl; + // cout << "ab = " << ab << ", matrix: " << ab.matrix() << endl; + // cout << "abc = " << abc << ", matrix: " << abc.matrix() << endl; + // cout << "abcd = " << abcd << ", matrix: " << abcd.matrix() << endl; + // cout << "dcb = " << dcb << ", matrix: " << dcb.matrix() << endl; + // cout << "dc = " << dc << ", matrix: " << dc.matrix() << endl; + // cout << "d = " << d << ", matrix: " << d.matrix() << endl; return 0; } \ No newline at end of file