summaryrefslogtreecommitdiff
path: root/src/Collapse
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2020-06-23 00:00:58 +0200
committerMarc Glisse <marc.glisse@inria.fr>2020-06-23 00:00:58 +0200
commite4e55054945ec25bba613bf9051b9dde0b09357e (patch)
tree04a4c3de8f6713e8b8052f89947287115fc18da7 /src/Collapse
parent1fdaa406b6b0b85e409bd97090098ed5846c078c (diff)
Fix uses of 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.h6
-rw-r--r--src/Collapse/test/collapse_unit_test.cpp24
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 d374fef2..8e7ca3b1 100644
--- a/src/Collapse/example/edge_collapse_basic_example.cpp
+++ b/src/Collapse/example/edge_collapse_basic_example.cpp
@@ -31,7 +31,7 @@ int main() {
// Retrieve collapse edges from the output iterator
edge_collapser.process_edges(
[&remaining_edges](Vertex_handle u, Vertex_handle v, Filtration_value filtration) {
- remaining_edges.emplace_back(Filtered_edge(u, v, filtration));
+ remaining_edges.emplace_back(u, v, 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 69755fc9..d78a4d54 100644
--- a/src/Collapse/example/edge_collapse_conserve_persistence.cpp
+++ b/src/Collapse/example/edge_collapse_conserve_persistence.cpp
@@ -68,9 +68,9 @@ std::vector<Persistence_interval> get_persistence_intervals(Simplex_tree& st, in
auto persistent_pairs = pcoh.get_persistent_pairs();
std::sort(std::begin(persistent_pairs), std::end(persistent_pairs), cmp);
for (auto pair : persistent_pairs) {
- persistence_intervals.emplace_back(Persistence_interval(st.dimension(get<0>(pair)),
- st.filtration(get<0>(pair)),
- st.filtration(get<1>(pair)) ));
+ persistence_intervals.emplace_back(st.dimension(get<0>(pair)),
+ st.filtration(get<0>(pair)),
+ st.filtration(get<1>(pair)));
}
return persistence_intervals;
}
diff --git a/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h b/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h
index 09986d08..29850382 100644
--- a/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h
+++ b/src/Collapse/include/gudhi/Flag_complex_edge_collapser.h
@@ -265,7 +265,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_.emplace_back(vertex);
+ row_to_vertex_.push_back(vertex);
}
return result.first->second;
}
@@ -330,7 +330,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_.emplace_back(Filtered_edge(u, v, boost::get(Gudhi::edge_filtration_t(), one_skeleton_graph, edge)));
+ f_edge_vector_.emplace_back(u, v, boost::get(Gudhi::edge_filtration_t(), one_skeleton_graph, edge));
}
}
@@ -364,7 +364,7 @@ class Flag_complex_edge_collapser {
IEdge ie = insert_new_edge(u, v, endIdx);
iedge_to_index_map_.emplace(ie, endIdx);
- critical_edge_indicator_.emplace_back(false);
+ critical_edge_indicator_.push_back(false);
if (!edge_is_dominated(u, v)) {
critical_edge_indicator_[endIdx] = true;
diff --git a/src/Collapse/test/collapse_unit_test.cpp b/src/Collapse/test/collapse_unit_test.cpp
index 67f1a732..108f77e4 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](Vertex_handle u, Vertex_handle v, Filtration_value filtration) {
std::cout << "f[" << u << ", " << v << "] = " << filtration << std::endl;
- remaining_edges.emplace_back(Filtered_edge(u, v, filtration));
+ remaining_edges.emplace_back(u, v, filtration);
});
std::cout << "AFTER COLLAPSE - Total number of edges: " << remaining_edges.size() << std::endl;
BOOST_CHECK(remaining_edges.size() <= filtered_edges.size());
@@ -97,8 +97,8 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \|
// o---o
// 0 3
- edges.emplace_back(Filtered_edge(0, 2, 2.));
- edges.emplace_back(Filtered_edge(1, 3, 2.));
+ edges.emplace_back(0, 2, 2.);
+ edges.emplace_back(1, 3, 2.);
trace_and_check_collapse(edges, {{1, 3, 2.}});
// 1 2 4
@@ -108,9 +108,9 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \| |
// o---o---o
// 0 3 5
- edges.emplace_back(Filtered_edge(2, 4, 3.));
- edges.emplace_back(Filtered_edge(4, 5, 3.));
- edges.emplace_back(Filtered_edge(5, 3, 3.));
+ edges.emplace_back(2, 4, 3.);
+ edges.emplace_back(4, 5, 3.);
+ edges.emplace_back(5, 3, 3.);
trace_and_check_collapse(edges, {{1, 3, 2.}});
// 1 2 4
@@ -120,8 +120,8 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \|/ \|
// o---o---o
// 0 3 5
- edges.emplace_back(Filtered_edge(2, 5, 4.));
- edges.emplace_back(Filtered_edge(4, 3, 4.));
+ edges.emplace_back(2, 5, 4.);
+ edges.emplace_back(4, 3, 4.);
trace_and_check_collapse(edges, {{1, 3, 2.}, {4, 3, 4.}});
// 1 2 4
@@ -131,8 +131,8 @@ BOOST_AUTO_TEST_CASE(collapse) {
// |/ \|/ \|
// o---o---o
// 0 3 5
- edges.emplace_back(Filtered_edge(1, 5, 5.));
- edges.emplace_back(Filtered_edge(0, 4, 5.));
+ edges.emplace_back(1, 5, 5.);
+ edges.emplace_back(0, 4, 5.);
trace_and_check_collapse(edges, {{1, 3, 2.}, {4, 3, 4.}, {0, 4, 5.}});
}
@@ -179,7 +179,7 @@ BOOST_AUTO_TEST_CASE(collapse_from_proximity_graph) {
edge_collapser.process_edges(
[&remaining_edges](Vertex_handle u, Vertex_handle v, Filtration_value filtration) {
std::cout << "f[" << u << ", " << v << "] = " << filtration << std::endl;
- remaining_edges.emplace_back(Filtered_edge(u, v, filtration));
+ remaining_edges.emplace_back(u, v, filtration);
});
BOOST_CHECK(remaining_edges.size() == 5);
@@ -194,4 +194,4 @@ BOOST_AUTO_TEST_CASE(collapse_from_proximity_graph) {
}
BOOST_CHECK(filtration_is_edge_length_nb == 4);
BOOST_CHECK(filtration_is_diagonal_length_nb == 1);
-} \ No newline at end of file
+}