Changeset 611:85cb3aa71cce in lemon-main for test

Timestamp:

04/21/09 16:18:54 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

612:0c8e5c688440, 613:b1811c363299, 619:ec817dfc2cb7

Parents:

600:0ba8dfce7259 (diff), 610:dacc2cee2b4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge and fix

Location:

test

Files:

• CMakeLists.txt (modified) (1 diff)
• CMakeLists.txt (modified) (4 diffs)
• Makefile.am (modified) (2 diffs)
• Makefile.am (modified) (5 diffs)
• circulation_test.cc (modified) (3 diffs)
• circulation_test.cc (modified) (2 diffs)

test/CMakeLists.txt

@@ -32 +32 @@
   matching_test
   min_cost_arborescence_test
+  min_cost_flow_test
   path_test
   preflow_test

test/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+  ${PROJECT_BINARY_DIR}
 )
 
@@ -8 +8 @@
 ENDIF(HAVE_GLPK)
 
-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
+LINK_DIRECTORIES(${PROJECT_BINARY_DIR}/lemon)
 
 SET(TESTS
@@ -22 +22 @@
   error_test
   euler_test
+  gomory_hu_test
   graph_copy_test
   graph_test
@@ -29 +30 @@
   kruskal_test
   maps_test
-  max_matching_test
+  matching_test
   min_cost_arborescence_test
   min_cost_flow_test

test/Makefile.am

@@ -28 +28 @@
         test/matching_test \
         test/min_cost_arborescence_test \
+        test/min_cost_flow_test \
         test/path_test \
         test/preflow_test \
@@ -73 +74 @@
 test_matching_test_SOURCES = test/matching_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
+test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc
 test_path_test_SOURCES = test/path_test.cc
 test_preflow_test_SOURCES = test/preflow_test.cc

test/Makefile.am

@@ -18 +18 @@
         test/error_test \
         test/euler_test \
+        test/gomory_hu_test \
         test/graph_copy_test \
         test/graph_test \
@@ -25 +26 @@
         test/kruskal_test \
         test/maps_test \
-        test/max_matching_test \
+        test/matching_test \
         test/min_cost_arborescence_test \
         test/min_cost_flow_test \
@@ -37 +38 @@
         test/time_measure_test \
         test/unionfind_test
+
+test_test_tools_pass_DEPENDENCIES = demo
 
 if HAVE_LP
@@ -59 +62 @@
 test_error_test_SOURCES = test/error_test.cc
 test_euler_test_SOURCES = test/euler_test.cc
+test_gomory_hu_test_SOURCES = test/gomory_hu_test.cc
 test_graph_copy_test_SOURCES = test/graph_copy_test.cc
 test_graph_test_SOURCES = test/graph_test.cc
@@ -68 +72 @@
 test_maps_test_SOURCES = test/maps_test.cc
 test_mip_test_SOURCES = test/mip_test.cc
-test_max_matching_test_SOURCES = test/max_matching_test.cc
+test_matching_test_SOURCES = test/matching_test.cc
 test_min_cost_arborescence_test_SOURCES = test/min_cost_arborescence_test.cc
 test_min_cost_flow_test_SOURCES = test/min_cost_flow_test.cc

test/circulation_test.cc

@@ -58 +58 @@
   typedef Digraph::Arc Arc;
   typedef concepts::ReadMap<Arc,VType> CapMap;
-  typedef concepts::ReadMap<Node,VType> DeltaMap;
+  typedef concepts::ReadMap<Node,VType> SupplyMap;
   typedef concepts::ReadWriteMap<Arc,VType> FlowMap;
   typedef concepts::WriteMap<Node,bool> BarrierMap;
@@ -69 +69 @@
   Arc a;
   CapMap lcap, ucap;
-  DeltaMap delta;
+  SupplyMap supply;
   FlowMap flow;
   BarrierMap bar;
@@ -75 +75 @@
   bool b;
 
-  typedef Circulation<Digraph, CapMap, CapMap, DeltaMap>
+  typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
             ::SetFlowMap<FlowMap>
             ::SetElevator<Elev>
             ::SetStandardElevator<LinkedElev>
             ::Create CirculationType;
-  CirculationType circ_test(g, lcap, ucap, delta);
+  CirculationType circ_test(g, lcap, ucap, supply);
   const CirculationType& const_circ_test = circ_test;
    
   circ_test
-    .lowerCapMap(lcap)
-    .upperCapMap(ucap)
-    .deltaMap(delta)
+    .lowerMap(lcap)
+    .upperMap(ucap)
+    .supplyMap(supply)
     .flowMap(flow);
 

test/circulation_test.cc

@@ -72 +72 @@
   FlowMap flow;
   BarrierMap bar;
+  VType v;
+  bool b;
 
-  Circulation<Digraph, CapMap, CapMap, SupplyMap>
-    ::SetFlowMap<FlowMap>
-    ::SetElevator<Elev>
-    ::SetStandardElevator<LinkedElev>
-    ::Create circ_test(g,lcap,ucap,supply);
-
-  circ_test.lowerMap(lcap);
-  circ_test.upperMap(ucap);
-  circ_test.supplyMap(supply);
-  flow = circ_test.flowMap();
-  circ_test.flowMap(flow);
+  typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>
+            ::SetFlowMap<FlowMap>
+            ::SetElevator<Elev>
+            ::SetStandardElevator<LinkedElev>
+            ::Create CirculationType;
+  CirculationType circ_test(g, lcap, ucap, supply);
+  const CirculationType& const_circ_test = circ_test;
+   
+  circ_test
+    .lowerMap(lcap)
+    .upperMap(ucap)
+    .supplyMap(supply)
+    .flowMap(flow);
 
   circ_test.init();
@@ -90 +94 @@
   circ_test.run();
 
-  circ_test.barrier(n);
-  circ_test.barrierMap(bar);
-  circ_test.flow(a);
+  v = const_circ_test.flow(a);
+  const FlowMap& fm = const_circ_test.flowMap();
+  b = const_circ_test.barrier(n);
+  const_circ_test.barrierMap(bar);
+  
+  ignore_unused_variable_warning(fm);
 }