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

fix operator>> for c2t3, so that number_of_facets is computed correctly

This commit is contained in:
Laurent Rineau 2006-06-28 17:05:41 +00:00
parent 931b4cfb11
commit ed1f7bcdfd
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Surface_mesher/changes.txt
View File

@ -1,6 +1,7 @@
28 June 2006 Laurent Rineau 28 June 2006 Laurent Rineau
- extends Robust_circumcenter_traits_3 so that this class is model of - extends Robust_circumcenter_traits_3 so that this class is model of
ConstructCicumcenter_3. ConstructCicumcenter_3.
- fix operator>> for c2t3, so that number_of_facets is computed correctly.
26 June 2006 Laurent Rineau 26 June 2006 Laurent Rineau
- in Surface_mesher: - in Surface_mesher:

11
Surface_mesher/include/CGAL/Complex_2_in_triangulation_3.h
View File

@ -256,12 +256,6 @@ protected:
return ( i != 0); return ( i != 0);
} }
// auxiliary function for
// union_find_of_incident_facets(const Vertex_handle v, int&, int&)
void profile_union_find_of_incident_facets_cache_valid()
{
CGAL_PROFILER("number of c2t3 cache success");
}
// extract the subset F of facets of the complex incident to v // extract the subset F of facets of the complex incident to v
// set i to the number of facets in F // set i to the number of facets in F
// set j to the number of connected component of the adjacency graph // set j to the number of connected component of the adjacency graph
@ -271,12 +265,9 @@ protected:
{ {
i = v->cached_number_of_incident_facets(); i = v->cached_number_of_incident_facets();
j = v->cached_number_of_components(); j = v->cached_number_of_components();
profile_union_find_of_incident_facets_cache_valid();
return; return;
} }
CGAL_PROFILER("number of c2t3 cache failure");
Union_find<Facet> facets; Union_find<Facet> facets;
incident_facets(v, std::back_inserter(facets)); incident_facets(v, std::back_inserter(facets));
@ -517,7 +508,7 @@ operator>> (std::istream& is, Complex_2_in_triangulation_3<Tr>& c2t3)
fit != c2t3.triangulation().finite_facets_end(); fit != c2t3.triangulation().finite_facets_end();
++fit) ++fit)
if(fit->first->is_facet_on_surface(fit->second)) if(fit->first->is_facet_on_surface(fit->second))
c2t3.set_in_complex(*fit); c2t3.template change_in_complex_status<true, true>(fit->first, fit->second);
return is; return is;
} }