# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1539795368 -7200
# Node ID afcd33be243f7f05ed7ec85dff3e5283446041b0
# Parent  7c86f14b3bc5ca1c71a386de0f4b0ae1f7b44395# Parent  332627dd249ee9d8e702fee6d0bd94dc406298e8
Merge #1.3 related bugfix heads

diff -r 7c86f14b3bc5 -r afcd33be243f lemon/dimacs.h
--- a/lemon/dimacs.h	Wed Oct 17 18:55:53 2018 +0200
+++ b/lemon/dimacs.h	Wed Oct 17 18:56:08 2018 +0200
@@ -25,6 +25,7 @@
 #include <limits>
 #include <lemon/maps.h>
 #include <lemon/error.h>
+
 /// \ingroup dimacs_group
 /// \file
 /// \brief DIMACS file format reader.
@@ -122,7 +123,7 @@
   /// a non-zero value, that value will be used as "infinite".
   ///
   /// If the file type was previously evaluated by dimacsType(), then
-  /// the descriptor struct should be given by the \c dest parameter.
+  /// the descriptor struct should be given by the \c desc parameter.
   template <typename Digraph, typename LowerMap,
             typename CapacityMap, typename CostMap,
             typename SupplyMap>
@@ -276,7 +277,7 @@
   /// a non-zero value, that value will be used as "infinite".
   ///
   /// If the file type was previously evaluated by dimacsType(), then
-  /// the descriptor struct should be given by the \c dest parameter.
+  /// the descriptor struct should be given by the \c desc parameter.
   template<typename Digraph, typename CapacityMap>
   void readDimacsMax(std::istream& is,
                      Digraph &g,
@@ -303,7 +304,7 @@
   /// source node.
   ///
   /// If the file type was previously evaluated by dimacsType(), then
-  /// the descriptor struct should be given by the \c dest parameter.
+  /// the descriptor struct should be given by the \c desc parameter.
   template<typename Digraph, typename LengthMap>
   void readDimacsSp(std::istream& is,
                     Digraph &g,
@@ -334,7 +335,7 @@
   /// a non-zero value, that value will be used as "infinite".
   ///
   /// If the file type was previously evaluated by dimacsType(), then
-  /// the descriptor struct should be given by the \c dest parameter.
+  /// the descriptor struct should be given by the \c desc parameter.
   template<typename Digraph, typename CapacityMap>
   void readDimacsCap(std::istream& is,
                      Digraph &g,
@@ -343,7 +344,7 @@
                      DimacsDescriptor desc=DimacsDescriptor()) {
     typename Digraph::Node u,v;
     if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
-    if(desc.type!=DimacsDescriptor::MAX || desc.type!=DimacsDescriptor::SP)
+    if(desc.type!=DimacsDescriptor::MAX && desc.type!=DimacsDescriptor::SP)
       throw FormatError("Problem type mismatch");
     _readDimacs(is, g, capacity, u, v, infty, desc);
   }
@@ -374,7 +375,7 @@
   /// At the beginning, \c g is cleared by \c g.clear().
   ///
   /// If the file type was previously evaluated by dimacsType(), then
-  /// the descriptor struct should be given by the \c dest parameter.
+  /// the descriptor struct should be given by the \c desc parameter.
   template<typename Graph>
   void readDimacsMat(std::istream& is, Graph &g,
                      DimacsDescriptor desc=DimacsDescriptor())