# HG changeset patch # User alpar # Date 1202468677 0 # Node ID f5c6e63f51d18347afec1119e565b717b55ff6b3 # Parent c62964ff0d53bb151d20e37d3cae4fe77d62f78b Hopefully fix all compilation errors. diff -r c62964ff0d53 -r f5c6e63f51d1 test/bipartite_matching_test.cc --- a/test/bipartite_matching_test.cc Fri Feb 08 10:42:38 2008 +0000 +++ b/test/bipartite_matching_test.cc Fri Feb 08 11:04:37 2008 +0000 @@ -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 cost(graph); - cost = subMap(constMap(C), weight); + cost = subMap(constMap(CC), weight); { MinCostMaxBipartiteMatching 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"); } diff -r c62964ff0d53 -r f5c6e63f51d1 test/lp_test.cc --- a/test/lp_test.cc Fri Feb 08 10:42:38 2008 +0000 +++ b/test/lp_test.cc Fri Feb 08 11:04:37 2008 +0000 @@ -22,7 +22,7 @@ #include #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef HAVE_GLPK diff -r c62964ff0d53 -r f5c6e63f51d1 test/mip_test.cc --- a/test/mip_test.cc Fri Feb 08 10:42:38 2008 +0000 +++ b/test/mip_test.cc Fri Feb 08 11:04:37 2008 +0000 @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef HAVE_CPLEX