More fixes from issues found by rabbit

Author: cvvergara

NEWS.md

@@ -24,7 +24,7 @@ To see all issues & pull requests closed by this release see the
 * [#3086](https://github.com/pgRouting/pgrouting/issues/3086): MaxFlow: create and use a process and driver
 * [#3089](https://github.com/pgRouting/pgrouting/issues/3089): edgeDisjoint and bellmanFord use shortestPath driver and
   process
-* [#3100](https://github.com/pgRouting/pgrouting/issues/3100): Coloring: create an use a process & driver
+* [#3100](https://github.com/pgRouting/pgrouting/issues/3100): Coloring: create and use a process & driver
 
 **Bug Fixes**
 

doc/src/release_notes.rst

@@ -49,7 +49,7 @@ To see all issues & pull requests closed by this release see the
 * :issue:`3086`: MaxFlow: create and use a process and driver
 * :issue:`3089`: edgeDisjoint and bellmanFord use shortestPath driver and
   process
-* :issue:`3100`: Coloring: create an use a process & driver
+* :issue:`3100`: Coloring: create and use a process & driver
 
 .. rubric:: Bug Fixes
 

include/coloring/edgeColoring.hpp

@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 namespace pgrouting {
 namespace functions {
 
-std::vector<II_t_rt> edgeColoring(pgrouting::UndirectedGraph);
+std::vector<II_t_rt> edgeColoring(const pgrouting::UndirectedGraph&);
 
 
 }  // namespace functions

pgtap/coloring/edgeColoring/edge_cases.pg

@@ -113,7 +113,8 @@ FROM (VALUES
   (1, 3, 6, 20, 15),
   (2, 3, 8, 10, -10),
   (3, 6, 8, -1, 12))
-AS t(id, source, target, cost, reverse_cost);
+AS t(id, source, target, cost, reverse_cost)
+ORDER BY id ASC;
 
 RETURN QUERY
 SELECT CASE WHEN min_lib_version('4.1.0') THEN
@@ -256,7 +257,10 @@ FROM (VALUES
 AS t(id, source, target, cost, reverse_cost);
 
 RETURN QUERY
-SELECT is((SELECT count(DISTINCT color)::INTEGER FROM pgr_edgeColoring('q15')), 1, 'q15: One color is used');
+SELECT ok(
+  (SELECT count(*) = 2 AND count(DISTINCT color) = 1 FROM pgr_edgeColoring('q15')),
+  'q15: Two rows are returned and one color is used'
+);
 
 END;
 $BODY$

src/coloring/bipartite.cpp

@@ -43,7 +43,7 @@ std::vector<II_t_rt> get_bipartition(const pgrouting::UndirectedGraph &graph) {
     using V_i = pgrouting::UndirectedGraph::V_i;
 
     std::vector<II_t_rt> results;
-    std::vector<boost::default_color_type> partition(graph.num_vertices());
+    std::vector<boost::default_color_type> partition(boost::num_vertices(graph.graph));
     auto partition_map =
         make_iterator_property_map(partition.begin(), boost::get(boost::vertex_index, graph.graph));
 

src/coloring/coloring_driver.cpp

@@ -60,6 +60,8 @@ void do_coloring(
         std::ostringstream &notice,
         std::ostringstream &err) {
     std::string hint = "";
+    return_tuples = nullptr;
+    return_count = 0;
 
     try {
         if (edges_sql.empty()) {

src/coloring/edgeColoring.cpp

@@ -46,7 +46,7 @@ namespace pgrouting {
 namespace functions {
 
 std::vector<II_t_rt>
-edgeColoring(const pgrouting::UndirectedGraph g) {
+edgeColoring(const pgrouting::UndirectedGraph &g) {
     std::vector<II_t_rt> results(boost::num_edges(g.graph));
     using B_G = pgrouting::UndirectedGraph::B_G;
     using E  = pgrouting::UndirectedGraph::E;