mirror of https://github.com/CGAL/cgal
changed tests for degenerated cases
This commit is contained in:
parent
4f04c0829b
commit
fe6962cbb1
|
|
@ -1289,4 +1289,35 @@ Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/*.vcproj
|
||||||
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/*exe
|
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/*exe
|
||||||
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/Makefile
|
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/Makefile
|
||||||
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/simpleViewer
|
Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/simpleViewer
|
||||||
|
CGAL.xcodeproj/
|
||||||
|
CGALConfig.cmake
|
||||||
|
CMakeCache.txt
|
||||||
|
CMakeFiles/
|
||||||
|
CMakeScripts/
|
||||||
|
Installation/CMakeScripts/
|
||||||
|
Installation/cmake_install.cmake
|
||||||
|
Installation/src/CGAL/CMakeScripts/
|
||||||
|
Installation/src/CGAL/all_files.cpp
|
||||||
|
Installation/src/CGAL/cmake_install.cmake
|
||||||
|
Installation/src/CGAL_Core/
|
||||||
|
Installation/src/CGAL_ImageIO/
|
||||||
|
Installation/src/CGAL_Qt3/
|
||||||
|
Installation/src/CGAL_Qt4/
|
||||||
|
Installation/src/cmake_install.cmake
|
||||||
|
Triangulation_on_sphere_2/test/CMakeCache.txt
|
||||||
|
Triangulation_on_sphere_2/test/CMakeFiles/
|
||||||
|
Triangulation_on_sphere_2/test/CMakeLists.txt
|
||||||
|
Triangulation_on_sphere_2/test/CMakeScripts/
|
||||||
|
Triangulation_on_sphere_2/test/Debug/
|
||||||
|
Triangulation_on_sphere_2/test/build/
|
||||||
|
Triangulation_on_sphere_2/test/cmake_install.cmake
|
||||||
|
Triangulation_on_sphere_2/test/test_.build/
|
||||||
|
Triangulation_on_sphere_2/test/test_.xcodeproj/
|
||||||
|
VERSION
|
||||||
|
cmake_install.cmake
|
||||||
|
config/
|
||||||
|
|
||||||
|
lib/
|
||||||
|
|
||||||
|
|
||||||
/build*
|
/build*
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,8 @@ int main(int argc, char* argv[])
|
||||||
|
|
||||||
std::vector<K::Point_3> points;
|
std::vector<K::Point_3> points;
|
||||||
std::vector<K::Point_3> points2;
|
std::vector<K::Point_3> points2;
|
||||||
/*
|
std::vector<K::Point_3> points4;
|
||||||
|
|
||||||
// insert and remove 5 coplanar points. Points are also coplanar with the center of the sphere
|
// insert and remove 5 coplanar points. Points are also coplanar with the center of the sphere
|
||||||
Point_3 p1=Point_3(radius/sqrt(2), radius/sqrt(2), 0);
|
Point_3 p1=Point_3(radius/sqrt(2), radius/sqrt(2), 0);
|
||||||
Point_3 p2 = Point_3(-1*radius/sqrt(2), radius/sqrt(2), 0);
|
Point_3 p2 = Point_3(-1*radius/sqrt(2), radius/sqrt(2), 0);
|
||||||
|
|
@ -130,11 +131,19 @@ int main(int argc, char* argv[])
|
||||||
points.resize(5);
|
points.resize(5);
|
||||||
|
|
||||||
Vertex_handle v1 = rtos.insert(p1);
|
Vertex_handle v1 = rtos.insert(p1);
|
||||||
|
rtos.is_valid();
|
||||||
Vertex_handle v4 = rtos.insert(p4);
|
Vertex_handle v4 = rtos.insert(p4);
|
||||||
|
rtos.is_valid();
|
||||||
Vertex_handle v2 = rtos.insert(p2);
|
Vertex_handle v2 = rtos.insert(p2);
|
||||||
Vertex_handle v5 = rtos.insert(p5);
|
Vertex_handle v5 = rtos.insert(p5);
|
||||||
|
rtos.show_all();
|
||||||
Vertex_handle v3 = rtos.insert(p3);
|
Vertex_handle v3 = rtos.insert(p3);
|
||||||
|
rtos.is_valid();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Vertex_handle v6 = rtos.insert(p6);
|
Vertex_handle v6 = rtos.insert(p6);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
rtos.is_valid();
|
rtos.is_valid();
|
||||||
|
|
@ -153,11 +162,8 @@ std::random_shuffle(points.begin(), points.end());
|
||||||
//rtos.remove(v4);
|
//rtos.remove(v4);
|
||||||
//rtos.is_valid();
|
//rtos.is_valid();
|
||||||
//rtos.remove(v5);
|
//rtos.remove(v5);
|
||||||
*/
|
|
||||||
//insert coplanar Points. Points are coplanar but not coplanar with the center of the sphere
|
//insert coplanar Points. Points are coplanar but not coplanar with the center of the sphere
|
||||||
rtos.clear();
|
rtos.clear();
|
||||||
Point_3 p27 = Point_3(0,0,radius);
|
|
||||||
points2.push_back(p27);
|
|
||||||
Point_3 p0 = Point_3(0,0,radius);
|
Point_3 p0 = Point_3(0,0,radius);
|
||||||
points2.push_back(p0);
|
points2.push_back(p0);
|
||||||
Point_3 p21 = Point_3(1/sqrt(2),1/sqrt(2),sqrt(radius2-1));
|
Point_3 p21 = Point_3(1/sqrt(2),1/sqrt(2),sqrt(radius2-1));
|
||||||
|
|
@ -177,7 +183,11 @@ std::random_shuffle(points.begin(), points.end());
|
||||||
|
|
||||||
Point_3 p26 = Point_3(1/sqrt(2), -1/sqrt(2), sqrt(radius2-1));
|
Point_3 p26 = Point_3(1/sqrt(2), -1/sqrt(2), sqrt(radius2-1));
|
||||||
points2.push_back(p26);
|
points2.push_back(p26);
|
||||||
//Vertex_handle v0 = rtos.insert(p0);
|
|
||||||
|
Point_3 p27 = Point_3(radius, 0 ,0);
|
||||||
|
points2.push_back(p27);
|
||||||
|
Vertex_handle v0 = rtos.insert(p0);
|
||||||
|
|
||||||
|
|
||||||
Vertex_handle v21 = rtos.insert(p21);
|
Vertex_handle v21 = rtos.insert(p21);
|
||||||
Vertex_handle v22 = rtos.insert(p22);
|
Vertex_handle v22 = rtos.insert(p22);
|
||||||
|
|
@ -189,26 +199,41 @@ std::random_shuffle(points.begin(), points.end());
|
||||||
Vertex_handle v24 = rtos.insert(p24);
|
Vertex_handle v24 = rtos.insert(p24);
|
||||||
Vertex_handle v25 = rtos.insert(p25);
|
Vertex_handle v25 = rtos.insert(p25);
|
||||||
Vertex_handle v26 = rtos.insert(p26);
|
Vertex_handle v26 = rtos.insert(p26);
|
||||||
Vertex_handle v27 = rtos.insert(p27);
|
//Vertex_handle v27 = rtos.insert(p27);
|
||||||
rtos.is_valid();
|
rtos.is_valid();
|
||||||
|
|
||||||
|
|
||||||
|
std::cout<<"*************"<<std::endl;
|
||||||
|
std::cout<<"*************"<<std::endl;
|
||||||
|
std::cout<< "points"<<std::endl;
|
||||||
|
points2.resize(7);
|
||||||
|
|
||||||
|
std::cout<<"number of points"<<std::endl;
|
||||||
points2.resize(8);
|
std::cout<<points2.size()<<std::endl;
|
||||||
std::random_shuffle(points2.begin(), points2.end());
|
std::random_shuffle(points2.begin(), points2.end());
|
||||||
for(int i=0; i<8; i++){
|
for(int i=0; i<points2.size(); i++)
|
||||||
|
std::cout<<points2.at(i)<<std::endl;
|
||||||
|
std::cout<< "end points"<<std::endl;
|
||||||
|
|
||||||
|
|
||||||
|
rtos2.clear();
|
||||||
|
for(int i=0; i<points2.size() ;i++){
|
||||||
std::cout<<points2.at(i)<<std::endl;
|
std::cout<<points2.at(i)<<std::endl;
|
||||||
rtos2.insert(points2.at(i));
|
rtos2.insert(points2.at(i));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
rtos2.is_valid(true);
|
||||||
|
|
||||||
points2.resize(8);
|
points2.resize(7);
|
||||||
std::random_shuffle(points2.begin(), points2.end());
|
std::random_shuffle(points2.begin(), points2.end());
|
||||||
for(int i=0; i<8; i++){
|
rtos3.clear();
|
||||||
|
for(int i=0; i<points2.size(); i++){
|
||||||
std::cout<<points2.at(i)<<std::endl;
|
std::cout<<points2.at(i)<<std::endl;
|
||||||
rtos3.insert(points2.at(i));
|
rtos3.insert(points2.at(i));
|
||||||
}
|
}
|
||||||
|
are_equal(rtos3,rtos2);
|
||||||
|
rtos2.is_valid(true);
|
||||||
|
rtos3.is_valid(true);
|
||||||
|
|
||||||
|
|
||||||
are_equal(rtos3,rtos2);
|
are_equal(rtos3,rtos2);
|
||||||
|
|
@ -254,10 +279,45 @@ std::random_shuffle(points.begin(), points.end());
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
RTOS rtos4a;
|
||||||
|
RTOS rtos4b;
|
||||||
|
RTOS rtos4c;
|
||||||
|
Point_3 p41 = Point_3(radius,0,0);
|
||||||
|
points4.push_back(p41);
|
||||||
|
Point_3 p42 = Point_3(-1*radius,0,0);
|
||||||
|
points4.push_back(p42);
|
||||||
|
Point_3 p43 = Point_3(0,radius,0);
|
||||||
|
points4.push_back(p43);
|
||||||
|
Point_3 p44 = Point_3(0,0,radius);
|
||||||
|
points4.push_back(p44);
|
||||||
|
Point_3 p45 = Point_3(0, -1*radius,0);
|
||||||
|
points4.push_back(p45);
|
||||||
|
points4.resize(5);
|
||||||
|
|
||||||
|
std::random_shuffle(points4.begin(), points4.end());
|
||||||
|
|
||||||
|
for(int i=0; i<points4.size(); i++){
|
||||||
|
std::cout<<points4.at(i)<<std::endl;
|
||||||
|
rtos4a.insert(points4.at(i));
|
||||||
|
}
|
||||||
|
rtos4a.is_valid();
|
||||||
|
|
||||||
|
for(int i=0; i<points4.size(); i++){
|
||||||
|
std::cout<<points4.at(i)<<std::endl;
|
||||||
|
rtos4b.insert(points4.at(i));
|
||||||
|
}
|
||||||
|
rtos4b.is_valid();
|
||||||
|
|
||||||
|
for(int i=0; i<points4.size(); i++){
|
||||||
|
std::cout<<points4.at(i)<<std::endl;
|
||||||
|
rtos4c.insert(points4.at(i));
|
||||||
|
}
|
||||||
|
rtos4c.is_valid();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
are_equal(rtos4a, rtos4b);
|
||||||
|
are_equal(rtos4b, rtos4c);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ bool are_equal(RTOS triA, RTOS triB){
|
||||||
int main(){
|
int main(){
|
||||||
int nu_of_pts;
|
int nu_of_pts;
|
||||||
double radius;
|
double radius;
|
||||||
nu_of_pts =10;
|
nu_of_pts =10000;
|
||||||
radius=6000000;
|
radius=6000000;
|
||||||
//radius = 1;
|
//radius = 1;
|
||||||
//double minDist = radius*2e-25;
|
//double minDist = radius*2e-25;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue