COIN-OR::LEMON - Graph Library

Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/dimacs.h

    r1375 r1270  
    2626#include <lemon/maps.h>
    2727#include <lemon/error.h>
    28 
    2928/// \ingroup dimacs_group
    3029/// \file
     
    124123  ///
    125124  /// If the file type was previously evaluated by dimacsType(), then
    126   /// the descriptor struct should be given by the \c desc parameter.
     125  /// the descriptor struct should be given by the \c dest parameter.
    127126  template <typename Digraph, typename LowerMap,
    128127            typename CapacityMap, typename CostMap,
     
    278277  ///
    279278  /// If the file type was previously evaluated by dimacsType(), then
    280   /// the descriptor struct should be given by the \c desc parameter.
     279  /// the descriptor struct should be given by the \c dest parameter.
    281280  template<typename Digraph, typename CapacityMap>
    282281  void readDimacsMax(std::istream& is,
     
    305304  ///
    306305  /// If the file type was previously evaluated by dimacsType(), then
    307   /// the descriptor struct should be given by the \c desc parameter.
     306  /// the descriptor struct should be given by the \c dest parameter.
    308307  template<typename Digraph, typename LengthMap>
    309308  void readDimacsSp(std::istream& is,
     
    336335  ///
    337336  /// If the file type was previously evaluated by dimacsType(), then
    338   /// the descriptor struct should be given by the \c desc parameter.
     337  /// the descriptor struct should be given by the \c dest parameter.
    339338  template<typename Digraph, typename CapacityMap>
    340339  void readDimacsCap(std::istream& is,
     
    345344    typename Digraph::Node u,v;
    346345    if(desc.type==DimacsDescriptor::NONE) desc=dimacsType(is);
    347     if(desc.type!=DimacsDescriptor::MAX && desc.type!=DimacsDescriptor::SP)
     346    if(desc.type!=DimacsDescriptor::MAX || desc.type!=DimacsDescriptor::SP)
    348347      throw FormatError("Problem type mismatch");
    349348    _readDimacs(is, g, capacity, u, v, infty, desc);
     
    376375  ///
    377376  /// If the file type was previously evaluated by dimacsType(), then
    378   /// the descriptor struct should be given by the \c desc parameter.
     377  /// the descriptor struct should be given by the \c dest parameter.
    379378  template<typename Graph>
    380379  void readDimacsMat(std::istream& is, Graph &g,
Note: See TracChangeset for help on using the changeset viewer.