1.1 --- a/tools/dimacs-solver.cc Fri Aug 05 09:33:42 2011 +0200
1.2 +++ b/tools/dimacs-solver.cc Mon Aug 08 12:36:16 2011 +0200
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-2011
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -88,7 +88,7 @@
1.13 ti.restart();
1.14 pre.run();
1.15 if(report) std::cerr << "Run Preflow: " << ti << '\n';
1.16 - if(report) std::cerr << "\nMax flow value: " << pre.flowValue() << '\n';
1.17 + if(report) std::cerr << "\nMax flow value: " << pre.flowValue() << '\n';
1.18 }
1.19
1.20 template<class Value>
1.21 @@ -147,7 +147,7 @@
1.22 mat.run();
1.23 if(report) std::cerr << "Run MaxMatching: " << ti << '\n';
1.24 if(report) std::cerr << "\nCardinality of max matching: "
1.25 - << mat.matchingSize() << '\n';
1.26 + << mat.matchingSize() << '\n';
1.27 }
1.28
1.29
1.30 @@ -165,7 +165,7 @@
1.31 << std::endl;
1.32 exit(1);
1.33 }
1.34 -
1.35 +
1.36 switch(desc.type)
1.37 {
1.38 case DimacsDescriptor::MIN:
1.39 @@ -237,7 +237,7 @@
1.40 std::ostream& os = (ap.files().size()<2 ? std::cout : output);
1.41
1.42 DimacsDescriptor desc = dimacsType(is);
1.43 -
1.44 +
1.45 if(!ap.given("q"))
1.46 {
1.47 std::cout << "Problem type: ";
1.48 @@ -262,7 +262,7 @@
1.49 std::cout << "\nNum of arcs: " << desc.edgeNum;
1.50 std::cout << "\n\n";
1.51 }
1.52 -
1.53 +
1.54 if(ap.given("double"))
1.55 solve<double>(ap,is,os,desc);
1.56 else if(ap.given("ldouble"))