diff -r a7d841273c68 -r 6d1255299e79 lemon/dimacs.h --- a/lemon/dimacs.h Thu Oct 08 10:03:29 2015 +0200 +++ b/lemon/dimacs.h Tue Sep 19 15:22:08 2017 +0200 @@ -25,6 +25,7 @@ #include #include #include + /// \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 @@ -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 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 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 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 void readDimacsMat(std::istream& is, Graph &g, DimacsDescriptor desc=DimacsDescriptor())