songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Undo of changes beyond removing the '++'

This commit is contained in:
Andreas Fabri 2010-12-01 10:10:09 +00:00
parent 60ba2294c8
commit 32e833405c
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/min_sphere_of_points.cpp
View File

@ -1,6 +1,5 @@
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Cartesian_d.h> #include <CGAL/Cartesian_d.h>
#include <CGAL/Gmpq.h>
#include <CGAL/Min_sphere_of_spheres_d.h> #include <CGAL/Min_sphere_of_spheres_d.h>
#include <CGAL/Min_sphere_of_points_d_traits_2.h> #include <CGAL/Min_sphere_of_points_d_traits_2.h>
@ -9,14 +8,14 @@
typedef CGAL::Exact_predicates_inexact_constructions_kernel K; typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
typedef CGAL::Cartesian_d<CGAL::Gmpq> K_d; typedef CGAL::Cartesian_d<double> K_d;
typedef K::Point_2 Point_2; typedef K::Point_2 Point_2;
typedef K::Point_3 Point_3; typedef K::Point_3 Point_3;
typedef K_d::Point_d Point_d; typedef K_d::Point_d Point_d;
typedef CGAL::Min_sphere_of_points_d_traits_2<K,double> Traits_2; typedef CGAL::Min_sphere_of_points_d_traits_2<K,double> Traits_2;
typedef CGAL::Min_sphere_of_points_d_traits_3<K,double> Traits_3; typedef CGAL::Min_sphere_of_points_d_traits_3<K,double> Traits_3;
typedef CGAL::Min_sphere_of_points_d_traits_d<K_d,CGAL::Gmpq,3> Traits_d; typedef CGAL::Min_sphere_of_points_d_traits_d<K_d,double,3> Traits_d;
typedef CGAL::Min_sphere_of_spheres_d<Traits_2> Min_sphere_2; typedef CGAL::Min_sphere_of_spheres_d<Traits_2> Min_sphere_2;
typedef CGAL::Min_sphere_of_spheres_d<Traits_3> Min_sphere_3; typedef CGAL::Min_sphere_of_spheres_d<Traits_3> Min_sphere_3;
typedef CGAL::Min_sphere_of_spheres_d<Traits_d> Min_sphere_d; typedef CGAL::Min_sphere_of_spheres_d<Traits_d> Min_sphere_d;
@ -38,9 +37,6 @@ int main()
Min_sphere_3 ms(points, points+3); Min_sphere_3 ms(points, points+3);
std::cerr << "3D min sphere computed with Exact_predicates_inexact_constructions_kernel" << std::endl; std::cerr << "3D min sphere computed with Exact_predicates_inexact_constructions_kernel" << std::endl;
Min_sphere_3::Cartesian_const_iterator coord = ms.center_cartesian_begin(); Min_sphere_3::Cartesian_const_iterator coord = ms.center_cartesian_begin();
std::cerr << typeid(coord).name() << std::endl;
std::cerr << typeid(*coord).name() << std::endl;
double cx = *coord++; double cx = *coord++;
double cy = *coord++; double cy = *coord++;
double cz = *coord++; double cz = *coord++;
@ -49,7 +45,6 @@ int main()
} }
{ {
Point_d points[3] = { Point_d(0,0,0,1), Point_d(1,0, 0,1), Point_d(1,1,1,1) } ; Point_d points[3] = { Point_d(0,0,0,1), Point_d(1,0, 0,1), Point_d(1,1,1,1) } ;
std::cerr << "here" << std::endl;
Min_sphere_d ms(points, points+3); Min_sphere_d ms(points, points+3);
std::cerr << "3D min sphere computed with Kernel_d" << std::endl; std::cerr << "3D min sphere computed with Kernel_d" << std::endl;
int i=0; int i=0;
@ -57,17 +52,12 @@ int main()
for(Min_sphere_d::Cartesian_const_iterator coord = ms.center_cartesian_begin(); for(Min_sphere_d::Cartesian_const_iterator coord = ms.center_cartesian_begin();
coord != ms.center_cartesian_end(); coord != ms.center_cartesian_end();
++coord){ ++coord){
Min_sphere_d::Result r = *coord; std::cerr << *coord << std::endl;
C[i] = CGAL::to_double(r.first) + CGAL::to_double(r.second)* sqrt(CGAL::to_double(ms.discriminant())); C[i++] = *coord;
std::cerr << C[i] << std::endl;
i++;
} }
double r = ms.radius();
Min_sphere_d::Result rr = ms.radius();
double r = CGAL::to_double(rr.first) + CGAL::to_double(rr.second)* sqrt(CGAL::to_double(ms.discriminant()));
std::cout << C[0] << " " << C[1] << " " << C[2] << " " << r << std::endl; std::cout << C[0] << " " << C[1] << " " << C[2] << " " << r << std::endl;
} }
std::cout << "done" << std::endl;
return 0; return 0;
} }