diff options
Diffstat (limited to 'src/analysis_tools.cpp')
-rw-r--r-- | src/analysis_tools.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/analysis_tools.cpp b/src/analysis_tools.cpp index 34e4ea0..778e713 100644 --- a/src/analysis_tools.cpp +++ b/src/analysis_tools.cpp @@ -10,16 +10,16 @@ bool trivial(boost::detail::edge_desc_impl<boost::undirected_tag,unsigned long>) return true; } -std::list<unsigned int> find_minimal_crack(const Graph& G, const network& n) { +std::list<unsigned> find_minimal_crack(const Graph& G, const network& n) { Graph Gtmp(n.G.vertices.size()); - std::list<unsigned int> removed_edges; + std::list<unsigned> removed_edges; class add_tree_edges : public boost::default_dfs_visitor { public: Graph& G; - std::list<unsigned int>& E; + std::list<unsigned>& E; - add_tree_edges(Graph& G, std::list<unsigned int>& E) : G(G), E(E) {} + add_tree_edges(Graph& G, std::list<unsigned>& E) : G(G), E(E) {} void tree_edge(boost::graph_traits<Graph>::edge_descriptor e, const Graph& g) { boost::add_edge(boost::source(e, g), boost::target(e, g), g[e], G); @@ -37,11 +37,11 @@ std::list<unsigned int> find_minimal_crack(const Graph& G, const network& n) { class find_cycle : public boost::default_dfs_visitor { public: - std::list<unsigned int>& E; - unsigned int end; + std::list<unsigned>& E; + unsigned end; struct done{}; - find_cycle(std::list<unsigned int>& E, unsigned int end) : E(E), end(end) {} + find_cycle(std::list<unsigned>& E, unsigned end) : E(E), end(end) {} void discover_vertex(boost::graph_traits<Graph>::vertex_descriptor v, const Graph& g) { if (v == end) { @@ -58,10 +58,10 @@ std::list<unsigned int> find_minimal_crack(const Graph& G, const network& n) { } }; - std::list<std::list<unsigned int>> cycles; + std::list<std::list<unsigned>> cycles; for (auto edge : removed_edges) { - std::list<unsigned int> cycle = {edge}; + std::list<unsigned> cycle = {edge}; find_cycle vis(cycle, n.G.dual_edges[edge].v[1]); std::vector<boost::default_color_type> new_color_map(boost::num_vertices(Gtmp)); try { @@ -85,8 +85,8 @@ std::list<unsigned int> find_minimal_crack(const Graph& G, const network& n) { for (auto it1 = bool_cycles.begin(); it1 != std::prev(bool_cycles.end()); it1++) { for (auto it2 = std::next(it1); it2 != bool_cycles.end(); it2++) { std::valarray<uint8_t> new_bool_cycle = (*it1) ^ (*it2); - std::list<unsigned int> new_cycle; - unsigned int pos = 0; + std::list<unsigned> new_cycle; + unsigned pos = 0; for (uint8_t included : new_bool_cycle) { if (included) { new_cycle.push_back(pos); @@ -99,7 +99,7 @@ std::list<unsigned int> find_minimal_crack(const Graph& G, const network& n) { // find the cycle representing the crack by counting boundary crossings for (auto cycle : cycles) { - std::array<unsigned int, 2> crossing_count{0,0}; + std::array<unsigned, 2> crossing_count{0,0}; for (auto edge : cycle) { if (n.G.dual_edges[edge].crossings[0]) { |