github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

ng_util: use small_color_map

Browse Source
This commit is contained in:
Justin Viiret 2017-06-29 11:33:03 +10:00 committed by Matthew Barr
parent f98ccedf27
commit 8d178d52ef
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/nfagraph/ng_util.cpp
View File

@ -39,6 +39,7 @@
#include "nfa/limex_limits.h" // for NFA_MAX_TOP_MASKS. #include "nfa/limex_limits.h" // for NFA_MAX_TOP_MASKS.
#include "parser/position.h" #include "parser/position.h"
#include "util/graph_range.h" #include "util/graph_range.h"
#include "util/graph_small_color_map.h"
#include "util/make_unique.h" #include "util/make_unique.h"
#include "util/order_check.h" #include "util/order_check.h"
#include "util/ue2string.h" #include "util/ue2string.h"
@ -52,7 +53,6 @@
#include <boost/range/adaptor/map.hpp> #include <boost/range/adaptor/map.hpp>
using namespace std; using namespace std;
using boost::default_color_type;
using boost::make_filtered_graph; using boost::make_filtered_graph;
using boost::make_assoc_property_map; using boost::make_assoc_property_map;
@ -226,15 +226,12 @@ bool isAcyclic(const NGHolder &g) {
/** True if the graph has a cycle reachable from the given source vertex. */ /** True if the graph has a cycle reachable from the given source vertex. */
bool hasReachableCycle(const NGHolder &g, NFAVertex src) { bool hasReachableCycle(const NGHolder &g, NFAVertex src) {
assert(hasCorrectlyNumberedVertices(g)); assert(hasCorrectlyNumberedVertices(g));
vector<default_color_type> colors(num_vertices(g));
try { try {
// Use depth_first_visit, rather than depth_first_search, so that we // Use depth_first_visit, rather than depth_first_search, so that we
// only search from src. // only search from src.
auto index_map = get(vertex_index, g);
boost::depth_first_visit(g, src, DetectCycles(g), boost::depth_first_visit(g, src, DetectCycles(g),
make_iterator_property_map(colors.begin(), make_small_color_map(g));
index_map));
} catch (const CycleFound &) { } catch (const CycleFound &) {
return true; return true;
} }
@ -353,24 +350,19 @@ vector<NFAVertex> getTopoOrdering(const NGHolder &g) {
// Use the same colour map for both DFS and topological_sort below: avoids // Use the same colour map for both DFS and topological_sort below: avoids
// having to reallocate it, etc. // having to reallocate it, etc.
const size_t num_verts = num_vertices(g); auto colors = make_small_color_map(g);
vector<default_color_type> colour(num_verts);
using EdgeSet = ue2::unordered_set<NFAEdge>; using EdgeSet = ue2::unordered_set<NFAEdge>;
EdgeSet backEdges; EdgeSet backEdges;
BackEdges<EdgeSet> be(backEdges); BackEdges<EdgeSet> be(backEdges);
auto index_map = get(vertex_index, g); depth_first_search(g, visitor(be).root_vertex(g.start).color_map(colors));
depth_first_search(g, visitor(be).root_vertex(g.start)
.color_map(make_iterator_property_map(
colour.begin(), index_map)));
auto acyclic_g = make_filtered_graph(g, make_bad_edge_filter(&backEdges)); auto acyclic_g = make_filtered_graph(g, make_bad_edge_filter(&backEdges));
vector<NFAVertex> ordering; vector<NFAVertex> ordering;
ordering.reserve(num_verts); ordering.reserve(num_vertices(g));
topological_sort(acyclic_g, back_inserter(ordering), topological_sort(acyclic_g, back_inserter(ordering), color_map(colors));
color_map(make_iterator_property_map(colour.begin(), index_map)));
reorderSpecials(g, ordering); reorderSpecials(g, ordering);
@ -379,7 +371,7 @@ vector<NFAVertex> getTopoOrdering(const NGHolder &g) {
static static
void mustBeSetBefore_int(NFAVertex u, const NGHolder &g, void mustBeSetBefore_int(NFAVertex u, const NGHolder &g,
vector<default_color_type> &vertexColor) { decltype(make_small_color_map(NGHolder())) &colors) {
set<NFAVertex> s; set<NFAVertex> s;
insert(&s, adjacent_vertices(u, g)); insert(&s, adjacent_vertices(u, g));
@ -396,10 +388,8 @@ void mustBeSetBefore_int(NFAVertex u, const NGHolder &g,
auto prefix = make_filtered_graph(g, make_bad_edge_filter(&dead)); auto prefix = make_filtered_graph(g, make_bad_edge_filter(&dead));
depth_first_visit( depth_first_visit(prefix, g.start, make_dfs_visitor(boost::null_visitor()),
prefix, g.start, make_dfs_visitor(boost::null_visitor()), colors);
make_iterator_property_map(vertexColor.begin(),
get(vertex_index, g)));
} }
bool mustBeSetBefore(NFAVertex u, NFAVertex v, const NGHolder &g, bool mustBeSetBefore(NFAVertex u, NFAVertex v, const NGHolder &g,
@ -412,14 +402,14 @@ bool mustBeSetBefore(NFAVertex u, NFAVertex v, const NGHolder &g,
return cache.cache[key]; return cache.cache[key];
} }
vector<default_color_type> vertexColor(num_vertices(g)); auto colors = make_small_color_map(g);
mustBeSetBefore_int(u, g, vertexColor); mustBeSetBefore_int(u, g, colors);
for (auto vi : vertices_range(g)) { for (auto vi : vertices_range(g)) {
auto key2 = make_pair(g[u].index, g[vi].index); auto key2 = make_pair(g[u].index, g[vi].index);
DEBUG_PRINTF("adding %zu %zu\n", key2.first, key2.second); DEBUG_PRINTF("adding %zu %zu\n", key2.first, key2.second);
assert(!contains(cache.cache, key2)); assert(!contains(cache.cache, key2));
bool value = vertexColor[g[vi].index] == boost::white_color; bool value = get(colors, vi) == small_color::white;
cache.cache[key2] = value; cache.cache[key2] = value;
assert(contains(cache.cache, key2)); assert(contains(cache.cache, key2));
} }