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

renamed max to maximum and min to minimum in NP to be consistent with other packages

This commit is contained in:
Dmitry Anisimov 2021-06-30 12:39:01 +02:00
parent cfd9b85bb4
commit c5bea93e58
34 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BGL/include/CGAL/boost/graph/parameters_interface.h
View File

@ -211,9 +211,9 @@ CGAL_add_named_parameter(overlap_t, overlap, overlap)
CGAL_add_named_parameter(maximum_normal_deviation_t, maximum_normal_deviation, maximum_normal_deviation)
// List of named parameters used in Shape_regularization package
CGAL_add_named_parameter(min_length_t, min_length, min_length)
CGAL_add_named_parameter(max_angle_t, max_angle, max_angle)
CGAL_add_named_parameter(max_offset_t, max_offset, max_offset)
CGAL_add_named_parameter(minimum_length_t, minimum_length, minimum_length)
CGAL_add_named_parameter(maximum_angle_t, maximum_angle, maximum_angle)
CGAL_add_named_parameter(maximum_offset_t, maximum_offset, maximum_offset)
CGAL_add_named_parameter(regularize_parallelism_t, regularize_parallelism, regularize_parallelism)
CGAL_add_named_parameter(regularize_orthogonality_t, regularize_orthogonality, regularize_orthogonality)
CGAL_add_named_parameter(regularize_coplanarity_t, regularize_coplanarity, regularize_coplanarity)

8
Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp
View File

@ -384,8 +384,8 @@ private:
regularize_orthogonality(true).
regularize_coplanarity(true).
regularize_axis_symmetry(true).
max_angle(max_accepted_angle).
max_offset(max_distance_to_plane));
maximum_angle(max_accepted_angle).
maximum_offset(max_distance_to_plane));
std::cerr << "done" << std::endl;
}
@ -669,8 +669,8 @@ private:
regularize_orthogonality(true).
regularize_coplanarity(true).
regularize_axis_symmetry(true).
max_angle(dialog.normal_tolerance()).
max_offset(op.epsilon));
maximum_angle(dialog.normal_tolerance()).
maximum_offset(op.epsilon));
std::cerr << "done" << std::endl;
}

4
Shape_detection/test/Shape_detection/test_efficient_RANSAC_scene.cpp
View File

@ -134,8 +134,8 @@ bool test_scene(int argc, char** argv) {
regularize_orthogonality(true).
regularize_coplanarity(true).
regularize_axis_symmetry(true).
max_angle(FT(50)).
max_offset(FT(1) / FT(100)));
maximum_angle(FT(50)).
maximum_offset(FT(1) / FT(100)));
Point_index_range pts = ransac.indices_of_unassigned_points();

4
Shape_regularization/benchmark/Shape_regularization/benchmark_contours.cpp
View File

@ -133,7 +133,7 @@ void benchmark_contours(
timer.start();
CGAL::Shape_regularization::Contours::regularize_closed_contour(
contour, closed_directions, std::back_inserter(regularized),
CGAL::parameters::max_offset(max_offset_2));
CGAL::parameters::maximum_offset(max_offset_2));
timer.stop();
closed_time += timer.time();
timer.reset();
@ -153,7 +153,7 @@ void benchmark_contours(
timer.start();
CGAL::Shape_regularization::Contours::regularize_open_contour(
contour, open_directions, std::back_inserter(regularized),
CGAL::parameters::max_offset(max_offset_2));
CGAL::parameters::maximum_offset(max_offset_2));
timer.stop();
open_time += timer.time();
timer.reset();

4
Shape_regularization/benchmark/Shape_regularization/benchmark_qp_segments.cpp
View File

