[Lemon-commits] alpar: r3453 - lemon/trunk/test

[Lemon SVN]

Author: alpar
Date: Fri Feb  8 12:04:37 2008
New Revision: 3453

Modified:
   lemon/trunk/test/bipartite_matching_test.cc
   lemon/trunk/test/lp_test.cc
   lemon/trunk/test/mip_test.cc

Log:
Hopefully fix all compilation errors.


Modified: lemon/trunk/test/bipartite_matching_test.cc
==============================================================================
--- lemon/trunk/test/bipartite_matching_test.cc	(original)
+++ lemon/trunk/test/bipartite_matching_test.cc	Fri Feb  8 12:04:37 2008
@@ -38,22 +38,22 @@
 typedef SmartBpUGraph Graph;
 BPUGRAPH_TYPEDEFS(Graph);
 
-const int N = 10;
-const int M = 10;
-const int E = 52;
-const int C = 100;
+const int NN = 10;
+const int MM = 10;
+const int EE = 52;
+const int CC = 100;
 
-const int sa[E] = { 6, 5, 6, 4, 1, 0, 9, 5, 2, 4, 4, 3, 5,
+const int sa[EE] = { 6, 5, 6, 4, 1, 0, 9, 5, 2, 4, 4, 3, 5,
                     2, 3, 8, 3, 4, 9, 6, 9, 4, 3, 1, 5, 8,
                     4, 8, 9, 2, 2, 3, 0, 5, 2, 3, 6, 3, 8,
                     8, 4, 0, 9, 9, 6, 2, 1, 2, 7, 1, 9, 4};
 
-const int ta[E] = { 2, 7, 4, 8, 6, 3, 4, 1, 7, 7, 0, 1, 6,
+const int ta[EE] = { 2, 7, 4, 8, 6, 3, 4, 1, 7, 7, 0, 1, 6,
                     3, 2, 6, 8, 3, 5, 6, 3, 1, 8, 7, 2, 0,
                     6, 9, 6, 7, 8, 3, 3, 4, 5, 8, 6, 4, 1,
                     4, 3, 3, 8, 7, 7, 3, 7, 7, 3, 5, 1, 6};
 
-const int wa[E] = { 3, 99, 85, 16, 79, 52, 83, 99, 62, 6, 42, 6, 95,
+const int wa[EE] = { 3, 99, 85, 16, 79, 52, 83, 99, 62, 6, 42, 6, 95,
                     13, 34, 9, 5, 38, 39, 75, 99, 12, 73, 35, 93, 43,
                     54, 91, 45, 26, 77, 47, 11, 22, 50, 74, 37, 64, 91,
                     60, 6, 92, 29, 46, 34, 84, 67, 34, 45, 0, 39, 47};
@@ -71,15 +71,15 @@
   int max_cardinality_max_weight;
   int min_cost_matching;
 
-  for (int i = 0; i < N; ++i) {
+  for (int i = 0; i < NN; ++i) {
     Node node = graph.addANode();
     aNodes.push_back(node);
   }
-  for (int i = 0; i < M; ++i) {
+  for (int i = 0; i < MM; ++i) {
     Node node = graph.addBNode();
     bNodes.push_back(node);
   }
-  for (int i = 0; i < E; ++i) {
+  for (int i = 0; i < EE; ++i) {
     Node aNode = aNodes[sa[i]];
     Node bNode = bNodes[ta[i]];
     UEdge uedge = graph.addEdge(aNode, bNode);
@@ -348,7 +348,7 @@
   }
 
   Graph::UEdgeMap<int> cost(graph);
-  cost = subMap(constMap<UEdge>(C), weight);
+  cost = subMap(constMap<UEdge>(CC), weight);
   {
 
     MinCostMaxBipartiteMatching<Graph> bpmatch(graph, cost);
@@ -363,7 +363,7 @@
     
     min_cost_matching = bpmatch.matchingCost();
     check(max_cardinality == bpmatch.matchingSize(), "WRONG SIZE");
-    check(max_cardinality * C - max_cardinality_max_weight 
+    check(max_cardinality * CC - max_cardinality_max_weight 
           == bpmatch.matchingCost(), "WRONG SIZE");
 
     for (UEdgeIt it(graph); it != INVALID; ++it) {
@@ -386,7 +386,7 @@
 
     min_cost_matching = bpmatch.matchingCost();
     check(max_cardinality == bpmatch.matchingSize(), "WRONG SIZE");
-    check(max_cardinality * C - max_cardinality_max_weight 
+    check(max_cardinality * CC - max_cardinality_max_weight 
           == bpmatch.matchingCost(), "WRONG SIZE");
 
   }

Modified: lemon/trunk/test/lp_test.cc
==============================================================================
--- lemon/trunk/test/lp_test.cc	(original)
+++ lemon/trunk/test/lp_test.cc	Fri Feb  8 12:04:37 2008
@@ -22,7 +22,7 @@
 #include <lemon/tolerance.h>
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <lemon/config.h>
 #endif
 
 #ifdef HAVE_GLPK

Modified: lemon/trunk/test/mip_test.cc
==============================================================================
--- lemon/trunk/test/mip_test.cc	(original)
+++ lemon/trunk/test/mip_test.cc	Fri Feb  8 12:04:37 2008
@@ -20,7 +20,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <lemon/config.h>
 #endif
 
 #ifdef HAVE_CPLEX