Changeset 607:9ad8d2122b50 in lemon-main for test

Timestamp:

04/03/09 13:46:16 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

Separate types for flow and cost values in NetworkSimplex? (#234)

File:

• test/min_cost_flow_test.cc (modified) (4 diffs)

test/min_cost_flow_test.cc

@@ -78 +78 @@
 
 // Check the interface of an MCF algorithm
-template <typename GR, typename Value>
+template <typename GR, typename Flow, typename Cost>
 class McfClassConcept
 {
@@ -117 +117 @@
     typedef typename GR::Node Node;
     typedef typename GR::Arc Arc;
-    typedef concepts::ReadMap<Node, Value> NM;
-    typedef concepts::ReadMap<Arc, Value> AM;
+    typedef concepts::ReadMap<Node, Flow> NM;
+    typedef concepts::ReadMap<Arc, Flow> FAM;
+    typedef concepts::ReadMap<Arc, Cost> CAM;
 
     const GR &g;
-    const AM &lower;
-    const AM &upper;
-    const AM &cost;
+    const FAM &lower;
+    const FAM &upper;
+    const CAM &cost;
     const NM &sup;
     const Node &n;
     const Arc &a;
-    const Value &k;
-    Value v;
+    const Flow &k;
+    Flow v;
     bool b;
 
@@ -207 +208 @@
   // Check the interfaces
   {
-    typedef int Value;
+    typedef int Flow;
+    typedef int Cost;
     // TODO: This typedef should be enabled if the standard maps are
     // reference maps in the graph concepts (See #190).
@@ -214 +216 @@
     typedef ListDigraph GR;
 /**/
-    checkConcept< McfClassConcept<GR, Value>,
-                  NetworkSimplex<GR, Value> >();
+    checkConcept< McfClassConcept<GR, Flow, Cost>,
+                  NetworkSimplex<GR, Flow, Cost> >();
   }