1.1 --- a/lemon/dimacs.h Fri Aug 09 11:07:27 2013 +0200
1.2 +++ b/lemon/dimacs.h Sun Aug 11 15:28:12 2013 +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-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 ///Discover the type of a DIMACS file
1.14
1.15 ///This function starts seeking the beginning of the given file for the
1.16 - ///problem type and size info.
1.17 + ///problem type and size info.
1.18 ///The found data is returned in a special struct that can be evaluated
1.19 ///and passed to the appropriate reader function.
1.20 DimacsDescriptor dimacsType(std::istream& is)
1.21 @@ -212,7 +212,7 @@
1.22 infty = std::numeric_limits<Capacity>::has_infinity ?
1.23 std::numeric_limits<Capacity>::infinity() :
1.24 std::numeric_limits<Capacity>::max();
1.25 -
1.26 +
1.27 while (is >> c) {
1.28 switch (c) {
1.29 case 'c': // comment line
1.30 @@ -237,7 +237,7 @@
1.31 getline(is, str);
1.32 e = g.addArc(nodes[i], nodes[j]);
1.33 capacity.set(e, _cap);
1.34 - }
1.35 + }
1.36 else if (desc.type==DimacsDescriptor::MAX) {
1.37 is >> i >> j >> _cap;
1.38 getline(is, str);
1.39 @@ -362,11 +362,11 @@
1.40 {
1.41 g.addArc(s,t);
1.42 }
1.43 -
1.44 +
1.45 /// \brief DIMACS plain (di)graph reader function.
1.46 ///
1.47 /// This function reads a plain (di)graph without any designated nodes
1.48 - /// and maps (e.g. a matching instance) from DIMACS format, i.e. from
1.49 + /// and maps (e.g. a matching instance) from DIMACS format, i.e. from
1.50 /// DIMACS files having a line starting with
1.51 /// \code
1.52 /// p mat
1.53 @@ -392,7 +392,7 @@
1.54 for (int k = 1; k <= desc.nodeNum; ++k) {
1.55 nodes[k] = g.addNode();
1.56 }
1.57 -
1.58 +
1.59 while (is >> c) {
1.60 switch (c) {
1.61 case 'c': // comment line