summaryrefslogtreecommitdiff
path: root/src/Collapse
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-06-18 14:35:44 +0200
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2020-06-18 14:35:44 +0200
commit08307b231e8fe2b044ade409b924f56b3eb7ebfe (patch)
tree91faf956aa8c7aa5d6437b08cc36e9284c0f969e /src/Collapse
parent0a9cadf43cf61107b6064f368f61b58db153609a (diff)
Code review: replace push_back with emplace_back
Diffstat (limited to 'src/Collapse')
-rw-r--r--src/Collapse/example/edge_collapse_basic_example.cpp2
-rw-r--r--src/Collapse/example/edge_collapse_conserve_persistence.cpp6
-rw-r--r--src/Collapse/include/gudhi/Flag_complex_edge_collapser.h8
-rw-r--r--src/Collapse/test/collapse_unit_test.cpp22
4 files changed, 19 insertions, 19 deletions
diff --git a/src/Collapse/example/edge_collapse_basic_example.cpp b/src/Collapse/example/edge_collapse_basic_example.cpp
index 17ed04a2..ac21e96f 100644
--- a/src/Collapse/example/edge_collapse_basic_example.cpp
+++ b/src/Collapse/example/edge_collapse_basic_example.cpp
@@ -32,7 +32,7 @@ int main() {
// Retrieve collapse edges from the output iterator
edge_collapser.process_edges(
[&remaining_edges](std::pair<Vertex_handle, Vertex_handle> edge, Filtration_value filtration) {
- remaining_edges.push_back({edge, filtration});
+ remaining_edges.emplace_back(Filtered_edge(edge, filtration));
});
for (Filtered_edge filtered_edge_from_collapse : remaining_edges) {
diff --git a/src/Collapse/example/edge_collapse_conserve_persistence.cpp b/src/Collapse/example/edge_collapse_conserve_persistence.cpp
index b28af456..8e03fa86 100644
--- a/src/Collapse/example/edge_collapse_conserve_persistence.cpp
+++ b/src/Collapse/example/edge_collapse_conserve_persistence.cpp
@@ -71,9 +71,9 @@ std::vector<Persistence_pair> get_persistence_pairs(Simplex_tree& st, int ambien
auto persistent_pairs = pcoh.get_persistent_pairs();
std::sort(std::begin(persistent_pairs), std::end(persistent_pairs), cmp);
for (auto pair : persistent_pairs) {
- ppairs.push_back({st.dimension(get<0>(pair)),
- st.filtration(get<0>(pair)),
- st.filtration(get<1>(pair)) });
+ ppairs.emplace_back(Persistence_pair(st.dimension(get<0>(pair)),
+ st.filtration(get<0>(pair)),
+ st.filtration(get<1>(pair)) ));
}
return ppairs;
}
diff --git a/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h b/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h
index 6afeaefc..02460efb 100644
--- a/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h
+++ b/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h
@@ -218,7 +218,7 @@ class Flag_complex_edge_collapser {
if ((closed && rw_u == rw_v) ||
(ei = it.value()) <= current_backward ||
critical_edge_indicator_[ei]) {
- neighbors.push_back(rw_v);
+ neighbors.emplace_back(rw_v);
#ifdef DEBUG_TRACES
std::cout << row_to_vertex_[rw_v] << ", " ;
#endif // DEBUG_TRACES
@@ -254,7 +254,7 @@ class Flag_complex_edge_collapser {
// Initializing the diagonal element of the adjency matrix corresponding to rw_b.
sparse_row_adjacency_matrix_[n].insert(n) = -1; // not an edge
// Must be done after reading its size()
- row_to_vertex_.push_back(vertex);
+ row_to_vertex_.emplace_back(vertex);
}
return result.first->second;
}
@@ -319,7 +319,7 @@ class Flag_complex_edge_collapser {
auto edge = *(edge_it.first);
Vertex_handle u = source(edge, one_skeleton_graph);
Vertex_handle v = target(edge, one_skeleton_graph);
- f_edge_vector_.push_back({{u, v}, boost::get(Gudhi::edge_filtration_t(), one_skeleton_graph, edge)});
+ f_edge_vector_.emplace_back(Filtered_edge({u, v}, boost::get(Gudhi::edge_filtration_t(), one_skeleton_graph, edge)));
}
}
@@ -353,7 +353,7 @@ class Flag_complex_edge_collapser {
IEdge ie = insert_new_edge(u, v, endIdx);
iedge_to_index_map_.emplace(ie, endIdx);
- critical_edge_indicator_.push_back(false);
+ critical_edge_indicator_.emplace_back(false);
if (!edge_is_dominated(edge)) {
critical_edge_indicator_[endIdx] = true;
diff --git a/src/Collapse/test/collapse_unit_test.cpp b/src/Collapse/test/collapse_unit_test.cpp
index 6ca49299..a6d3ca1c 100644
--- a/src/Collapse/test/collapse_unit_test.cpp
+++ b/src/Collapse/test/collapse_unit_test.cpp
@@ -54,7 +54,7 @@ void trace_and_check_collapse(const Filtered_edge_range& filtered_edges, const F
edge_collapser.process_edges(
[&remaining_edges](std::pair<Vertex_handle, Vertex_handle> edge, Filtration_value filtration) {
std::cout << "f[" << std::get<0>(edge) << ", " << std::get<1>(edge) << "] = " << filtration << std::endl;
- remaining_edges.push_back({edge, filtration});
+ remaining_edges.emplace_back(Filtered_edge(edge, filtration));
});
std::cout << "AFTER COLLAPSE - Total number of edges: " << remaining_edges.size() << std::endl;
BOOST_CHECK(remaining_edges.size() <= filtered_edges.size());
@@ -96,8 +96,8 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \|
// o---o
// 0 3
- edges.push_back({{0, 2}, 2.});
- edges.push_back({{1, 3}, 2.});
+ edges.emplace_back(Filtered_edge({0, 2}, 2.));
+ edges.emplace_back(Filtered_edge({1, 3}, 2.));
trace_and_check_collapse(edges, {{{1, 3}, 2.}});
// 1 2 4
@@ -107,9 +107,9 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \| |
// o---o---o
// 0 3 5
- edges.push_back({{2, 4}, 3.});
- edges.push_back({{4, 5}, 3.});
- edges.push_back({{5, 3}, 3.});
+ edges.emplace_back(Filtered_edge({2, 4}, 3.));
+ edges.emplace_back(Filtered_edge({4, 5}, 3.));
+ edges.emplace_back(Filtered_edge({5, 3}, 3.));
trace_and_check_collapse(edges, {{{1, 3}, 2.}});
// 1 2 4
@@ -119,8 +119,8 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \|/ \|
// o---o---o
// 0 3 5
- edges.push_back({{2, 5}, 4.});
- edges.push_back({{4, 3}, 4.});
+ edges.emplace_back(Filtered_edge({2, 5}, 4.));
+ edges.emplace_back(Filtered_edge({4, 3}, 4.));
trace_and_check_collapse(edges, {{{1, 3}, 2.}, {{4, 3}, 4.}});
// 1 2 4
@@ -130,8 +130,8 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \|/ \|
// o---o---o
// 0 3 5
- edges.push_back({{1, 5}, 5.});
- edges.push_back({{0, 4}, 5.});
+ edges.emplace_back(Filtered_edge({1, 5}, 5.));
+ edges.emplace_back(Filtered_edge({0, 4}, 5.));
trace_and_check_collapse(edges, {{{1, 3}, 2.}, {{4, 3}, 4.}, {{0, 4}, 5.}});
}
@@ -173,7 +173,7 @@ BOOST_AUTO_TEST_CASE(collapse_from_proximity_graph) {
edge_collapser.process_edges(
[&remaining_edges](std::pair<Vertex_handle, Vertex_handle> edge, Filtration_value filtration) {
std::cout << "f[" << std::get<0>(edge) << ", " << std::get<1>(edge) << "] = " << filtration << std::endl;
- remaining_edges.push_back({edge, filtration});
+ remaining_edges.emplace_back(Filtered_edge(edge, filtration));
});
BOOST_CHECK(remaining_edges.size() == 5);