COIN-OR::LEMON - Graph Library

Changeset 2001:c9e5de6e3eac in lemon-0.x


Ignore:
Timestamp:
03/07/06 12:06:57 (14 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2611
Message:

Removing obsolote "id" map handling
Error message is modified

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/lemon_reader.h

    r2000 r2001  
    896896          index.push_back(&skipper);
    897897        }
    898         if (id == "label" || (id =="id" && inverter.get() == 0)) {
     898        if (id == "label") {
    899899          inverter.reset(index.back()->getInverter());
    900900          index.back() = inverter.get();
     
    921921      if (readers.empty()) return;
    922922      ErrorMessage msg;
    923       msg << "NodeSet section not found in file: " << name;
     923      msg << "NodeSet section not found in file: @nodeset " << name;
    924924      throw IOParameterError(msg.message());
    925925    }
     
    11291129          index.push_back(&skipper);
    11301130        }
    1131         if (id == "label" || (id =="id" && inverter.get() == 0)) {
     1131        if (id == "label") {
    11321132          inverter.reset(index.back()->getInverter());
    11331133          index.back() = inverter.get();
     
    11561156      if (readers.empty()) return;
    11571157      ErrorMessage msg;
    1158       msg << "EdgeSet section not found in file: " << name;
     1158      msg << "EdgeSet section not found in file: @edgeset " << name;
    11591159      throw IOParameterError(msg.message());
    11601160    }
     
    11801180  private:
    11811181
    1182     typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> MapReaders;
     1182    typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*>
     1183    MapReaders;
     1184   
    11831185    MapReaders readers;
    11841186   
     
    12141216  ///
    12151217  /// The undirected edgeset reader needs a node id reader to identify which
    1216   /// nodes have to be connected. If a NodeSetReader reads an "label" named map,
    1217   /// it will be able to resolve the nodes by ids.
     1218  /// nodes have to be connected. If a NodeSetReader reads an "label" named
     1219  /// map, it will be able to resolve the nodes by ids.
    12181220  ///
    12191221  /// \relates LemonReader
     
    14321434          index.push_back(&skipper);
    14331435        }
    1434         if (id == "label" || (id =="id" && inverter.get() == 0)) {
     1436        if (id == "label") {
    14351437          inverter.reset(index.back()->getInverter());
    14361438          index.back() = inverter.get();
     
    14591461      if (readers.empty()) return;
    14601462      ErrorMessage msg;
    1461       msg << "UEdgeSet section not found in file: " << name;
     1463      msg << "UEdgeSet section not found in file: @uedgeset " << name;
    14621464      throw IOParameterError(msg.message());
    14631465    }
     
    16161618      if (readers.empty()) return;
    16171619      ErrorMessage msg;
    1618       msg << "Nodes section not found in file: " << name;
     1620      msg << "Nodes section not found in file: @nodes " << name;
    16191621      throw IOParameterError(msg.message());
    16201622    }
     
    17291731      if (readers.empty()) return;
    17301732      ErrorMessage msg;
    1731       msg << "Edges section not found in file: " << name;
     1733      msg << "Edges section not found in file: @edges " << name;
    17321734      throw IOParameterError(msg.message());
    17331735    }
     
    18811883      if (edgeReaders.empty() && uEdgeReaders.empty()) return;
    18821884      ErrorMessage msg;
    1883       msg << "UEdges section not found in file: " << name;
     1885      msg << "UEdges section not found in file: @uedges " << name;
    18841886      throw IOParameterError(msg.message());
    18851887    }
     
    20082010      if (readers.empty()) return;
    20092011      ErrorMessage msg;
    2010       msg << "Attribute section not found in file: " << name;
     2012      msg << "Attribute section not found in file: @attributes " << name;
    20112013      throw IOParameterError(msg.message());
    20122014    }
Note: See TracChangeset for help on using the changeset viewer.