From 0adc2cb42c52faa059634ab974b3d983dc3f276b Mon Sep 17 00:00:00 2001
From: Claudia Werner <claudia.werner@inria.fr>
Date: Thu, 31 Jan 2013 10:24:59 +0100
Subject: [PATCH] cleaning-ups in test

---
 .../test/test_dts_illegal_points.cpp          | 12 +----
 .../test/test_random_constraint.cpp           | 44 +++----------------
 2 files changed, 7 insertions(+), 49 deletions(-)

diff --git a/Triangulation_on_sphere_2/test/test_dts_illegal_points.cpp b/Triangulation_on_sphere_2/test/test_dts_illegal_points.cpp
index 15a0fa62a27..7111dbb55a0 100644
--- a/Triangulation_on_sphere_2/test/test_dts_illegal_points.cpp
+++ b/Triangulation_on_sphere_2/test/test_dts_illegal_points.cpp
@@ -29,9 +29,7 @@ void testProjection(){
 	//legal points
 	Point p1 = Point (radius/sqrt(2), 0, radius/sqrt(2));
 	points.push_back(p1);
-	
-	
-	
+		
 	Point p2 = Point (-radius/sqrt(3), radius/sqrt(3),-radius/sqrt(3));
 	points.push_back(p2);
 		
@@ -47,9 +45,7 @@ void testProjection(){
 	//points original not on sphere
 	Point p5 = Point (radius, 0, -0.5 * radius);
 	points.push_back(p5);
-	
-	
-	
+		
 	
 	//Points too close
 	Point p6 = Point (5*radius, pow(2,-25),0);
@@ -157,10 +153,6 @@ void testDelaunay (){
 	
 }
 
-
-
-
-
 int main(){
 	std::cout<<"Test inserting illegal points with Delaunay_traits"<<std::endl;
 	testDelaunay();
diff --git a/Triangulation_on_sphere_2/test/test_random_constraint.cpp b/Triangulation_on_sphere_2/test/test_random_constraint.cpp
index a9012307ef6..ebc19384447 100644
--- a/Triangulation_on_sphere_2/test/test_random_constraint.cpp
+++ b/Triangulation_on_sphere_2/test/test_random_constraint.cpp
@@ -37,8 +37,7 @@ typedef CGAL::Delaunay_triangulation_3<K>         Delaunay;
 
 typedef CGAL::Delaunay_triangulation_sphere_traits_2<K>             Gt;
 typedef CGAL::Projection_sphere_traits_3<K>							Gt2;
-typedef CGAL::Constrained_Delaunay_triangulation_sphere_2<Gt>                   CTOS;
-typedef CGAL::Constrained_Delaunay_triangulation_sphere_2<Gt2>                  CTOS2;
+typedef CGAL::Constrained_Delaunay_triangulation_sphere_2<Gt>       CTOS;
 typedef K::Point_3                                                 Point;
 typedef  CTOS::Vertex_handle								Vertex_handle;
 
@@ -50,7 +49,7 @@ int main(){
 	
 	int nu_of_pts;
 	double radius;
-	nu_of_pts =pow(2,5);
+	nu_of_pts =pow(2,15);
 	radius=sqrt(110);
 	CGAL::Timer time;
 
@@ -60,11 +59,8 @@ int main(){
 	
 	
 	std::vector<Point> points;
-	//std::vector<Point> points2(points.size()+1);
 	std::vector<Point> points2;
-	//std::vector<Vertex_handle> vertices;
-	//vertices.reserve(nu_of_pts);
-	
+		
 	points2.push_back(Point(0,0,0));
 	
 	for (int count=0; count<nu_of_pts; count++) {
@@ -93,46 +89,16 @@ int main(){
 	rtos.insert_constraint(p2,p3);
 	rtos.insert_constraint(p3,p0);
 
-	//rtos.insert_constraint(points.at(4), points.at(5));
-	//rtos.insert(points.begin(), points.end());
-	
-	
-	
-	//rtos.insert(points.begin(),points.end());
+	rtos.insert(points.begin(),points.end());
 	time.stop();
 	rtos.is_valid();
 	std::cout<<"triangulation sphere    "<< time.time()<<std::endl;
 	std::cout<<"number of vertices   "<<rtos.number_of_vertices()<<std::endl;
 	
 	
-	//assert(rtos.number_of_vertices() == nu_of_pts+4);
+	assert(rtos.number_of_vertices() == nu_of_pts+4);
 	
 	
-/*
-	Point p4 = Point(10/sqrt(2),-10/sqrt(2),0);
-	Point p5 = Point (10/sqrt(2), 10/sqrt(2),0);
-	Point p6 = Point (10/sqrt(2), 0, 10/sqrt(2));
-	Point p7 = Point (10/sqrt(2), 0, -10/sqrt(2));
-	
-	
-	
-	//cdts.insert_constraint(p6,p7);
-	
-
-	
-	cdts.insert(Point(0,0,10));
-	cdts.insert(Point(0,0,-10));
-	cdts.insert(Point(0,10,0));
-	cdts.insert(Point(0,-10,0));
-	cdts.insert(Point(10,0,0));
-	cdts.insert(Point(-10,0,0));
-	cdts.insert_constraint(p4,p5);
-	std::cout<<"number of faces   "<< cdts.number_of_faces()<<std::endl;
-	cdts.is_valid();
-	cdts.show_all();
-	
-	cdts.insert(p7);
-*/	
 	
 }