summaryrefslogtreecommitdiff
path: root/src/Coxeter_triangulation/include/gudhi/IO
diff options
context:
space:
mode:
authorROUVREAU Vincent <vincent.rouvreau@inria.fr>2021-06-07 17:45:34 +0200
committerROUVREAU Vincent <vincent.rouvreau@inria.fr>2021-06-07 17:45:34 +0200
commit0828b90ffabf239dc9811f299427349d6d4f8bf4 (patch)
tree6135364b811501141b911f042e517892750c5eeb /src/Coxeter_triangulation/include/gudhi/IO
parent44b7b7ceca93ee6f5ce5ec2831f107e4196a0350 (diff)
code review: The whole point of emplace/emplace_back is to remove std::make_pair or constructor call
Diffstat (limited to 'src/Coxeter_triangulation/include/gudhi/IO')
-rw-r--r--src/Coxeter_triangulation/include/gudhi/IO/build_mesh_from_cell_complex.h22
-rw-r--r--src/Coxeter_triangulation/include/gudhi/IO/output_debug_traces_to_html.h2
-rw-r--r--src/Coxeter_triangulation/include/gudhi/IO/output_meshes_to_medit.h6
3 files changed, 15 insertions, 15 deletions
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) {
<< " <h2> Visualization details debug trace </h2>\n";
// std::vector<std::map<std::string, std::string> > vs_maps(cc_interior_summary_lists.size());
std::map<std::string, std::string> 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 << " <ul>\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<I != sizeof...(Meshes), void>::type fill_meshes(Vertex_p
for (const auto& e : mesh.edges) {
std::vector<std::size_t> 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<std::size_t> 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<std::size_t> 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);