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

Improve operator<< for Epick_d::Point_d.

This commit is contained in:
Marc Glisse 2015-02-26 16:14:14 +01:00
parent faa4a11e8e
commit 6d9ba0f083
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
NewKernel_d/include/CGAL/NewKernel_d/Wrapper/Point_d.h
View File

@ -148,6 +148,11 @@ public:
return CPI()(rep(),End_tag());
}
int dimension() const {
typedef typename Get_functor<Kbase, Point_dimension_tag>::type PDBase;
return PDBase()(rep());
}
/*
Direction_d direction() const
{
@ -230,27 +235,6 @@ public:
return hw();
}
int dimension() const // bad idea?
{
return rep.dimension();
}
typename Qualified_result_of<typename R::Compute_x_3, Vector_3>::type
operator[](int i) const
{
return cartesian(i);
}
Cartesian_const_iterator cartesian_begin() const
{
return typename R::Construct_cartesian_const_iterator_3()(*this);
}
Cartesian_const_iterator cartesian_end() const
{
return typename R::Construct_cartesian_const_iterator_3()(*this,3);
}
typename Qualified_result_of<typename R::Compute_squared_length_3, Vector_3>::type
squared_length() const
{
@ -267,18 +251,19 @@ template <class R_> Point_d<R_>::Point_d(Point_d &)=default;
template <class R_>
std::ostream& operator <<(std::ostream& os, const Point_d<R_>& p)
{
std::vector<double> coords;
typename R_::Cartesian_const_iterator_d
typedef typename R_::Kernel_base Kbase;
typedef typename Get_functor<Kbase, Construct_ttag<Point_cartesian_const_iterator_tag> >::type CPI;
// Should just be "auto"...
typename CGAL::decay<typename boost::result_of<
CPI(typename Point_d<R_>::Rep,Begin_tag)
>::type>::type
b = p.cartesian_begin(),
e = p.cartesian_end();
os << p.dimension();
for(; b != e; ++b){
coords.push_back(*b);
os << " " << *b;
}
os << coords.size();
for(std::size_t i=0; i < coords.size(); i++){
os << " " << coords[i];
}
return os << std::flush;
return os;
}
//template <class R_>

5
NewKernel_d/test/NewKernel_d/Epick_d.cpp
View File

@ -12,6 +12,7 @@
#include <CGAL/Interval_nt.h>
#include <CGAL/use.h>
#include <iostream>
#include <sstream>
//typedef CGAL::Cartesian_base_d<double,CGAL::Dimension_tag<2> > K0;
//typedef CGAL::Cartesian_base_d<CGAL::Interval_nt_advanced,CGAL::Dimension_tag<2> > KA;
@ -554,6 +555,10 @@ void test3(){
assert(ifsos(fozn, tz+0, tz+3, tz[4]) == CGAL::ON_NEGATIVE_SIDE);
assert(ifsos(fozp, tz+0, tz+3, tz[5]) == CGAL::ON_NEGATIVE_SIDE);
assert(ifsos(fozn, tz+0, tz+3, tz[5]) == CGAL::ON_POSITIVE_SIDE);
P showit=cp(1,2,4);
std::ostringstream output;
output << showit;
assert(output.str()=="3 1 2 4");
}
template struct CGAL::Epick_d<CGAL::Dimension_tag<2> >;
template struct CGAL::Epick_d<CGAL::Dimension_tag<3> >;