ng_literal_analysis: use small_color_map

diff --git a/src/nfagraph/ng_literal_analysis.cpp b/src/nfagraph/ng_literal_analysis.cpp
index 19660580c86a0f90f9f7c086720c4ffd5c3a0159..87c4e79e9e3653d0c88fd16ba74ca7126a3bc159 100644 (file)
--- a/src/nfagraph/ng_literal_analysis.cpp
+++ b/src/nfagraph/ng_literal_analysis.cpp
@@ -40,6 +40,7 @@
 #include "util/depth.h"
 #include "util/graph.h"
 #include "util/graph_range.h"
+#include "util/graph_small_color_map.h"
 #include "util/ue2_graph.h"
 #include "util/ue2string.h"
 
@@ -462,17 +463,13 @@ next_literal:
 
 #ifdef DEBUG
 static UNUSED
-const char *describeColor(boost::default_color_type c) {
+const char *describeColor(small_color c) {
     switch (c) {
-    case boost::white_color:
+    case small_color::white:
         return "white";
-    case boost::gray_color:
+    case small_color::gray:
         return "gray";
-    case boost::green_color:
-        return "green";
-    case boost::red_color:
-        return "red";
-    case boost::black_color:
+    case small_color::black:
         return "black";
     default:
         return "unknown";
@@ -527,7 +524,7 @@ void findMinCut(LitGraph &lg, vector<LitEdge> &cutset) {
     const auto v_index_map = get(&LitGraphVertexProps::index, lg);
     const auto e_index_map = get(&LitGraphEdgeProps::index, 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<LitEdge> predecessors(num_verts);
     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(rev_edges.begin(), e_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),
             v_index_map, lg.root, lg.sink);
     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)) {
         const LitVertex u = source(e, lg), v = target(e, lg);
-        const auto ucolor = colors[lg[u].index];
-        const auto vcolor = colors[lg[v].index];
+        const auto ucolor = get(colors, u);
+        const auto vcolor = get(colors, v);
 
         DEBUG_PRINTF("edge %zu:%s -> %zu:%s score %llu\n", lg[u].index,
                      describeColor(ucolor), lg[v].index, describeColor(vcolor),
                      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);
             white_cut.push_back(e);
             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);
             black_cut.push_back(e);
             black_flow += lg[e].score;