1.1 --- a/test/min_mean_cycle_test.cc Wed Mar 17 12:35:52 2010 +0100
1.2 +++ b/test/min_mean_cycle_test.cc Sat Mar 06 14:35:12 2010 +0000
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2009
1.8 + * Copyright (C) 2003-2010
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -61,7 +61,7 @@
1.13 "6 7 1 1 1 1 0 0 0 0\n"
1.14 "7 7 4 4 4 -1 0 0 0 1\n";
1.15
1.16 -
1.17 +
1.18 // Check the interface of an MMC algorithm
1.19 template <typename GR, typename Cost>
1.20 struct MmcClassConcept
1.21 @@ -77,10 +77,10 @@
1.22 ::Create MmcAlg;
1.23 MmcAlg mmc(me.g, me.cost);
1.24 const MmcAlg& const_mmc = mmc;
1.25 -
1.26 +
1.27 typename MmcAlg::Tolerance tol = const_mmc.tolerance();
1.28 mmc.tolerance(tol);
1.29 -
1.30 +
1.31 b = mmc.cycle(p).run();
1.32 b = mmc.findCycleMean();
1.33 b = mmc.findCycle();
1.34 @@ -92,7 +92,7 @@
1.35 }
1.36
1.37 typedef concepts::ReadMap<typename GR::Arc, Cost> CM;
1.38 -
1.39 +
1.40 GR g;
1.41 CM cost;
1.42 ListPath<GR> p;
1.43 @@ -153,13 +153,13 @@
1.44 KarpMmc<GR, concepts::ReadMap<GR::Arc, int> > >();
1.45 checkConcept< MmcClassConcept<GR, float>,
1.46 KarpMmc<GR, concepts::ReadMap<GR::Arc, float> > >();
1.47 -
1.48 +
1.49 // HartmannOrlinMmc
1.50 checkConcept< MmcClassConcept<GR, int>,
1.51 HartmannOrlinMmc<GR, concepts::ReadMap<GR::Arc, int> > >();
1.52 checkConcept< MmcClassConcept<GR, float>,
1.53 HartmannOrlinMmc<GR, concepts::ReadMap<GR::Arc, float> > >();
1.54 -
1.55 +
1.56 // HowardMmc
1.57 checkConcept< MmcClassConcept<GR, int>,
1.58 HowardMmc<GR, concepts::ReadMap<GR::Arc, int> > >();
1.59 @@ -176,11 +176,11 @@
1.60 {
1.61 typedef SmartDigraph GR;
1.62 DIGRAPH_TYPEDEFS(GR);
1.63 -
1.64 +
1.65 GR gr;
1.66 IntArcMap l1(gr), l2(gr), l3(gr), l4(gr);
1.67 IntArcMap c1(gr), c2(gr), c3(gr), c4(gr);
1.68 -
1.69 +
1.70 std::istringstream input(test_lgf);
1.71 digraphReader(gr, input).
1.72 arcMap("len1", l1).