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

Browse Source
This commit is contained in:
Justin Viiret 2017-06-29 11:14:46 +10:00 committed by Matthew Barr
parent 32270725c6
commit b97fa8c808
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/nfagraph/ng_literal_analysis.cpp
View File

@ -40,6 +40,7 @@
#include "util/depth.h" #include "util/depth.h"
#include "util/graph.h" #include "util/graph.h"
#include "util/graph_range.h" #include "util/graph_range.h"
#include "util/graph_small_color_map.h"
#include "util/ue2_graph.h" #include "util/ue2_graph.h"
#include "util/ue2string.h" #include "util/ue2string.h"
@ -462,17 +463,13 @@ next_literal:
#ifdef DEBUG #ifdef DEBUG
static UNUSED static UNUSED
const char *describeColor(boost::default_color_type c) { const char *describeColor(small_color c) {
switch (c) { switch (c) {
case boost::white_color: case small_color::white:
return "white"; return "white";
case boost::gray_color: case small_color::gray:
return "gray"; return "gray";
case boost::green_color: case small_color::black:
return "green";
case boost::red_color:
return "red";
case boost::black_color:
return "black"; return "black";
default: default:
return "unknown"; return "unknown";
@ -527,7 +524,7 @@ void findMinCut(LitGraph &lg, vector<LitEdge> &cutset) {
const auto v_index_map = get(&LitGraphVertexProps::index, lg); const auto v_index_map = get(&LitGraphVertexProps::index, lg);
const auto e_index_map = get(&LitGraphEdgeProps::index, lg); const auto e_index_map = get(&LitGraphEdgeProps::index, lg);
const size_t num_verts = num_vertices(lg); const size_t num_verts = num_vertices(lg);
vector<boost::default_color_type> colors(num_verts); auto colors = make_small_color_map(lg);
vector<s32> distances(num_verts); vector<s32> distances(num_verts);
vector<LitEdge> predecessors(num_verts); vector<LitEdge> predecessors(num_verts);
vector<u64a> residuals(num_edges(lg)); vector<u64a> residuals(num_edges(lg));
@ -537,7 +534,7 @@ void findMinCut(LitGraph &lg, vector<LitEdge> &cutset) {
make_iterator_property_map(residuals.begin(), e_index_map), make_iterator_property_map(residuals.begin(), e_index_map),
make_iterator_property_map(rev_edges.begin(), e_index_map), make_iterator_property_map(rev_edges.begin(), e_index_map),
make_iterator_property_map(predecessors.begin(), v_index_map), make_iterator_property_map(predecessors.begin(), v_index_map),
make_iterator_property_map(colors.begin(), v_index_map), colors,
make_iterator_property_map(distances.begin(), v_index_map), make_iterator_property_map(distances.begin(), v_index_map),
v_index_map, lg.root, lg.sink); v_index_map, lg.root, lg.sink);
DEBUG_PRINTF("done, flow = %llu\n", flow); DEBUG_PRINTF("done, flow = %llu\n", flow);
@ -552,19 +549,19 @@ void findMinCut(LitGraph &lg, vector<LitEdge> &cutset) {
for (const auto &e : edges_range(lg)) { for (const auto &e : edges_range(lg)) {
const LitVertex u = source(e, lg), v = target(e, lg); const LitVertex u = source(e, lg), v = target(e, lg);
const auto ucolor = colors[lg[u].index]; const auto ucolor = get(colors, u);
const auto vcolor = colors[lg[v].index]; const auto vcolor = get(colors, v);
DEBUG_PRINTF("edge %zu:%s -> %zu:%s score %llu\n", lg[u].index, DEBUG_PRINTF("edge %zu:%s -> %zu:%s score %llu\n", lg[u].index,
describeColor(ucolor), lg[v].index, describeColor(vcolor), describeColor(ucolor), lg[v].index, describeColor(vcolor),
lg[e].score); lg[e].score);
if (ucolor != boost::white_color && vcolor == boost::white_color) { if (ucolor != small_color::white && vcolor == small_color::white) {
assert(v != lg.sink); assert(v != lg.sink);
white_cut.push_back(e); white_cut.push_back(e);
white_flow += lg[e].score; white_flow += lg[e].score;
} }
if (ucolor == boost::black_color && vcolor != boost::black_color) { if (ucolor == small_color::black && vcolor != small_color::black) {
assert(v != lg.sink); assert(v != lg.sink);
black_cut.push_back(e); black_cut.push_back(e);
black_flow += lg[e].score; black_flow += lg[e].score;