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

merged next

This commit is contained in:
Efi Fogel 2012-07-01 05:53:44 +00:00
parent 95a9372721 29491b5f56
commit e3727e9c20
7 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
View File

@ -151,7 +151,7 @@ public:
* arrangement (a vertex, halfedge, or face handle).
* \return The nearest landmark point.
*/
virtual Point_2 closest_landmark (Point_2 p, Object &obj)
virtual Point_2 closest_landmark (const Point_2 p, Object &obj)
{
CGAL_assertion(updated);
return (nn.find_nearest_neighbor(p, obj));

11
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2.h
View File

@ -1271,10 +1271,11 @@ protected:
public:
Trapezoidal_decomposition_2(bool with_guarantees = true) :
m_arr(0),
traits(0), m_largest_leaf_depth(0),
m_number_of_curves(0),
m_largest_leaf_depth(0),
m_number_of_dag_nodes(1),
m_number_of_curves(0),
traits(0),
m_arr(0),
m_depth_threshold(CGAL_TD_DEFAULT_DEPTH_THRESHOLD),
m_size_threshold(CGAL_TD_DEFAULT_SIZE_THRESHOLD)
{
@ -1284,11 +1285,11 @@ public:
Trapezoidal_decomposition_2(const double& depth_th, const double& size_th,
bool with_guarantees = true) :
m_arr(0),
traits(0),
m_largest_leaf_depth(0),
m_number_of_curves(0),
m_number_of_dag_nodes(1),
traits(0),
m_arr(0),
m_depth_threshold(depth_th),
m_size_threshold(size_th)
{

2
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Trapezoidal_decomposition_2_misc.h
View File

@ -51,7 +51,7 @@
#define CGAL_TD_DEFAULT_SIZE_THRESHOLD 12
#ifndef _MSC_VER
#if !defined __GNUC__ || __GNUC__>2 || __GNUC__==2 && __GNUC_MINOR__>=95
#if !defined __GNUC__ || __GNUC__> 3 || ((__GNUC__== 3) && (__GNUC_MINOR__> 4))
#define CGAL_PM_FRIEND_CLASS
#endif
#endif

12
Arrangement_on_surface_2/include/CGAL/Arrangement_2/Arr_traits_adaptor_2.h
View File

@ -1135,8 +1135,8 @@ public:
}
Comparison_result comp_x_on_bnd(const Point_2&,
const X_monotone_curve_2& xcv,
Arr_curve_end ce,
const X_monotone_curve_2& /* xcv */,
Arr_curve_end /* ce */,
Arr_use_dummy_tag) const
{
CGAL_error();
@ -1153,10 +1153,10 @@ public:
return m_base->compare_x_on_boundary_2_object()(xcv1, ce1, xcv2, ce2);
}
Comparison_result comp_x_on_bnd(const X_monotone_curve_2&
xcv1, Arr_curve_end ce1,
const X_monotone_curve_2& xcv2,
Arr_curve_end ce2,
Comparison_result comp_x_on_bnd(const X_monotone_curve_2& /* xcv1 */,
Arr_curve_end /* ce1 */,
const X_monotone_curve_2& /* xcv2 */,
Arr_curve_end /* ce2 */,
Arr_use_dummy_tag) const
{
CGAL_error();

12
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
View File

@ -240,7 +240,7 @@ bool Traits_base_test<T_Traits>::perform()
this->m_eol_printed = true;
std::string line;
char buff[1024];
bool abort = false;
// bool abort = false;
int counter = 0;
while (this->skip_comments(is, line)) {
std::istringstream str_stream(line, std::istringstream::in);
@ -289,7 +289,7 @@ bool Traits_base_test<T_Traits>::perform()
{
//violation is expected but it did not occur
result = false;
if (m_abort_on_error) abort = true;
// if (m_abort_on_error) abort = true;
}
this->print_result(result);
test_result &= result;
@ -297,25 +297,25 @@ bool Traits_base_test<T_Traits>::perform()
catch (CGAL::Precondition_exception /* e */) {
if (m_violation_tested != PRECONDITION) {
test_result = false;
if (m_abort_on_error) abort = true;
// if (m_abort_on_error) abort = true;
}
}
catch (CGAL::Postcondition_exception /* e */) {
if (m_violation_tested != POSTCONDITION) {
test_result = false;
if (m_abort_on_error) abort = true;
// if (m_abort_on_error) abort = true;
}
}
catch (CGAL::Warning_exception /* e */) {
if (m_violation_tested != WARNING) {
test_result = false;
if (m_abort_on_error) abort = true;
// if (m_abort_on_error) abort = true;
}
}
catch (CGAL::Assertion_exception /* e */) {
if (m_violation_tested != ASSERTION) {
test_result = false;
if (m_abort_on_error) abort = true;
// if (m_abort_on_error) abort = true;
}
}
}

6
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_base
View File

@ -1270,9 +1270,9 @@ fi
# compile_and_run test_removal
# compile_and_run test_iso_verts
# compile_and_run test_vert_ray_shoot_vert_segments
# compile_and_run test_construction
# compile_and_run test_overlay
compile_and_run test_vert_ray_shoot_vert_segments
compile_and_run test_construction
compile_and_run test_overlay
test_point_location_segments
test_point_location_circle_segments

6
Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
View File

@ -141,7 +141,7 @@ int main(int argc, char* argv[])
int success = 0;
// Test 1
for (unsigned int i = 1; i < argc; i += 4) {
for (int i = 1; i < argc; i += 4) {
const char* points_filename = argv[i];
const char* xcurves_filename = argv[i+1];
const char* curves_filename = argv[i+2];
@ -168,7 +168,7 @@ int main(int argc, char* argv[])
std::cout << "ERROR : allocating point location strategies!" << std::endl;
return -1;
}
for (unsigned int i = 1; i < argc; i += 4) {
for (int i = 1; i < argc; i += 4) {
const char* points_filename = argv[i];
const char* xcurves_filename = argv[i+1];
const char* curves_filename = argv[i+2];
@ -190,7 +190,7 @@ int main(int argc, char* argv[])
#if TEST_TRAITS == SEGMENT_TRAITS
// Test 3
for (unsigned int i = 1; i < argc; i += 4) {
for (int i = 1; i < argc; i += 4) {
const char* points_filename = argv[i];
const char* xcurves_filename = argv[i+1];
const char* curves_filename = argv[i+2];