1.1 --- a/lemon/dimacs.h	Mon Jul 16 16:21:40 2018 +0200
     1.2 +++ b/lemon/dimacs.h	Wed Oct 17 19:14:07 2018 +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-2010
     1.8 + * Copyright (C) 2003-2013
     1.9   * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    1.10   * (Egervary Research Group on Combinatorial Optimization, EGRES).
    1.11   *
    1.12 @@ -25,6 +25,7 @@
    1.13  #include <limits>
    1.14  #include <lemon/maps.h>
    1.15  #include <lemon/error.h>
    1.16 +
    1.17  /// \ingroup dimacs_group
    1.18  /// \file
    1.19  /// \brief DIMACS file format reader.
    1.20 @@ -122,7 +123,7 @@
    1.21    /// a non-zero value, that value will be used as "infinite".
    1.22    ///
    1.23    /// If the file type was previously evaluated by dimacsType(), then
    1.24 -  /// the descriptor struct should be given by the \c dest parameter.
    1.25 +  /// the descriptor struct should be given by the \c desc parameter.
    1.26    template <typename Digraph, typename LowerMap,
    1.27              typename CapacityMap, typename CostMap,
    1.28              typename SupplyMap>
    1.29 @@ -276,7 +277,7 @@
    1.30    /// a non-zero value, that value will be used as "infinite".
    1.31    ///
    1.32    /// If the file type was previously evaluated by dimacsType(), then
    1.33 -  /// the descriptor struct should be given by the \c dest parameter.
    1.34 +  /// the descriptor struct should be given by the \c desc parameter.
    1.35    template<typename Digraph, typename CapacityMap>
    1.36    void readDimacsMax(std::istream& is,
    1.37                       Digraph &g,
    1.38 @@ -303,7 +304,7 @@
    1.39    /// source node.
    1.40    ///
    1.41    /// If the file type was previously evaluated by dimacsType(), then
    1.42 -  /// the descriptor struct should be given by the \c dest parameter.
    1.43 +  /// the descriptor struct should be given by the \c desc parameter.
    1.44    template<typename Digraph, typename LengthMap>
    1.45    void readDimacsSp(std::istream& is,
    1.46                      Digraph &g,
    1.47 @@ -334,7 +335,7 @@
    1.48    /// a non-zero value, that value will be used as "infinite".
    1.49    ///
    1.50    /// If the file type was previously evaluated by dimacsType(), then
    1.51 -  /// the descriptor struct should be given by the \c dest parameter.
    1.52 +  /// the descriptor struct should be given by the \c desc parameter.
    1.53    template<typename Digraph, typename CapacityMap>
    1.54    void readDimacsCap(std::istream& is,
    1.55                       Digraph &g,
    1.56 @@ -343,7 +344,7 @@
    1.57                       DimacsDescriptor desc=DimacsDescriptor()) {
    1.58      typename Digraph::Node u,v;
    1.59      if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
    1.60 -    if(desc.type!=DimacsDescriptor::MAX || desc.type!=DimacsDescriptor::SP)
    1.61 +    if(desc.type!=DimacsDescriptor::MAX && desc.type!=DimacsDescriptor::SP)
    1.62        throw FormatError("Problem type mismatch");
    1.63      _readDimacs(is, g, capacity, u, v, infty, desc);
    1.64    }
    1.65 @@ -374,7 +375,7 @@
    1.66    /// At the beginning, \c g is cleared by \c g.clear().
    1.67    ///
    1.68    /// If the file type was previously evaluated by dimacsType(), then
    1.69 -  /// the descriptor struct should be given by the \c dest parameter.
    1.70 +  /// the descriptor struct should be given by the \c desc parameter.
    1.71    template<typename Graph>
    1.72    void readDimacsMat(std::istream& is, Graph &g,
    1.73                       DimacsDescriptor desc=DimacsDescriptor())