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

corrected rules when output is sorted and/or reduced

This commit is contained in:
Peter Hachenberger 2007-04-19 17:29:45 +00:00
parent e7086fe023
commit 890ef3b5a1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Nef_3/include/CGAL/IO/Nef_polyhedron_iostream_3.h
View File

@ -31,9 +31,9 @@ std::ostream& operator<<
{
typedef typename Nef_polyhedron_3<Kernel,Items, Mark>::SNC_structure SNC_structure;
#ifdef CGAL_NEF3_SORT_OUTPUT
CGAL::SNC_io_parser<SNC_structure> O(os, NP.snc(), true);
CGAL::SNC_io_parser<SNC_structure> O(os, NP.snc(), true, true);
#else
CGAL::SNC_io_parser<SNC_structure> O(os, NP.snc());
CGAL::SNC_io_parser<SNC_structure> O(os, NP.snc(), false, true);
#endif
O.print();
return os;

11
Nef_3/include/CGAL/Nef_3/SNC_io_parser.h
View File

@ -878,7 +878,8 @@ public:
public:
SNC_io_parser(std::istream& is, SNC_structure& W);
SNC_io_parser(std::ostream& os, SNC_structure& W, bool sort=false);
SNC_io_parser(std::ostream& os, SNC_structure& W,
bool sort=false, bool reduce_ = false);
std::string index(Vertex_iterator v) const
{ return VI(v,verbose); }
@ -972,7 +973,7 @@ SNC_io_parser<EW>::SNC_io_parser(std::istream& is, SNC_structure& W) :
template <typename EW>
SNC_io_parser<EW>::SNC_io_parser(std::ostream& os, SNC_structure& W,
bool sort) :
bool sort, bool reduce_) :
Base(W), in(std::cin), out(os),
FI(W.halffacets_begin(),W.halffacets_end(),'F'),
CI(W.volumes_begin(),W.volumes_end(),'C'),
@ -990,8 +991,10 @@ SNC_io_parser<EW>::SNC_io_parser(std::ostream& os, SNC_structure& W,
verbose = (out.iword(CGAL::IO::mode) != CGAL::IO::ASCII &&
out.iword(CGAL::IO::mode) != CGAL::IO::BINARY);
sorted = sort;
reduce = this->is_extended_kernel() && sorted && this->is_bounded();
reduce = reduce_;
reduce = reduce && this->is_extended_kernel() && this->is_bounded();
sorted = sorted || reduce;
Vertex_iterator vi;
CGAL_forall_vertices(vi, *this->sncp()) {
VL.push_back(vi);