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

pushed assertion up call stack

This commit is contained in:
Daniel Russel 2007-02-19 20:10:27 +00:00
parent 65bcde4891
commit c82f523ac0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h
View File

@ -575,7 +575,7 @@ public:
Point_key k= vh->point(); Point_key k= vh->point();
vh->info()= Event_key(); vh->info()= Event_key();
typename Triangulation::Cell_handle h= kdel_.pop_vertex(vh); typename Triangulation::Cell_handle h= kdel_.pop_vertex(vh);
CGAL_precondition(redundant_points_[k]==Event_key());
handle_redundant(k, h, rs); handle_redundant(k, h, rs);
/*if (!success) { /*if (!success) {
std::cerr << "dropped a vertex when popped.\n"; std::cerr << "dropped a vertex when popped.\n";
@ -606,6 +606,7 @@ public:
//insert(k, neighbor); //insert(k, neighbor);
push(k, h, rs); push(k, h, rs);
} else { } else {
CGAL_precondition(redundant_points_[k]==Event_key());
handle_redundant(k, neighbor); handle_redundant(k, neighbor);
} }
kdel_.visitor().post_move(k,neighbor); kdel_.visitor().post_move(k,neighbor);
@ -633,6 +634,7 @@ public:
typename Triangulation::Cell_handle h= get_cell_handle(k); typename Triangulation::Cell_handle h= get_cell_handle(k);
kdel_.simulator()->delete_event(redundant_points_[k]); kdel_.simulator()->delete_event(redundant_points_[k]);
redundant_points_.erase(k); redundant_points_.erase(k);
CGAL_precondition(redundant_points_[k]==Event_key());
handle_redundant(k, h); handle_redundant(k, h);
} }
} }
@ -650,6 +652,7 @@ public:
if (h==Cell_handle()) { if (h==Cell_handle()) {
h= triangulation().locate(k); h= triangulation().locate(k);
} }
CGAL_precondition(redundant_points_[k]==Event_key());
handle_redundant(k,h); handle_redundant(k,h);
} else if (kdel_.has_certificates() && kdel_.is_degree_4(vh)){ } else if (kdel_.has_certificates() && kdel_.is_degree_4(vh)){
handle_vertex(vh); handle_vertex(vh);
@ -691,6 +694,7 @@ public:
for (typename RCMap::iterator it= redundant_cells_.begin(); it != redundant_cells_.end(); ++it) { for (typename RCMap::iterator it= redundant_cells_.begin(); it != redundant_cells_.end(); ++it) {
CGAL_KINETIC_LOG(LOG_LOTS, "On init " << it->second << " is redundant" << std::endl); CGAL_KINETIC_LOG(LOG_LOTS, "On init " << it->second << " is redundant" << std::endl);
typename Triangulation::Cell_handle h= it->first; typename Triangulation::Cell_handle h= it->first;
CGAL_precondition(redundant_points_[it->second]==Event_key());
handle_redundant(it->second, it->first); handle_redundant(it->second, it->first);
} }
} else { } else {
@ -912,6 +916,7 @@ protected:
CGAL_KINETIC_LOG_WRITE(LOG_LOTS, internal::write_cell( h, LOG_STREAM)); CGAL_KINETIC_LOG_WRITE(LOG_LOTS, internal::write_cell( h, LOG_STREAM));
CGAL_KINETIC_LOG(LOG_LOTS, std::endl); CGAL_KINETIC_LOG(LOG_LOTS, std::endl);
if (orientation(k,h) != CGAL::NEGATIVE) { if (orientation(k,h) != CGAL::NEGATIVE) {
CGAL_precondition(redundant_points_[k]==Event_key());
handle_redundant(k,h); handle_redundant(k,h);
return true; return true;
} else { } else {