From 0828b90ffabf239dc9811f299427349d6d4f8bf4 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 7 Jun 2021 17:45:34 +0200 Subject: code review: The whole point of emplace/emplace_back is to remove std::make_pair or constructor call --- .../cell_complex_from_basic_circle_manifold.cpp | 2 +- .../include/gudhi/Cell_complex.h | 18 +++++++++--------- .../gudhi/IO/build_mesh_from_cell_complex.h | 22 +++++++++++----------- .../include/gudhi/IO/output_debug_traces_to_html.h | 2 +- .../include/gudhi/IO/output_meshes_to_medit.h | 6 +++--- .../include/gudhi/Manifold_tracing.h | 6 +++--- .../Permutahedral_representation_iterators.h | 4 ++-- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'src') diff --git a/src/Coxeter_triangulation/example/cell_complex_from_basic_circle_manifold.cpp b/src/Coxeter_triangulation/example/cell_complex_from_basic_circle_manifold.cpp index 0d32f916..fc2afce4 100644 --- a/src/Coxeter_triangulation/example/cell_complex_from_basic_circle_manifold.cpp +++ b/src/Coxeter_triangulation/example/cell_complex_from_basic_circle_manifold.cpp @@ -42,7 +42,7 @@ int main(int argc, char** argv) { std::clog << "Vertices:" << std::endl; for (const auto& cp_pair : cell_complex.cell_point_map()) { std::clog << index << " : (" << cp_pair.second(0) << ", " << cp_pair.second(1) << ")" << std::endl; - vi_map.emplace(std::make_pair(cp_pair.first, index++)); + vi_map.emplace(cp_pair.first, index++); } std::clog << "Edges:" << std::endl; diff --git a/src/Coxeter_triangulation/include/gudhi/Cell_complex.h b/src/Coxeter_triangulation/include/gudhi/Cell_complex.h index 60c83522..561fe4ca 100644 --- a/src/Coxeter_triangulation/include/gudhi/Cell_complex.h +++ b/src/Coxeter_triangulation/include/gudhi/Cell_complex.h @@ -73,15 +73,15 @@ class Cell_complex { #ifdef DEBUG_TRACES CC_detail_list& cc_detail_list = (is_boundary ? cc_boundary_detail_lists[cell_d] : cc_interior_detail_lists[cell_d]); - cc_detail_list.emplace_back(CC_detail_info(simplex)); + cc_detail_list.emplace_back(simplex); #endif Simplex_cell_map& simplex_cell_map = simplex_cell_maps[cell_d]; auto map_it = simplex_cell_map.find(simplex); if (map_it == simplex_cell_map.end()) { hasse_cells_.push_back(new Hasse_cell(is_boundary, cell_d)); Hasse_cell* new_cell = hasse_cells_.back(); - simplex_cell_map.emplace(std::make_pair(simplex, new_cell)); - cell_simplex_map_.emplace(std::make_pair(new_cell, simplex)); + simplex_cell_map.emplace(simplex, new_cell); + cell_simplex_map_.emplace(new_cell, simplex); #ifdef DEBUG_TRACES cc_detail_list.back().status_ = CC_detail_info::Result_type::inserted; #endif @@ -102,7 +102,7 @@ class Cell_complex { Hasse_cell* cell = sc_pair.second; for (Simplex_handle coface : simplex.coface_range(cod_d_ + cell_d)) { Hasse_cell* new_cell = insert_cell(coface, cell_d, false); - new_cell->get_boundary().emplace_back(std::make_pair(cell, 1)); + new_cell->get_boundary().emplace_back(cell, 1); } } @@ -113,14 +113,14 @@ class Cell_complex { if (cell_d != intr_d_) for (Simplex_handle coface : simplex.coface_range(cod_d_ + cell_d + 1)) { Hasse_cell* new_cell = insert_cell(coface, cell_d, true); - new_cell->get_boundary().emplace_back(std::make_pair(cell, 1)); + new_cell->get_boundary().emplace_back(cell, 1); } auto map_it = interior_simplex_cell_maps_[cell_d].find(simplex); if (map_it == interior_simplex_cell_maps_[cell_d].end()) std::cerr << "Cell_complex::expand_level error: A boundary cell does not have an interior counterpart.\n"; else { Hasse_cell* i_cell = map_it->second; - i_cell->get_boundary().emplace_back(std::make_pair(cell, 1)); + i_cell->get_boundary().emplace_back(cell, 1); } } } @@ -136,7 +136,7 @@ class Cell_complex { const Simplex_handle& simplex = os_pair.first; const Eigen::VectorXd& point = os_pair.second; Hasse_cell* new_cell = insert_cell(simplex, 0, false); - cell_point_map_.emplace(std::make_pair(new_cell, point)); + cell_point_map_.emplace(new_cell, point); } for (std::size_t cell_d = 1; cell_d < interior_simplex_cell_maps_.size() && !interior_simplex_cell_maps_[cell_d - 1].empty(); ++cell_d) { @@ -157,13 +157,13 @@ class Cell_complex { const Simplex_handle& simplex = os_pair.first; const Eigen::VectorXd& point = os_pair.second; Hasse_cell* new_cell = insert_cell(simplex, 0, true); - cell_point_map_.emplace(std::make_pair(new_cell, point)); + cell_point_map_.emplace(new_cell, point); } for (auto& os_pair : interior_simplex_map) { const Simplex_handle& simplex = os_pair.first; const Eigen::VectorXd& point = os_pair.second; Hasse_cell* new_cell = insert_cell(simplex, 0, false); - cell_point_map_.emplace(std::make_pair(new_cell, point)); + cell_point_map_.emplace(new_cell, point); } #ifdef DEBUG_TRACES for (const auto& sc_pair : interior_simplex_cell_maps_[0]) diff --git a/src/Coxeter_triangulation/include/gudhi/IO/build_mesh_from_cell_complex.h b/src/Coxeter_triangulation/include/gudhi/IO/build_mesh_from_cell_complex.h index ecb59bfc..9750f366 100644 --- a/src/Coxeter_triangulation/include/gudhi/IO/build_mesh_from_cell_complex.h +++ b/src/Coxeter_triangulation/include/gudhi/IO/build_mesh_from_cell_complex.h @@ -57,12 +57,12 @@ void populate_mesh(Mesh_medit& output, Simplex_cell_map& sc_map, Configuration c for (const auto& ei_pair : cell->get_boundary()) for (const auto& vi_pair : ei_pair.first->get_boundary()) vertex_indices.emplace(vi_map[vi_pair.first]); for (const std::size_t& v : vertex_indices) barycenter += output.vertex_points[v - 1]; - ci_map.emplace(std::make_pair(cell, index++)); + ci_map.emplace(cell, index++); output.vertex_points.emplace_back((1. / vertex_indices.size()) * barycenter); #ifdef DEBUG_TRACES std::string vlist = " (" + std::to_string(index - 1) + ")"; for (const std::size_t& v : vertex_indices) vlist += " " + std::to_string(v); - cell_vlist_map.emplace(std::make_pair(to_string(cell), vlist)); + cell_vlist_map.emplace(to_string(cell), vlist); #endif } @@ -71,11 +71,11 @@ void populate_mesh(Mesh_medit& output, Simplex_cell_map& sc_map, Configuration c Hasse_cell* edge_cell = sc_pair.second; Mesh_element_vertices edge; for (const auto& vi_pair : edge_cell->get_boundary()) edge.push_back(vi_map[vi_pair.first]); - output.edges.emplace_back(std::make_pair(edge, configuration.ref_edges)); + output.edges.emplace_back(edge, configuration.ref_edges); #ifdef DEBUG_TRACES std::string vlist; for (const std::size_t& v : edge) vlist += " " + std::to_string(v); - cell_vlist_map.emplace(std::make_pair(to_string(edge_cell), vlist)); + cell_vlist_map.emplace(to_string(edge_cell), vlist); #endif } @@ -84,7 +84,7 @@ void populate_mesh(Mesh_medit& output, Simplex_cell_map& sc_map, Configuration c for (const auto& ei_pair : sc_pair.second->get_boundary()) { Mesh_element_vertices triangle(1, ci_map[sc_pair.second]); for (const auto& vi_pair : ei_pair.first->get_boundary()) triangle.push_back(vi_map[vi_pair.first]); - output.triangles.emplace_back(std::make_pair(triangle, configuration.ref_triangles)); + output.triangles.emplace_back(triangle, configuration.ref_triangles); } } @@ -101,14 +101,14 @@ void populate_mesh(Mesh_medit& output, Simplex_cell_map& sc_map, Configuration c #ifdef DEBUG_TRACES std::string vlist = " (" + std::to_string(index) + ")"; for (const std::size_t& v : vertex_indices) vlist += " " + std::to_string(v); - cell_vlist_map.emplace(std::make_pair(to_string(cell), vlist)); + cell_vlist_map.emplace(to_string(cell), vlist); #endif for (const auto& ci_pair : cell->get_boundary()) for (const auto& ei_pair : ci_pair.first->get_boundary()) { Mesh_element_vertices tetrahedron = {index, ci_map[sc_pair.second]}; for (const auto& vi_pair : ei_pair.first->get_boundary()) tetrahedron.push_back(vi_map[vi_pair.first]); - output.tetrahedra.emplace_back(std::make_pair(tetrahedron, configuration.ref_tetrahedra)); + output.tetrahedra.emplace_back(tetrahedron, configuration.ref_tetrahedra); } index++; } @@ -134,9 +134,9 @@ Mesh_medit build_mesh_from_cell_complex(const Cell_complex& cell_complex, #ifdef DEBUG_TRACES std::string vlist; vlist += " " + std::to_string(index); - cell_vlist_map.emplace(std::make_pair(to_string(cp_pair.first), vlist)); + cell_vlist_map.emplace(to_string(cp_pair.first), vlist); #endif - vi_map.emplace(std::make_pair(cp_pair.first, index++)); + vi_map.emplace(cp_pair.first, index++); output.vertex_points.push_back(cp_pair.second); output.vertex_points.back().conservativeResize(amb_d); } @@ -148,7 +148,7 @@ Mesh_medit build_mesh_from_cell_complex(const Cell_complex& cell_complex, std::string simplex = "I" + to_string(sc_pair.first); std::string cell = to_string(sc_pair.second); std::string vlist = cell_vlist_map.at(cell).substr(1); - simplex_vlist_map.emplace(std::make_pair(simplex, vlist)); + simplex_vlist_map.emplace(simplex, vlist); } #endif populate_mesh(output, cell_complex.boundary_simplex_cell_maps(), b_configuration, amb_d, vi_map); @@ -158,7 +158,7 @@ Mesh_medit build_mesh_from_cell_complex(const Cell_complex& cell_complex, std::string simplex = "B" + to_string(sc_pair.first); std::string cell = to_string(sc_pair.second); std::string vlist = cell_vlist_map.at(cell).substr(1); - simplex_vlist_map.emplace(std::make_pair(simplex, vlist)); + simplex_vlist_map.emplace(simplex, vlist); } #endif return output; diff --git a/src/Coxeter_triangulation/include/gudhi/IO/output_debug_traces_to_html.h b/src/Coxeter_triangulation/include/gudhi/IO/output_debug_traces_to_html.h index 1d5ee4cd..a2995738 100644 --- a/src/Coxeter_triangulation/include/gudhi/IO/output_debug_traces_to_html.h +++ b/src/Coxeter_triangulation/include/gudhi/IO/output_debug_traces_to_html.h @@ -514,7 +514,7 @@ void write_visu(std::ofstream& ofs) { << "

Visualization details debug trace

\n"; // std::vector > vs_maps(cc_interior_summary_lists.size()); std::map vs_map; - for (const auto& sv_pair : simplex_vlist_map) vs_map.emplace(std::make_pair(sv_pair.second, sv_pair.first)); + for (const auto& sv_pair : simplex_vlist_map) vs_map.emplace(sv_pair.second, sv_pair.first); ofs << "
    \n"; for (const auto& vs_pair : vs_map) { std::string w_simplex = vs_pair.second.substr(1); diff --git a/src/Coxeter_triangulation/include/gudhi/IO/output_meshes_to_medit.h b/src/Coxeter_triangulation/include/gudhi/IO/output_meshes_to_medit.h index 0a87a310..f69d8b29 100644 --- a/src/Coxeter_triangulation/include/gudhi/IO/output_meshes_to_medit.h +++ b/src/Coxeter_triangulation/include/gudhi/IO/output_meshes_to_medit.h @@ -50,17 +50,17 @@ typename std::enable_if::type fill_meshes(Vertex_p for (const auto& e : mesh.edges) { std::vector edge; for (const auto& v_i : e.first) edge.push_back(v_i + index); - edges.emplace_back(std::make_pair(edge, e.second)); + edges.emplace_back(edge, e.second); } for (const auto& t : mesh.triangles) { std::vector triangle; for (const auto& v_i : t.first) triangle.push_back(v_i + index); - triangles.emplace_back(std::make_pair(triangle, t.second)); + triangles.emplace_back(triangle, t.second); } for (const auto& t : mesh.tetrahedra) { std::vector tetrahedron; for (const auto& v_i : t.first) tetrahedron.push_back(v_i + index); - tetrahedra.emplace_back(std::make_pair(tetrahedron, t.second)); + tetrahedra.emplace_back(tetrahedron, t.second); } for (const auto& b : mesh.triangles_scalar_range) triangles_scalar_range.push_back(b); for (const auto& b : mesh.tetrahedra_scalar_range) tetrahedra_scalar_range.push_back(b); diff --git a/src/Coxeter_triangulation/include/gudhi/Manifold_tracing.h b/src/Coxeter_triangulation/include/gudhi/Manifold_tracing.h index 1083e827..71de47e1 100644 --- a/src/Coxeter_triangulation/include/gudhi/Manifold_tracing.h +++ b/src/Coxeter_triangulation/include/gudhi/Manifold_tracing.h @@ -86,7 +86,7 @@ class Manifold_tracing { Simplex_handle full_simplex = triangulation.locate_point(p); for (Simplex_handle face : full_simplex.face_range(cod_d)) { Query_result qr = oracle.intersects(face, triangulation); - if (qr.success && out_simplex_map.emplace(std::make_pair(face, qr.intersection)).second) { + if (qr.success && out_simplex_map.emplace(face, qr.intersection).second) { #ifdef DEBUG_TRACES mt_seed_inserted_list.push_back(MT_inserted_info(qr, face, false)); #endif @@ -102,7 +102,7 @@ class Manifold_tracing { for (auto cof : s.coface_range(cod_d + 1)) { for (auto face : cof.face_range(cod_d)) { Query_result qr = oracle.intersects(face, triangulation); - if (qr.success && out_simplex_map.emplace(std::make_pair(face, qr.intersection)).second) queue.emplace(face); + if (qr.success && out_simplex_map.emplace(face, qr.intersection).second) queue.emplace(face); } } } @@ -148,7 +148,7 @@ class Manifold_tracing { #endif if (qr.success) { if (oracle.lies_in_domain(qr.intersection, triangulation)) { - if (interior_simplex_map.emplace(std::make_pair(face, qr.intersection)).second) queue.emplace(face); + if (interior_simplex_map.emplace(face, qr.intersection).second) queue.emplace(face); } else { for (Simplex_handle cof : face.coface_range(cod_d + 1)) { auto qrb = oracle.intersects_boundary(cof, triangulation); diff --git a/src/Coxeter_triangulation/include/gudhi/Permutahedral_representation/Permutahedral_representation_iterators.h b/src/Coxeter_triangulation/include/gudhi/Permutahedral_representation/Permutahedral_representation_iterators.h index 9263c67e..db145741 100644 --- a/src/Coxeter_triangulation/include/gudhi/Permutahedral_representation/Permutahedral_representation_iterators.h +++ b/src/Coxeter_triangulation/include/gudhi/Permutahedral_representation/Permutahedral_representation_iterators.h @@ -173,7 +173,7 @@ class Coface_iterator } o_its_.clear(); for (uint j = 0; j < k_ + 1; j++) - o_its_.emplace_back(Ordered_set_partition_iterator(simplex_.partition()[j].size(), (*i_it_)[j] + 1)); + o_its_.emplace_back(simplex_.partition()[j].size(), (*i_it_)[j] + 1); } else for (uint j = 0; j < i; j++) o_its_[j].reinitialize(); update_value(); @@ -225,7 +225,7 @@ class Coface_iterator return; } for (uint i = 0; i < k_ + 1; i++) - o_its_.emplace_back(Ordered_set_partition_iterator(simplex_.partition()[i].size(), (*i_it_)[i] + 1)); + o_its_.emplace_back(simplex_.partition()[i].size(), (*i_it_)[i] + 1); update_value(); } -- cgit v1.2.3