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

Move Vector_3 I/O to user class level

This commit is contained in:
Sylvain Pion 2006-08-06 15:18:37 +00:00
parent 6c03b2cc32
commit ab88a8e595
3 changed files with 95 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Cartesian_kernel/include/CGAL/Cartesian/Vector_3.h
View File

@ -249,52 +249,6 @@ VectorC3<R>::direction() const
return Direction_3(*this);
}
#ifndef CGAL_CARTESIAN_NO_OSTREAM_INSERT_VECTORC3
template < class R >
std::ostream &
operator<<(std::ostream &os, const VectorC3<R> &v)
{
switch(os.iword(IO::mode)) {
case IO::ASCII :
return os << v.x() << ' ' << v.y() << ' ' << v.z();
case IO::BINARY :
write(os, v.x());
write(os, v.y());
write(os, v.z());
return os;
default:
os << "VectorC3(" << v.x() << ", " << v.y() << ", " << v.z() << ")";
return os;
}
}
#endif // CGAL_CARTESIAN_NO_OSTREAM_INSERT_VECTORC3
#ifndef CGAL_CARTESIAN_NO_ISTREAM_EXTRACT_VECTORC3
template < class R >
std::istream &
operator>>(std::istream &is, VectorC3<R> &p)
{
typename R::FT x, y, z;
switch(is.iword(IO::mode)) {
case IO::ASCII :
is >> x >> y >> z;
break;
case IO::BINARY :
read(is, x);
read(is, y);
read(is, z);
break;
default:
std::cerr << "" << std::endl;
std::cerr << "Stream must be in ascii or binary mode" << std::endl;
break;
}
if (is)
p = VectorC3<R>(x, y, z);
return is;
}
#endif // CGAL_CARTESIAN_NO_ISTREAM_EXTRACT_VECTORC3
CGAL_END_NAMESPACE
#endif // CGAL_CARTESIAN_VECTOR_3_H

50
Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
View File

@ -220,56 +220,6 @@ VectorH3<R>::operator/(const typename VectorH3<R>::FT& f) const
{ return typename R::Vector_3(hx()*f.denominator(), hy()*f.denominator(),
hz()*f.denominator(), hw()*f.numerator() ); }
#ifndef CGAL_NO_OSTREAM_INSERT_VECTORH3
template < class R >
std::ostream& operator<<(std::ostream& os, const VectorH3<R>& v)
{
switch(os.iword(IO::mode))
{
case IO::ASCII :
return os << v.hx() << ' ' << v.hy() << ' ' << v.hz() << ' ' << v.hw();
case IO::BINARY :
write(os, v.hx());
write(os, v.hy());
write(os, v.hz());
write(os, v.hw());
return os;
default:
return os << "VectorH3(" << v.hx() << ", "
<< v.hy() << ", "
<< v.hz() << ", "
<< v.hw() << ')';
}
}
#endif // CGAL_NO_OSTREAM_INSERT_VECTORH3
#ifndef CGAL_NO_ISTREAM_EXTRACT_VECTORH3
template < class R >
std::istream& operator>>(std::istream& is, VectorH3<R>& v)
{
typename R::RT hx, hy, hz, hw;
switch(is.iword(IO::mode))
{
case IO::ASCII :
is >> hx >> hy >> hz >> hw;
break;
case IO::BINARY :
read(is, hx);
read(is, hy);
read(is, hz);
read(is, hw);
break;
default:
std::cerr << "" << std::endl;
std::cerr << "Stream must be in ascii or binary mode" << std::endl;
break;
}
v = VectorH3<R>(hx, hy, hz, hw);
return is;
}
#endif // CGAL_NO_ISTREAM_EXTRACT_VECTORH3
CGAL_END_NAMESPACE
#endif // CGAL_HOMOGENEOUS_VECTOR_3_H

104
Kernel_23/include/CGAL/Vector_3.h
View File

@ -197,25 +197,111 @@ public:
};
#ifndef CGAL_NO_OSTREAM_INSERT_VECTOR_3
template <class R >
std::ostream&
insert(std::ostream& os, const Vector_3<R>& v, const Cartesian_tag&)
{
switch(os.iword(IO::mode)) {
case IO::ASCII :
return os << v.x() << ' ' << v.y() << ' ' << v.z();
case IO::BINARY :
write(os, v.x());
write(os, v.y());
write(os, v.z());
return os;
default:
os << "VectorC3(" << v.x() << ", " << v.y() << ", " << v.z() << ")";
return os;
}
}
template <class R >
std::ostream&
insert(std::ostream& os, const Vector_3<R>& v, const Homogeneous_tag&)
{
switch(os.iword(IO::mode))
{
case IO::ASCII :
return os << v.hx() << ' ' << v.hy() << ' ' << v.hz() << ' ' << v.hw();
case IO::BINARY :
write(os, v.hx());
write(os, v.hy());
write(os, v.hz());
write(os, v.hw());
return os;
default:
return os << "VectorH3(" << v.hx() << ", "
<< v.hy() << ", "
<< v.hz() << ", "
<< v.hw() << ')';
}
}
template < class R >
std::ostream&
operator<<(std::ostream& os, const Vector_3<R>& v)
{
typedef typename R::Kernel_base::Vector_3 Rep;
return os << static_cast<const Rep&>(v);
return insert(os, v, typename R::Kernel_tag() );
}
template <class R >
std::istream&
extract(std::istream& is, Vector_3<R>& v, const Cartesian_tag&)
{
typename R::FT x, y, z;
switch(is.iword(IO::mode)) {
case IO::ASCII :
is >> x >> y >> z;
break;
case IO::BINARY :
read(is, x);
read(is, y);
read(is, z);
break;
default:
std::cerr << "" << std::endl;
std::cerr << "Stream must be in ascii or binary mode" << std::endl;
break;
}
if (is)
v = Vector_3<R>(x, y, z);
return is;
}
template <class R >
std::istream&
extract(std::istream& is, Vector_3<R>& v, const Homogeneous_tag&)
{
typename R::RT hx, hy, hz, hw;
switch(is.iword(IO::mode))
{
case IO::ASCII :
is >> hx >> hy >> hz >> hw;
break;
case IO::BINARY :
read(is, hx);
read(is, hy);
read(is, hz);
read(is, hw);
break;
default:
std::cerr << "" << std::endl;
std::cerr << "Stream must be in ascii or binary mode" << std::endl;
break;
}
if (is)
v = Vector_3<R>(hx, hy, hz, hw);
return is;
}
#endif // CGAL_NO_OSTREAM_INSERT_VECTOR_3
#ifndef CGAL_NO_ISTREAM_EXTRACT_VECTOR_3
template < class R >
std::istream&
operator>>(std::istream& is, Vector_3<R>& p)
operator>>(std::istream& is, Vector_3<R>& v)
{
typedef typename R::Kernel_base::Vector_3 Rep;
return is >> static_cast<Rep&>(p);
return extract(is, v, typename R::Kernel_tag() );
}
#endif // CGAL_NO_ISTREAM_EXTRACT_VECTOR_3
CGAL_END_NAMESPACE