1.1 --- a/test/bipartite_matching_test.cc	Fri Feb 08 10:42:38 2008 +0000
     1.2 +++ b/test/bipartite_matching_test.cc	Fri Feb 08 11:04:37 2008 +0000
     1.3 @@ -38,22 +38,22 @@
     1.4  typedef SmartBpUGraph Graph;
     1.5  BPUGRAPH_TYPEDEFS(Graph);
     1.6  
     1.7 -const int N = 10;
     1.8 -const int M = 10;
     1.9 -const int E = 52;
    1.10 -const int C = 100;
    1.11 +const int NN = 10;
    1.12 +const int MM = 10;
    1.13 +const int EE = 52;
    1.14 +const int CC = 100;
    1.15  
    1.16 -const int sa[E] = { 6, 5, 6, 4, 1, 0, 9, 5, 2, 4, 4, 3, 5,
    1.17 +const int sa[EE] = { 6, 5, 6, 4, 1, 0, 9, 5, 2, 4, 4, 3, 5,
    1.18                      2, 3, 8, 3, 4, 9, 6, 9, 4, 3, 1, 5, 8,
    1.19                      4, 8, 9, 2, 2, 3, 0, 5, 2, 3, 6, 3, 8,
    1.20                      8, 4, 0, 9, 9, 6, 2, 1, 2, 7, 1, 9, 4};
    1.21  
    1.22 -const int ta[E] = { 2, 7, 4, 8, 6, 3, 4, 1, 7, 7, 0, 1, 6,
    1.23 +const int ta[EE] = { 2, 7, 4, 8, 6, 3, 4, 1, 7, 7, 0, 1, 6,
    1.24                      3, 2, 6, 8, 3, 5, 6, 3, 1, 8, 7, 2, 0,
    1.25                      6, 9, 6, 7, 8, 3, 3, 4, 5, 8, 6, 4, 1,
    1.26                      4, 3, 3, 8, 7, 7, 3, 7, 7, 3, 5, 1, 6};
    1.27  
    1.28 -const int wa[E] = { 3, 99, 85, 16, 79, 52, 83, 99, 62, 6, 42, 6, 95,
    1.29 +const int wa[EE] = { 3, 99, 85, 16, 79, 52, 83, 99, 62, 6, 42, 6, 95,
    1.30                      13, 34, 9, 5, 38, 39, 75, 99, 12, 73, 35, 93, 43,
    1.31                      54, 91, 45, 26, 77, 47, 11, 22, 50, 74, 37, 64, 91,
    1.32                      60, 6, 92, 29, 46, 34, 84, 67, 34, 45, 0, 39, 47};
    1.33 @@ -71,15 +71,15 @@
    1.34    int max_cardinality_max_weight;
    1.35    int min_cost_matching;
    1.36  
    1.37 -  for (int i = 0; i < N; ++i) {
    1.38 +  for (int i = 0; i < NN; ++i) {
    1.39      Node node = graph.addANode();
    1.40      aNodes.push_back(node);
    1.41    }
    1.42 -  for (int i = 0; i < M; ++i) {
    1.43 +  for (int i = 0; i < MM; ++i) {
    1.44      Node node = graph.addBNode();
    1.45      bNodes.push_back(node);
    1.46    }
    1.47 -  for (int i = 0; i < E; ++i) {
    1.48 +  for (int i = 0; i < EE; ++i) {
    1.49      Node aNode = aNodes[sa[i]];
    1.50      Node bNode = bNodes[ta[i]];
    1.51      UEdge uedge = graph.addEdge(aNode, bNode);
    1.52 @@ -348,7 +348,7 @@
    1.53    }
    1.54  
    1.55    Graph::UEdgeMap<int> cost(graph);
    1.56 -  cost = subMap(constMap<UEdge>(C), weight);
    1.57 +  cost = subMap(constMap<UEdge>(CC), weight);
    1.58    {
    1.59  
    1.60      MinCostMaxBipartiteMatching<Graph> bpmatch(graph, cost);
    1.61 @@ -363,7 +363,7 @@
    1.62      
    1.63      min_cost_matching = bpmatch.matchingCost();
    1.64      check(max_cardinality == bpmatch.matchingSize(), "WRONG SIZE");
    1.65 -    check(max_cardinality * C - max_cardinality_max_weight 
    1.66 +    check(max_cardinality * CC - max_cardinality_max_weight 
    1.67            == bpmatch.matchingCost(), "WRONG SIZE");
    1.68  
    1.69      for (UEdgeIt it(graph); it != INVALID; ++it) {
    1.70 @@ -386,7 +386,7 @@
    1.71  
    1.72      min_cost_matching = bpmatch.matchingCost();
    1.73      check(max_cardinality == bpmatch.matchingSize(), "WRONG SIZE");
    1.74 -    check(max_cardinality * C - max_cardinality_max_weight 
    1.75 +    check(max_cardinality * CC - max_cardinality_max_weight 
    1.76            == bpmatch.matchingCost(), "WRONG SIZE");
    1.77  
    1.78    }

     2.1 --- a/test/lp_test.cc	Fri Feb 08 10:42:38 2008 +0000
     2.2 +++ b/test/lp_test.cc	Fri Feb 08 11:04:37 2008 +0000
     2.3 @@ -22,7 +22,7 @@
     2.4  #include <lemon/tolerance.h>
     2.5  
     2.6  #ifdef HAVE_CONFIG_H
     2.7 -#include <config.h>
     2.8 +#include <lemon/config.h>
     2.9  #endif
    2.10  
    2.11  #ifdef HAVE_GLPK

     3.1 --- a/test/mip_test.cc	Fri Feb 08 10:42:38 2008 +0000
     3.2 +++ b/test/mip_test.cc	Fri Feb 08 11:04:37 2008 +0000
     3.3 @@ -20,7 +20,7 @@
     3.4  
     3.5  
     3.6  #ifdef HAVE_CONFIG_H
     3.7 -#include <config.h>
     3.8 +#include <lemon/config.h>
     3.9  #endif
    3.10  
    3.11  #ifdef HAVE_CPLEX