@ -152,7 +152,7 @@ void benchmark_qp_segments(
const FT max_angle_2 = FT(10);
timer.start();
AR angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
if (regroup) {
Indices group;
group.reserve(m);
@ -184,7 +184,7 @@ void benchmark_qp_segments(
const FT max_offset_2 = FT(1) / FT(5);
timer.start();
OR offset_regularization(
segments, CGAL::parameters::max_offset(max_offset_2));
segments, CGAL::parameters::maximum_offset(max_offset_2));
timer.stop();
// const double setup_offset_time = timer.time();
timer.reset();

2
Shape_regularization/examples/Shape_regularization/regularize_100_segments_angles.cpp
View File

@ -37,7 +37,7 @@ int main(int argc, char *argv[]) {
// Create neigbor query and angle-based regularization model.
Neighbor_query neighbor_query(segments);
Angle_regularization angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
// Regularize.
CGAL::Shape_regularization::Segments::regularize_segments(

4
Shape_regularization/examples/Shape_regularization/regularize_100_segments_offsets.cpp
View File

@ -38,7 +38,7 @@ int main(int argc, char *argv[]) {
std::vector<Indices> pgroups;
CGAL::Shape_regularization::Segments::parallel_groups(
segments, std::back_inserter(pgroups),
CGAL::parameters::max_angle(max_angle_2));
CGAL::parameters::maximum_angle(max_angle_2));
// Offset regularization.
const FT max_offset_2 = FT(1) / FT(4);
@ -46,7 +46,7 @@ int main(int argc, char *argv[]) {
// Create neigbor query and offset-based regularization model.
Neighbor_query neighbor_query(segments);
Offset_regularization offset_regularization(
segments, CGAL::parameters::max_offset(max_offset_2));
segments, CGAL::parameters::maximum_offset(max_offset_2));
// Add each group of parallel segments with at least 2 segments.
for (const auto& pgroup : pgroups) {

4
Shape_regularization/examples/Shape_regularization/regularize_15_segments.cpp
View File

@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
Quadratic_program qp_angles;
Neighbor_query neighbor_query(segments);
Angle_regularization angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
// Add each group of input segments.
for (const auto& group : groups) {
@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
// Create qp solver and offset-based regularization model.
Quadratic_program qp_offsets;
Offset_regularization offset_regularization(
segments, CGAL::parameters::max_offset(max_offset_2));
segments, CGAL::parameters::maximum_offset(max_offset_2));
// Add each group of parallel segments with at least 2 segments.
neighbor_query.clear();

4
Shape_regularization/examples/Shape_regularization/regularize_closed_contour.cpp
View File

@ -38,12 +38,12 @@ int main(int argc, char *argv[]) {
const bool is_closed = true;
Contour_directions directions(
contour, is_closed, CGAL::parameters::
min_length(min_length_2).max_angle(max_angle_2));
minimum_length(min_length_2).maximum_angle(max_angle_2));
std::vector<Point_2> regularized;
CGAL::Shape_regularization::Contours::regularize_closed_contour(
contour, directions, std::back_inserter(regularized),
CGAL::parameters::max_offset(max_offset_2));
CGAL::parameters::maximum_offset(max_offset_2));
std::cout << "* number of directions = " <<
directions.number_of_directions() << std::endl;

2
Shape_regularization/examples/Shape_regularization/regularize_open_contour.cpp
View File

@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
std::vector<Point_2> regularized;
CGAL::Shape_regularization::Contours::regularize_open_contour(
contour, directions, std::back_inserter(regularized),
CGAL::parameters::max_offset(max_offset_2));
CGAL::parameters::maximum_offset(max_offset_2));
std::cout << "* number of directions = " <<
directions.number_of_directions() << std::endl;

2
Shape_regularization/examples/Shape_regularization/regularize_planes.cpp
View File

@ -59,7 +59,7 @@ int main(int argc, char** argv) {
CGAL::parameters::plane_index_map(
CGAL::Shape_detection::Point_to_shape_index_map<Traits>(points, planes)).
regularize_coplanarity(false). // do not regularize coplanarity
max_angle(FT(10))); // 10 degrees of tolerance for parallelism / orthogonality
maximum_angle(FT(10))); // 10 degrees of tolerance for parallelism / orthogonality
std::cout << "* all detected planes are regularized" << std::endl;
return EXIT_SUCCESS;

4
Shape_regularization/examples/Shape_regularization/regularize_real_data_2.cpp
View File

@ -70,7 +70,7 @@ int main(int argc, char *argv[]) {
// Create neigbor query and angle-based regularization model.
Neighbor_query neighbor_query(segments);
Angle_regularization angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
// Regularize.
CGAL::Shape_regularization::Segments::regularize_segments(
@ -89,7 +89,7 @@ int main(int argc, char *argv[]) {
// Create offset-based regularization model.
Offset_regularization offset_regularization(
segments, CGAL::parameters::max_offset(max_offset_2));
segments, CGAL::parameters::maximum_offset(max_offset_2));
// Add each group of parallel segments with at least 2 segments.
neighbor_query.clear();

8
Shape_regularization/include/CGAL/Shape_regularization/Contours/Multiple_directions_2.h
View File

@ -92,13 +92,13 @@ namespace Contours {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_angle}
\cgalParamNBegin{maximum_angle}
\cgalParamDescription{maximum allowed angle deviation in degrees between a contour edge
and a principal direction such that they are considered to be parallel or orthogonal}
\cgalParamType{`GeomTraits::FT`}
\cgalParamDefault{10 degrees}
\cgalParamNEnd
\cgalParamNBegin{min_length}
\cgalParamNBegin{minimum_length}
\cgalParamDescription{minimum acceptable length of a contour edge whose direction can be taken
as a principal direction}
\cgalParamType{`GeomTraits::FT`}
@ -131,9 +131,9 @@ namespace Contours {
CGAL_precondition(input_range.size() >= 2);
m_max_angle_2 = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_angle), FT(10));
parameters::get_parameter(np, internal_np::maximum_angle), FT(10));
m_min_length_2 = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::min_length), FT(3));
parameters::get_parameter(np, internal_np::minimum_length), FT(3));
m_adjust_directions = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::adjust_directions), true);

