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_width: use small_color_map

Browse Source
This commit is contained in:
Justin Viiret 2017-06-29 10:57:17 +10:00 committed by Matthew Barr
parent 03c1af1173
commit 1392be048a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nfagraph/ng_width.cpp
View File

@ -37,6 +37,7 @@
#include "ue2common.h" #include "ue2common.h"
#include "util/depth.h" #include "util/depth.h"
#include "util/graph.h" #include "util/graph.h"
#include "util/graph_small_color_map.h"
#include <deque> #include <deque>
#include <vector> #include <vector>
@ -143,7 +144,7 @@ depth findMaxWidth(const NGHolder &h, const SpecialEdgeFilter &filter,
assert(hasCorrectlyNumberedVertices(h)); assert(hasCorrectlyNumberedVertices(h));
const size_t num = num_vertices(h); const size_t num = num_vertices(h);
vector<int> distance(num); vector<int> distance(num);
vector<boost::default_color_type> colors(num); auto colors = make_small_color_map(h);
auto index_map = get(&NFAGraphVertexProps::index, g); auto index_map = get(&NFAGraphVertexProps::index, g);
@ -151,15 +152,15 @@ depth findMaxWidth(const NGHolder &h, const SpecialEdgeFilter &filter,
dag_shortest_paths(g, src, dag_shortest_paths(g, src,
distance_map(make_iterator_property_map(distance.begin(), index_map)) distance_map(make_iterator_property_map(distance.begin(), index_map))
.weight_map(boost::make_constant_property<NFAEdge>(-1)) .weight_map(boost::make_constant_property<NFAEdge>(-1))
.color_map(make_iterator_property_map(colors.begin(), index_map))); .color_map(colors));
depth acceptDepth, acceptEodDepth; depth acceptDepth, acceptEodDepth;
if (colors.at(NODE_ACCEPT) == boost::white_color) { if (get(colors, h.accept) == small_color::white) {
acceptDepth = depth::unreachable(); acceptDepth = depth::unreachable();
} else { } else {
acceptDepth = depth(-1 * distance.at(NODE_ACCEPT)); acceptDepth = depth(-1 * distance.at(NODE_ACCEPT));
} }
if (colors.at(NODE_ACCEPT_EOD) == boost::white_color) { if (get(colors, h.acceptEod) == small_color::white) {
acceptEodDepth = depth::unreachable(); acceptEodDepth = depth::unreachable();
} else { } else {
acceptEodDepth = depth(-1 * distance.at(NODE_ACCEPT_EOD)); acceptEodDepth = depth(-1 * distance.at(NODE_ACCEPT_EOD));