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

cleanup

This commit is contained in:
Efi Fogel 2007-04-18 21:59:50 +00:00
parent 63730ff5e4
commit 8c3da59979
2 changed files with 18 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Envelope_3/test/Envelope_3/Envelope_test_3.h
View File

@ -238,83 +238,31 @@ public:
Face_handle fh = fi;
// first we find the surfaces that are defined over the face
std::list<Xy_monotone_surface_3> defined_surfaces;
for(int i=0; i<number_of_surfaces; ++i)
for (int i=0; i<number_of_surfaces; ++i)
if (is_surface_defined_over_face(fh, surfaces[i]))
defined_surfaces.push_back(surfaces[i]);
// now compare them over the face
set_minimum_over_face(fh, defined_surfaces.begin(), defined_surfaces.end());
set_minimum_over_face(fh, defined_surfaces.begin(),
defined_surfaces.end());
}
}
// compare the 2 envelopes by overlaying them, and then comparing the surfaces over
// the faces of the result map
// if faces_only = false we also compare the data over the edges & vertices
/*!
* compare the 2 envelopes by overlaying them, and then comparing the
* surfaces over the faces of the result map.
*
* \todo The overlay compares the data using assertions. This should be
* replaced, but since we want to terminate the overlay once we
* determine that the 2 diagrams differ, we cannot simply remove the
* assertions. One option is to generate an exeption and catch it.
*/
bool compare_diagrams(Minimization_diagram_2 &test_env,
Minimization_diagram_2 &env,
bool /* faces_only */ = false)
Minimization_diagram_2 &env)
{
Minimization_diagram_2 overlay_map;
// overlay the 2 maps
overlay(test_env, env, overlay_map);
return true;
// // foreach face in the result map, compare the surfaces over it
// Face_iterator fi = overlay_map.faces_begin();
// bool eq, result = true;
// for (; fi != overlay_map.faces_end(); ++fi)
// {
// Face_handle fh = fi;
// if (!fh->is_unbounded())
// {
// CGAL_assertion(fh->get_aux_is_set(0));
// CGAL_assertion(fh->get_aux_is_set(1));
// eq = fh->is_equal_aux_data(0, fh->begin_aux_data(1), fh->end_aux_data(1));
// CGAL_assertion_msg(eq, "data different over face");
// result &= eq;
// }
// }
//
// if (!faces_only)
// {
// // foreach edge in the result map, compare the surfaces over it
// Halfedge_iterator hi = overlay_map.halfedges_begin();
// for (; hi != overlay_map.halfedges_end(); ++hi)
// {
// Halfedge_handle hh = hi;
// CGAL_assertion(hh->get_aux_is_set(0));
// CGAL_assertion(hh->get_aux_is_set(1));
// eq = hh->is_equal_aux_data(0, hh->begin_aux_data(1), hh->end_aux_data(1));
// CGAL_assertion_msg(eq, "data different over edge");
// result &= eq;
//
// // check the opposite halfedge
// CGAL_assertion(hh->twin()->get_aux_is_set(0));
// CGAL_assertion(hh->twin()->get_aux_is_set(1));
// eq = hh->is_equal_aux_data(0, hh->twin()->begin_aux_data(1),
// hh->twin()->end_aux_data(1));
// CGAL_assertion_msg(eq, "data different over twin halfedges");
// result &= eq;
//
// }
//
// // foreach vertex in the result map, compare the surfaces over it
// Vertex_iterator vi = overlay_map.vertices_begin();
// for (; vi != overlay_map.vertices_end(); ++vi)
// {
// Vertex_handle vh = vi;
// #ifdef CGAL_DEBUG_ENVELOPE_TEST_3
// std::cout << "check vertex: " << vh->point() << std::endl;
// #endif
//
// CGAL_assertion(vh->get_aux_is_set(0));
// CGAL_assertion(vh->get_aux_is_set(1));
// eq = vh->is_equal_aux_data(0, vh->begin_aux_data(1), vh->end_aux_data(1));
// CGAL_assertion_msg(eq, "data different over vertex");
// result &= eq;
// }
// }
//
// return result;
}
protected:
@ -322,7 +270,8 @@ protected:
// fill the vertex with the surface on the envelope
// all the surfaces are known to be defined over the vertex' point
template <class SurfaceIterator>
void set_minimum_over_vertex(const Vertex_handle& v, SurfaceIterator begin, SurfaceIterator end)
void set_minimum_over_vertex(const Vertex_handle& v,
SurfaceIterator begin, SurfaceIterator end)
{
if (begin == end)
v->set_no_data();

5
Envelope_3/test/Envelope_3/spheres_test.cpp
View File

@ -76,7 +76,8 @@ bool test_one_file(std::ifstream& inp)
result.number_of_faces() << " faces" << endl;
timer.start();
lu_alg_test.construct_lu_envelope(surfaces.begin(), surfaces.end(), test_result);
lu_alg_test.construct_lu_envelope(surfaces.begin(), surfaces.end(),
test_result);
timer.stop();
cout << "construct test map took " << timer.time() << " seconds" << endl;
timer.reset();
@ -87,7 +88,7 @@ bool test_one_file(std::ifstream& inp)
test_result.number_of_faces() << " faces" << endl;
timer.start();
bool test = lu_alg_test.compare_diagrams(test_result, result, /*only faces = */false);
bool test = lu_alg_test.compare_diagrams(test_result, result);
timer.stop();
return (test);