8
Shape_regularization/include/CGAL/Shape_regularization/Segments/Angle_regularization_2.h
View File

@ -99,7 +99,7 @@ namespace Segments {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_angle}
\cgalParamNBegin{maximum_angle}
\cgalParamDescription{maximum allowed angle deviation in degrees of a segment
from its initial orientation}
\cgalParamType{`GeomTraits::FT`}
@ -127,7 +127,7 @@ namespace Segments {
CGAL_precondition(
input_range.size() >= 2);
const FT max_angle = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_angle), FT(25));
parameters::get_parameter(np, internal_np::maximum_angle), FT(25));
CGAL_precondition(max_angle >= FT(0) && max_angle <= FT(90));
m_max_angle = max_angle;
@ -298,7 +298,7 @@ namespace Segments {
const Parallel_groups_2 grouping(
m_input_range,
CGAL::parameters::max_angle(m_max_angle),
CGAL::parameters::maximum_angle(m_max_angle),
m_segment_map, Traits());
return grouping.groups(groups);
}
@ -319,7 +319,7 @@ namespace Segments {
const Orthogonal_groups_2 grouping(
m_input_range,
CGAL::parameters::max_angle(m_max_angle),
CGAL::parameters::maximum_angle(m_max_angle),
m_segment_map, Traits());
return grouping.groups(groups);
}

8
Shape_regularization/include/CGAL/Shape_regularization/Segments/Offset_regularization_2.h
View File

@ -103,7 +103,7 @@ namespace Segments {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_offset}
\cgalParamNBegin{maximum_offset}
\cgalParamDescription{maximum allowed orthogonal distance between two parallel segments
such that they are considered to be collinear}
\cgalParamType{`GeomTraits::FT`}
@ -131,7 +131,7 @@ namespace Segments {
CGAL_precondition(
input_range.size() >= 2);
const FT max_offset = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_offset), FT(1) / FT(2));
parameters::get_parameter(np, internal_np::maximum_offset), FT(1) / FT(2));
CGAL_precondition(max_offset >= FT(0));
m_max_offset = max_offset;
@ -300,7 +300,7 @@ namespace Segments {
const Collinear_groups_2 grouping(
m_input_range,
CGAL::parameters::max_offset(m_max_offset),
CGAL::parameters::maximum_offset(m_max_offset),
m_segment_map, Traits());
return grouping.groups(groups);
}
@ -335,7 +335,7 @@ namespace Segments {
const Unique_segments_2 unique(
m_input_range,
CGAL::parameters::max_offset(m_max_offset),
CGAL::parameters::maximum_offset(m_max_offset),
m_segment_map, Traits());
return unique.segments(segments);
}

2
Shape_regularization/include/CGAL/Shape_regularization/internal/Collinear_groups_2.h
View File

@ -58,7 +58,7 @@ namespace internal {
CGAL_precondition(input_range.size() > 0);
const FT max_offset = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_offset), FT(1) / FT(5));
parameters::get_parameter(np, internal_np::maximum_offset), FT(1) / FT(5));
const bool preserve_order = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::preserve_order), false);
CGAL_precondition(max_offset >= FT(0));

4
Shape_regularization/include/CGAL/Shape_regularization/internal/Contour_base_2.h
View File

@ -537,8 +537,8 @@ namespace internal {
const SegmentMap segment_map;
const Unique_segments_2 unique(
wraps, CGAL::parameters::
max_angle(get_angle_threshold_2()).
max_offset(max_offset_2).
maximum_angle(get_angle_threshold_2()).
maximum_offset(max_offset_2).
preserve_order(true),
segment_map, Traits());

2
Shape_regularization/include/CGAL/Shape_regularization/internal/Contour_regularization_2.h
View File

@ -61,7 +61,7 @@ namespace internal {
CGAL_precondition(input_range.size() >= 2);
const FT max_offset_2 = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_offset), FT(1) / FT(2));
parameters::get_parameter(np, internal_np::maximum_offset), FT(1) / FT(2));
m_regularization = std::make_unique<Regularization>(
directions, max_offset_2);
m_regularization->initialize(input_range, point_map);

2
Shape_regularization/include/CGAL/Shape_regularization/internal/Orthogonal_groups_2.h
View File

@ -58,7 +58,7 @@ namespace internal {
CGAL_precondition(input_range.size() > 0);
const FT max_angle = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_angle), FT(5));
parameters::get_parameter(np, internal_np::maximum_angle), FT(5));
const bool preserve_order = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::preserve_order), false);
CGAL_precondition(max_angle >= FT(0) && max_angle <= FT(90));

2
Shape_regularization/include/CGAL/Shape_regularization/internal/Parallel_groups_2.h
View File

@ -53,7 +53,7 @@ namespace internal {
CGAL_precondition(input_range.size() > 0);
const FT max_angle = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_angle), FT(5));
parameters::get_parameter(np, internal_np::maximum_angle), FT(5));
const bool preserve_order = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::preserve_order), false);
CGAL_precondition(max_angle >= FT(0) && max_angle <= FT(90));

4
Shape_regularization/include/CGAL/Shape_regularization/regularize_contours.h
View File

@ -86,7 +86,7 @@ namespace Contours {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_offset}
\cgalParamNBegin{maximum_offset}
\cgalParamDescription{maximum allowed orthogonal distance between two parallel
and consecutive contour edges such that they are considered to be collinear}
\cgalParamType{`GeomTraits::FT`}
@ -225,7 +225,7 @@ namespace Contours {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_offset}
\cgalParamNBegin{maximum_offset}
\cgalParamDescription{maximum allowed orthogonal distance between two parallel
and consecutive contour edges such that they are considered to be collinear}
\cgalParamType{`GeomTraits::FT`}

