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

added call of support_iterator and fixed type issues

This commit is contained in:
Bernd Gärtner 2008-10-28 09:21:39 +00:00
parent 5010e4b58a
commit e6700e6684
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Min_sphere_of_spheres_d/include/CGAL/Min_sphere_of_spheres_d.h
View File

@ -67,7 +67,7 @@ namespace CGAL_MINIBALL_NAMESPACE {
typedef const Result *Cartesian_const_iterator; // coordinate iterator typedef const Result *Cartesian_const_iterator; // coordinate iterator
class Support_iterator { class Support_iterator {
typedef typename std::vector<Sphere>::const_iterator It; typedef typename std::vector<const Sphere*>::const_iterator It;
It it; It it;
private: private:
@ -270,7 +270,7 @@ namespace CGAL_MINIBALL_NAMESPACE {
Min_sphere_of_spheres_d<Traits>::support_begin() { Min_sphere_of_spheres_d<Traits>::support_begin() {
if (!is_up_to_date) if (!is_up_to_date)
update(); update();
return Support_iterator(*l.begin()); return Support_iterator(l.begin());
} }
template<class Traits> template<class Traits>
@ -278,7 +278,7 @@ namespace CGAL_MINIBALL_NAMESPACE {
Min_sphere_of_spheres_d<Traits>::support_end() { Min_sphere_of_spheres_d<Traits>::support_end() {
if (!is_up_to_date) if (!is_up_to_date)
update(); update();
return Support_iterator(*l.begin()+e); return Support_iterator(l.begin()+e);
} }
} // namespace CGAL_MINIBALL_NAMESPACE } // namespace CGAL_MINIBALL_NAMESPACE

6
Min_sphere_of_spheres_d/test/Min_sphere_of_spheres_d/interface_check.cpp
View File

@ -170,6 +170,12 @@ void test(const int n,const FT& tol) {
checkCondition(ms2.is_valid(),"Minsphere not valid."); checkCondition(ms2.is_valid(),"Minsphere not valid.");
compare<D,Min_sphere,FT>(tol,ms1,ms2,get_is_exact_tag(tol)); compare<D,Min_sphere,FT>(tol,ms1,ms2,get_is_exact_tag(tol));
cout << " support points..." << endl;
typename Min_sphere::Support_iterator sbegin = ms2.support_begin();
typename Min_sphere::Support_iterator send = ms2.support_end();
for (typename Min_sphere::Support_iterator s = sbegin; s != send; ++s) *s;
cout << endl;
cout << " default constructor and insert()..." << endl; cout << " default constructor and insert()..." << endl;
Min_sphere ms3; Min_sphere ms3;
ms3.insert(S.begin(),S.end()); ms3.insert(S.begin(),S.end());