extra run of the script to remove tabs and trailing whitespaces

This commit is contained in:
Sébastien Loriot 2020-03-26 19:40:38 +01:00 committed by Simon Giraudot
parent 6c538494c9
commit dba7c3eb73
4 changed files with 24 additions and 24 deletions

View File

@ -743,7 +743,7 @@ parameters, with and without preventing unselection.
The following example shows how to apply this alpha expansion The following example shows how to apply this alpha expansion
regularization to the borders of a face selection of a regularization to the borders of a face selection of a
`CGAL::Surface_mesh` object: `CGAL::Surface_mesh` object:
\cgalExample{BGL_graphcut/face_selection_borders_regularization_example.cpp} \cgalExample{BGL_graphcut/face_selection_borders_regularization_example.cpp}

View File

@ -36,7 +36,7 @@ int main(int argc, char** argv)
} }
std::cerr << nb_selected_before << " selected before regularization" << std::endl; std::cerr << nb_selected_before << " selected before regularization" << std::endl;
CGAL::regularize_face_selection_borders (mesh, CGAL::regularize_face_selection_borders (mesh,
boost::make_assoc_property_map(is_selected_map), boost::make_assoc_property_map(is_selected_map),
0.5); // using weight = 0.5 0.5); // using weight = 0.5
@ -47,6 +47,6 @@ int main(int argc, char** argv)
++ nb_selected_after; ++ nb_selected_after;
std::cerr << nb_selected_after << " selected after regularization" << std::endl; std::cerr << nb_selected_after << " selected after regularization" << std::endl;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

View File

@ -75,14 +75,14 @@ struct Regularization_graph
typedef typename GT::edge_descriptor fg_edge_descriptor; typedef typename GT::edge_descriptor fg_edge_descriptor;
typedef typename GT::edge_iterator fg_edge_iterator; typedef typename GT::edge_iterator fg_edge_iterator;
typedef typename GT::vertex_descriptor fg_vertex_descriptor; typedef typename GT::vertex_descriptor fg_vertex_descriptor;
typedef fg_face_descriptor vertex_descriptor; typedef fg_face_descriptor vertex_descriptor;
typedef fg_face_iterator vertex_iterator; typedef fg_face_iterator vertex_iterator;
typedef fg_edge_descriptor edge_descriptor; typedef fg_edge_descriptor edge_descriptor;
typedef boost::undirected_tag directed_category; typedef boost::undirected_tag directed_category;
typedef boost::disallow_parallel_edge_tag edge_parallel_category; typedef boost::disallow_parallel_edge_tag edge_parallel_category;
typedef boost::edge_list_graph_tag traversal_category; typedef boost::edge_list_graph_tag traversal_category;
struct Filter_border_edges struct Filter_border_edges
{ {
FaceGraph* fg; FaceGraph* fg;
@ -133,7 +133,7 @@ struct Regularization_graph
friend reference get (const Vertex_label_probability_map& pmap, key_type fd) friend reference get (const Vertex_label_probability_map& pmap, key_type fd)
{ {
double value = (1. - pmap.rg->weight) * pmap.rg->area (fd) / pmap.rg->total_area; double value = (1. - pmap.rg->weight) * pmap.rg->area (fd) / pmap.rg->total_area;
std::vector<double> out(2); std::vector<double> out(2);
if (get(pmap.rg->is_selected_map, fd)) if (get(pmap.rg->is_selected_map, fd))
{ {
@ -214,7 +214,7 @@ struct Regularization_graph
else else
labels.push_back(0); labels.push_back(0);
} }
// Compute normalization factors // Compute normalization factors
for (fg_edge_descriptor ed : edges(fg)) for (fg_edge_descriptor ed : edges(fg))
total_length += length (ed); total_length += length (ed);
@ -234,7 +234,7 @@ struct Regularization_graph
{ {
fg_halfedge_descriptor hd = halfedge (fd, fg); fg_halfedge_descriptor hd = halfedge (fd, fg);
fg_halfedge_descriptor nhd = next (hd, fg); fg_halfedge_descriptor nhd = next (hd, fg);
return approximate_sqrt (squared_area (get (vertex_point_map, source (hd, fg)), return approximate_sqrt (squared_area (get (vertex_point_map, source (hd, fg)),
get (vertex_point_map, target (hd, fg)), get (vertex_point_map, target (hd, fg)),
get (vertex_point_map, target (nhd, fg)))); get (vertex_point_map, target (nhd, fg))));
@ -263,7 +263,7 @@ struct Regularization_graph
{ {
return face (halfedge (ed, graph.fg), graph.fg); return face (halfedge (ed, graph.fg), graph.fg);
} }
friend vertex_descriptor target (edge_descriptor ed, const Regularization_graph& graph) friend vertex_descriptor target (edge_descriptor ed, const Regularization_graph& graph)
{ {
return face (opposite(halfedge (ed, graph.fg), graph.fg), graph.fg); return face (opposite(halfedge (ed, graph.fg), graph.fg), graph.fg);
@ -475,7 +475,7 @@ reduce_face_selection(
\cgalParamEnd \cgalParamEnd
\cgalNamedParamsEnd \cgalNamedParamsEnd
*/ */
template <typename FaceGraph, typename IsSelectedMap, typename NamedParameters> template <typename FaceGraph, typename IsSelectedMap, typename NamedParameters>
void void
regularize_face_selection_borders( regularize_face_selection_borders(
FaceGraph& fg, FaceGraph& fg,
@ -485,9 +485,9 @@ regularize_face_selection_borders(
{ {
using parameters::choose_parameter; using parameters::choose_parameter;
using parameters::get_parameter; using parameters::get_parameter;
CGAL_precondition (0.0 <= weight && weight < 1.0); CGAL_precondition (0.0 <= weight && weight < 1.0);
typedef boost::graph_traits<FaceGraph> GT; typedef boost::graph_traits<FaceGraph> GT;
typedef typename GT::face_descriptor fg_face_descriptor; typedef typename GT::face_descriptor fg_face_descriptor;
typedef typename GT::halfedge_descriptor fg_halfedge_descriptor; typedef typename GT::halfedge_descriptor fg_halfedge_descriptor;
@ -512,14 +512,14 @@ regularize_face_selection_borders(
vertex_point_map, vertex_point_map,
weight, weight,
prevent_unselection); prevent_unselection);
alpha_expansion_graphcut (graph, alpha_expansion_graphcut (graph,
graph.edge_cost_map(), graph.edge_cost_map(),
graph.vertex_label_probability_map(), graph.vertex_label_probability_map(),
graph.vertex_label_map(), graph.vertex_label_map(),
CGAL::parameters::vertex_index_map CGAL::parameters::vertex_index_map
(face_index_map)); (face_index_map));
for (fg_face_descriptor fd : faces(fg)) for (fg_face_descriptor fd : faces(fg))
put(is_selected, fd, graph.labels[get(face_index_map,fd)]); put(is_selected, fd, graph.labels[get(face_index_map,fd)]);
} }
@ -560,7 +560,7 @@ regularize_face_selection_borders(
// TODO: this is a quick and dirty version, the complexity is // TODO: this is a quick and dirty version, the complexity is
// crazy and it should be easy to do better (with priority queues, // crazy and it should be easy to do better (with priority queues,
// for example) // for example)
auto border_length = auto border_length =
[&]() -> double [&]() -> double
{ {
@ -571,7 +571,7 @@ regularize_face_selection_borders(
fg_face_descriptor f1 = face (opposite(halfedge (ed, fg), fg), fg); fg_face_descriptor f1 = face (opposite(halfedge (ed, fg), fg), fg);
if (get(is_selected,f0) == get(is_selected,f1)) if (get(is_selected,f0) == get(is_selected,f1))
continue; continue;
fg_vertex_descriptor esource = source(ed, fg); fg_vertex_descriptor esource = source(ed, fg);
fg_vertex_descriptor etarget = target(ed, fg); fg_vertex_descriptor etarget = target(ed, fg);
@ -587,7 +587,7 @@ regularize_face_selection_borders(
fg_edge_descriptor chosen; fg_edge_descriptor chosen;
double length_before = border_length(); double length_before = border_length();
double shortest_length = length_before; double shortest_length = length_before;
for (fg_edge_descriptor ed : edges(fg)) for (fg_edge_descriptor ed : edges(fg))
{ {
fg_face_descriptor selected = face (halfedge (ed, fg), fg); fg_face_descriptor selected = face (halfedge (ed, fg), fg);
@ -631,7 +631,7 @@ regularize_face_selection_borders(
fg_vertex_descriptor chosen; fg_vertex_descriptor chosen;
double length_before = border_length(); double length_before = border_length();
double shortest_length = length_before; double shortest_length = length_before;
for (fg_vertex_descriptor vd : vertices(fg)) for (fg_vertex_descriptor vd : vertices(fg))
{ {
fg_halfedge_descriptor hd = halfedge(vd, fg); fg_halfedge_descriptor hd = halfedge(vd, fg);
@ -676,7 +676,7 @@ regularize_face_selection_borders(
break; break;
fg_halfedge_descriptor hd = halfedge (chosen, fg); fg_halfedge_descriptor hd = halfedge (chosen, fg);
for (fg_face_descriptor fd : faces_around_target (hd, fg)) for (fg_face_descriptor fd : faces_around_target (hd, fg))
put(is_selected, fd, true); put(is_selected, fd, true);
} }

View File

@ -380,7 +380,7 @@ public Q_SLOTS:
Scene_polyhedron_selection_item* selection_item = getSelectedItem<Scene_polyhedron_selection_item>(); Scene_polyhedron_selection_item* selection_item = getSelectedItem<Scene_polyhedron_selection_item>();
if(!selection_item) { if(!selection_item) {
print_message("Error: there is no selected polyhedron selection item!"); print_message("Error: there is no selected polyhedron selection item!");
return; return;
} }
QMultipleInputDialog dialog ("Regularize Selection Border", mw); QMultipleInputDialog dialog ("Regularize Selection Border", mw);
@ -393,7 +393,7 @@ public Q_SLOTS:
if (dialog.exec() != QDialog::Accepted) if (dialog.exec() != QDialog::Accepted)
return; return;
boost::unordered_map<fg_face_descriptor, bool> is_selected_map; boost::unordered_map<fg_face_descriptor, bool> is_selected_map;
std::size_t index = 0; std::size_t index = 0;
for(fg_face_descriptor fh : faces(*selection_item->polyhedron())) for(fg_face_descriptor fh : faces(*selection_item->polyhedron()))
@ -420,7 +420,7 @@ public Q_SLOTS:
*selection_item->polyhedron()); *selection_item->polyhedron());
if (is_selected_map[f0] == is_selected_map[f1]) if (is_selected_map[f0] == is_selected_map[f1])
continue; continue;
fg_vertex_descriptor esource = source(ed, *selection_item->polyhedron()); fg_vertex_descriptor esource = source(ed, *selection_item->polyhedron());
fg_vertex_descriptor etarget = target(ed, *selection_item->polyhedron()); fg_vertex_descriptor etarget = target(ed, *selection_item->polyhedron());
@ -440,9 +440,9 @@ public Q_SLOTS:
CGAL::parameters::prevent_unselection (prevent_unselection->isChecked())); CGAL::parameters::prevent_unselection (prevent_unselection->isChecked()));
std::cerr << "Length of border after regularization = " << border_length() << std::endl; std::cerr << "Length of border after regularization = " << border_length() << std::endl;
selection_item->selected_facets.clear(); selection_item->selected_facets.clear();
for(fg_face_descriptor fh : faces(*selection_item->polyhedron())) for(fg_face_descriptor fh : faces(*selection_item->polyhedron()))
{ {
if (is_selected_map[fh]) if (is_selected_map[fh])