8
Shape_regularization/include/CGAL/Shape_regularization/regularize_planes.h
View File

@ -340,13 +340,13 @@ namespace Planes {
and `int` as value type}
\cgalParamDefault{no default value}
\cgalParamNEnd
\cgalParamNBegin{max_angle}
\cgalParamNBegin{maximum_angle}
\cgalParamDescription{maximum allowed angle in degrees between plane normals used
for parallelism, orthogonality, and axis symmetry}
\cgalParamType{`GeomTraits::FT`}
\cgalParamDefault{25 degrees}
\cgalParamNEnd
\cgalParamNBegin{max_offset}
\cgalParamNBegin{maximum_offset}
\cgalParamDescription{maximum allowed orthogonal distance between two parallel planes
such that they are considered to be coplanar}
\cgalParamType{`GeomTraits::FT`}
@ -424,10 +424,10 @@ namespace Planes {
true);
const FT tol_angle = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_angle),
parameters::get_parameter(np, internal_np::maximum_angle),
FT(25));
const FT tol_copln = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::max_offset),
parameters::get_parameter(np, internal_np::maximum_offset),
FT(1) / FT(100));
const Vector_3 sym_dir = parameters::choose_parameter(
parameters::get_parameter(np, internal_np::symmetry_direction),

8
Shape_regularization/include/CGAL/Shape_regularization/regularize_segments.h
View File

@ -380,7 +380,7 @@ namespace Segments {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_angle}
\cgalParamNBegin{maximum_angle}
\cgalParamDescription{maximum allowed angle deviation in degrees between two segments
such that they are considered to be parallel}
\cgalParamType{`GeomTraits::FT`}
@ -485,7 +485,7 @@ namespace Segments {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_offset}
\cgalParamNBegin{maximum_offset}
\cgalParamDescription{maximum allowed orthogonal distance between two parallel segments
such that they are considered to be collinear}
\cgalParamType{`GeomTraits::FT`}
@ -590,7 +590,7 @@ namespace Segments {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_angle}
\cgalParamNBegin{maximum_angle}
\cgalParamDescription{maximum allowed angle deviation in degrees between two segments
such that they are considered to be parallel or orthogonal}
\cgalParamType{`GeomTraits::FT`}
@ -694,7 +694,7 @@ namespace Segments {
the default values are then used
\cgalNamedParamsBegin
\cgalParamNBegin{max_offset}
\cgalParamNBegin{maximum_offset}
\cgalParamDescription{maximum allowed orthogonal distance between two parallel segments
such that they are considered to be collinear}
\cgalParamType{`GeomTraits::FT`}

2
Shape_regularization/test/Shape_regularization/test_100_segments_angles.cpp
View File

@ -29,7 +29,7 @@ void test_100_segments_angles() {
const FT max_angle_2 = FT(40);
NQ neighbor_query(segments);
AR angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
SR::Segments::regularize_segments(
segments, neighbor_query, angle_regularization);

4
Shape_regularization/test/Shape_regularization/test_100_segments_offsets.cpp
View File

@ -31,7 +31,7 @@ void test_100_segments_offsets() {
SR::Segments::parallel_groups(
segments,
std::back_inserter(parallel_groups),
CGAL::parameters::max_angle(max_angle_2));
CGAL::parameters::maximum_angle(max_angle_2));
// Segments output;
// for (std::size_t i = 0; i < parallel_groups.size(); ++i) {
@ -48,7 +48,7 @@ void test_100_segments_offsets() {
const FT max_offset_2 = FT(1) / FT(4);
OR offset_regularization(
segments, CGAL::parameters::max_offset(max_offset_2));
segments, CGAL::parameters::maximum_offset(max_offset_2));
NQ neighbor_query(segments);
for (const auto& parallel_group : parallel_groups) {

4
Shape_regularization/test/Shape_regularization/test_2_segments.cpp
View File

@ -41,7 +41,7 @@ void test_2_segments() {
NQ neighbor_query(segments, smap);
AR angle_regularization(
segments, CGAL::parameters::
max_angle(max_angle_2).
maximum_angle(max_angle_2).
segment_map(smap));
QP qp_angles;
@ -77,7 +77,7 @@ void test_2_segments() {
const FT max_offset_2 = FT(1) / FT(2);
OR offset_regularization(
segments, CGAL::parameters::
max_offset(max_offset_2).
maximum_offset(max_offset_2).
segment_map(smap));
neighbor_query.clear();

4
Shape_regularization/test/Shape_regularization/test_3_segments.cpp
View File

@ -34,7 +34,7 @@ void test_3_segments() {
const FT max_angle_2 = FT(10);
NQ neighbor_query(segments);
AR angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
SR::Segments::regularize_segments(
segments, neighbor_query, angle_regularization, Traits());
@ -67,7 +67,7 @@ void test_3_segments() {
const FT max_offset_2 = FT(1) / FT(100);
OR offset_regularization(
segments, CGAL::parameters::max_offset(max_offset_2));
segments, CGAL::parameters::maximum_offset(max_offset_2));
neighbor_query.clear();
for (const auto& parallel_group : parallel_groups) {

4
Shape_regularization/test/Shape_regularization/test_4_segments.cpp
View File

@ -36,7 +36,7 @@ void test_4_segments() {
const FT max_angle_2 = FT(5);
NQ neighbor_query(segments);
AR angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
QP qp_angles;
SR::Segments::regularize_segments(
@ -71,7 +71,7 @@ void test_4_segments() {
const FT max_offset_2 = FT(1) / FT(10);
OR offset_regularization(
segments, CGAL::parameters::max_offset(max_offset_2));
segments, CGAL::parameters::maximum_offset(max_offset_2));
neighbor_query.clear();
for (const auto& parallel_group : parallel_groups) {

2
Shape_regularization/test/Shape_regularization/test_cgal_solver.cpp
View File

@ -41,7 +41,7 @@ void test_cgal_solver() {
const FT max_angle_2 = FT(5);
NQ neighbor_query(segments);
AR angle_regularization(
segments, CGAL::parameters::max_angle(max_angle_2));
segments, CGAL::parameters::maximum_angle(max_angle_2));
QP qp_angles;
QP_AR qp_ar(

4
Shape_regularization/test/Shape_regularization/test_directions_multiple_1.cpp
View File

@ -50,14 +50,14 @@ void test_directions_multiple_1() {
// std::vector<Point_2> regularized;
// SR::Contours::regularize_closed_contour(
// contour, closed_directions, std::back_inserter(regularized),
// CGAL::parameters::max_offset(2));
// CGAL::parameters::maximum_offset(2));
// saver.export_closed_contour(regularized,
// "/Users/monet/Documents/gsoc/ggr/logs/dm1_output_cl", 100);
// regularized.clear();
// SR::Contours::regularize_open_contour(
// contour, open_directions, std::back_inserter(regularized),
// CGAL::parameters::max_offset(2));
// CGAL::parameters::maximum_offset(2));
// saver.export_open_contour(regularized,
// "/Users/monet/Documents/gsoc/ggr/logs/dm1_output_op", 100);

12
Shape_regularization/test/Shape_regularization/test_directions_multiple_2.cpp
View File

@ -39,15 +39,15 @@ void test_directions_multiple_2() {
MD closed_directions(
contour, is_closed,
CGAL::parameters::
min_length(min_length_2).
max_angle(max_angle_2).
minimum_length(min_length_2).
maximum_angle(max_angle_2).
adjust_directions(false).
point_map(pmap));
MD open_directions(
contour, !is_closed,
CGAL::parameters::
min_length(min_length_2).
max_angle(max_angle_2).
minimum_length(min_length_2).
maximum_angle(max_angle_2).
adjust_directions(false).
point_map(pmap));
@ -73,14 +73,14 @@ void test_directions_multiple_2() {
// std::vector<Point_2> regularized;
// SR::Contours::regularize_closed_contour(
// contour, closed_directions, std::back_inserter(regularized),
// CGAL::parameters::max_offset(2));
// CGAL::parameters::maximum_offset(2));
// saver.export_closed_contour(regularized,
// "/Users/monet/Documents/gsoc/ggr/logs/dm2_output_cl", 100);
// regularized.clear();
// SR::Contours::regularize_open_contour(
// contour, open_directions, std::back_inserter(regularized),
// CGAL::parameters::max_offset(2));
// CGAL::parameters::maximum_offset(2));
// saver.export_open_contour(regularized,
// "/Users/monet/Documents/gsoc/ggr/logs/dm2_output_op", 100);

4
Shape_regularization/test/Shape_regularization/test_directions_multiple_3.cpp
View File

@ -44,14 +44,14 @@ void test_directions_multiple_3() {
// std::vector<Point_2> regularized;
// SR::Contours::regularize_closed_contour(
// contour, closed_directions, std::back_inserter(regularized),
// CGAL::parameters::max_offset(2));
// CGAL::parameters::maximum_offset(2));
// saver.export_closed_contour(regularized,
// "/Users/monet/Documents/gsoc/ggr/logs/dm3_output_cl", 100);
// regularized.clear();
// SR::Contours::regularize_open_contour(
// contour, open_directions, std::back_inserter(regularized),
// CGAL::parameters::max_offset(2));
// CGAL::parameters::maximum_offset(2));
// saver.export_open_contour(regularized,
// "/Users/monet/Documents/gsoc/ggr/logs/dm3_output_op", 100);

10
Shape_regularization/test/Shape_regularization/test_plane_regularization.cpp
View File

@ -195,7 +195,7 @@ int main() {
regularize_orthogonality(false).
regularize_coplanarity(false).
regularize_axis_symmetry(false).
max_angle(15.0));
maximum_angle(15.0));
after = get_ransac_planes(ransac);
@ -248,7 +248,7 @@ int main() {
regularize_orthogonality(true).
regularize_coplanarity(false).
regularize_axis_symmetry(true).
max_angle(15.0));
maximum_angle(15.0));
after = get_ransac_planes(ransac);
@ -301,8 +301,8 @@ int main() {
regularize_orthogonality(false).
regularize_coplanarity(true).
regularize_axis_symmetry(false).
max_angle(5.0).
max_offset(0.3));
maximum_angle(5.0).
maximum_offset(0.3));
after = get_ransac_planes(ransac);
@ -360,7 +360,7 @@ int main() {
regularize_orthogonality(false).
regularize_coplanarity(false).
regularize_axis_symmetry(true).
max_angle(15.0).
maximum_angle(15.0).
symmetry_direction(Vector(1.0, 0.0, 0.0)));
after = get_ransac_planes(ransac);

4
Shape_regularization/test/Shape_regularization/test_unique_segments.cpp
View File

@ -61,7 +61,7 @@ void test_unique_segments() {
unique.clear();
SR::Segments::unique_segments(
segments, std::back_inserter(unique), CGAL::parameters::max_offset(1));
segments, std::back_inserter(unique), CGAL::parameters::maximum_offset(1));
assert(unique.size() == 3);
// saver.export_eps_segments(unique, "/Users/monet/Documents/gsoc/ggr/logs/us_output", 100);
assert(unique[0] == ref_segments[0]);
@ -71,7 +71,7 @@ void test_unique_segments() {
unique.clear();
SR::Segments::unique_segments(
segments, std::back_inserter(unique), CGAL::parameters::
max_offset(1).
maximum_offset(1).
preserve_order(true));
assert(unique.size() == 3);
// saver.export_eps_segments(unique, "/Users/monet/Documents/gsoc/ggr/logs/us_output_pr", 100);