mirror of https://github.com/CGAL/cgal
added two missing named parameters
This commit is contained in:
parent
7fdfe22ffc
commit
79b451a511
|
|
@ -28,13 +28,11 @@ struct Parameters_3 {
|
|||
unsigned int max_octree_node_size = 40;
|
||||
|
||||
FT bbox_dilation_ratio = FT(11) / FT(10); // ratio to enlarge bbox
|
||||
FT angle_tolerance = FT(5);
|
||||
FT distance_tolerance = FT(5) / FT(10); // distance tolerance between planes
|
||||
|
||||
bool reorient_bbox = false; // true - optimal bounding box, false - axis aligned
|
||||
|
||||
// All files are saved in the current build directory.
|
||||
bool verbose = true; // print basic verbose information
|
||||
bool verbose = false; // print basic verbose information
|
||||
bool debug = false; // print all steps and substeps + export initial and final configurations
|
||||
|
||||
// See also global tolerance inside utils.h! (set to 0)
|
||||
|
|
|
|||
|
|
@ -310,6 +310,11 @@ public:
|
|||
\cgalParamType{a model of `ReadablePropertyMap` whose key type is the value type of the iterator of `PointRange` and whose value type is `GeomTraits::Point_3`}
|
||||
\cgalParamDefault{`CGAL::Identity_property_map<GeomTraits::Point_3>`}
|
||||
\cgalParamNEnd
|
||||
\cgalParamNBegin{debug}
|
||||
\cgalParamDescription{Export of intermediate results.}
|
||||
\cgalParamType{bool}
|
||||
\cgalParamDefault{false}
|
||||
\cgalParamNEnd
|
||||
\cgalParamNBegin{verbose}
|
||||
\cgalParamDescription{Write timing and internal information to std::cout.}
|
||||
\cgalParamType{bool}
|
||||
|
|
@ -325,6 +330,16 @@ public:
|
|||
\cgalParamType{FT}
|
||||
\cgalParamDefault{1.1}
|
||||
\cgalParamNEnd
|
||||
\cgalParamNBegin{max_octree_depth}
|
||||
\cgalParamDescription{The maximal depth of the octree for subdividing the kinetic partition before initialization.}
|
||||
\cgalParamType{std::size_t}
|
||||
\cgalParamDefault{3}
|
||||
\cgalParamNEnd
|
||||
\cgalParamNBegin{max_octree_node_size}
|
||||
\cgalParamDescription{A node in the octree is only split if the contained number of primitives is larger and the maximal depth is not yet reached.}
|
||||
\cgalParamType{std::size_t}
|
||||
\cgalParamDefault{40}
|
||||
\cgalParamNEnd
|
||||
\cgalNamedParamsEnd
|
||||
|
||||
|
||||
|
|
@ -408,10 +423,10 @@ public:
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (skip)
|
||||
continue;
|
||||
|
||||
|
||||
m_input2regularized.push_back(m_input_planes.size());
|
||||
m_regularized2input.push_back(std::vector<std::size_t>());
|
||||
m_regularized2input.back().push_back(p);
|
||||
|
|
@ -445,6 +460,16 @@ public:
|
|||
\cgalParamType{FT}
|
||||
\cgalParamDefault{1.1}
|
||||
\cgalParamNEnd
|
||||
\cgalParamNBegin{max_octree_depth}
|
||||
\cgalParamDescription{The maximal depth of the octree for subdividing the kinetic partition before initialization.}
|
||||
\cgalParamType{std::size_t}
|
||||
\cgalParamDefault{3}
|
||||
\cgalParamNEnd
|
||||
\cgalParamNBegin{max_octree_node_size}
|
||||
\cgalParamDescription{A node in the octree is only split if the contained number of primitives is larger and the maximal depth is not yet reached.}
|
||||
\cgalParamType{std::size_t}
|
||||
\cgalParamDefault{40}
|
||||
\cgalParamNEnd
|
||||
\cgalNamedParamsEnd
|
||||
|
||||
\pre input data has been provided via `insert()`.
|
||||
|
|
@ -510,19 +535,12 @@ public:
|
|||
|
||||
for (std::size_t idx : m_partitions) {
|
||||
Sub_partition& partition = m_partition_nodes[idx];
|
||||
std::cout << idx << ". " << partition.input_polygons.size() << " polygons " << std::flush;
|
||||
partition.index = idx;
|
||||
|
||||
partition.m_data = std::make_shared<Data_structure>(m_parameters, std::to_string(idx) + "-");
|
||||
|
||||
/*
|
||||
std::vector<std::vector<Point_3> > input_polygons(partition.input_polygons.size());
|
||||
for (std::size_t i = 0; i < partition.input_polygons.size(); i++)
|
||||
input_polygons[i] = m_input_polygons[partition.input_polygons[i]];*/
|
||||
|
||||
Initializer initializer(partition.clipped_polygons, partition.m_input_planes, *partition.m_data, m_parameters);
|
||||
initializer.initialize(partition.bbox, partition.input_polygons);
|
||||
std::cout << std::endl;
|
||||
}
|
||||
|
||||
// Timing.
|
||||
|
|
|
|||
|
|
@ -262,10 +262,7 @@ CGAL_add_named_parameter(maximum_normal_deviation_t, maximum_normal_deviation, m
|
|||
// kinetic parameters
|
||||
CGAL_add_named_parameter(bbox_dilation_ratio_t, bbox_dilation_ratio, bbox_dilation_ratio)
|
||||
CGAL_add_named_parameter(reorient_bbox_t, reorient_bbox, reorient_bbox)
|
||||
CGAL_add_named_parameter(distance_tolerance_t, distance_tolerance, distance_tolerance)
|
||||
CGAL_add_named_parameter(angle_tolerance_t, angle_tolerance, angle_tolerance)
|
||||
CGAL_add_named_parameter(debug_t, debug, debug)
|
||||
CGAL_add_named_parameter(graphcut_beta_t, graphcut_beta, graphcut_beta)
|
||||
CGAL_add_named_parameter(max_octree_depth_t, max_octree_depth, max_octree_depth)
|
||||
CGAL_add_named_parameter(max_octree_node_size_t, max_octree_node_size, max_octree_node_size)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue