Changeset 2001:c9e5de6e3eac in lemon-0.x

Timestamp:

03/07/06 12:06:57 (18 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:

• lemon/lemon_reader.h (modified) (12 diffs)

lemon/lemon_reader.h

@@ -896 +896 @@
           index.push_back(&skipper);
         }
-        if (id == "label" || (id =="id" && inverter.get() == 0)) {
+        if (id == "label") {
           inverter.reset(index.back()->getInverter());
           index.back() = inverter.get();
@@ -921 +921 @@
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "NodeSet section not found in file: " << name;
+      msg << "NodeSet section not found in file: @nodeset " << name;
       throw IOParameterError(msg.message());
     }
@@ -1129 +1129 @@
           index.push_back(&skipper);
         }
-        if (id == "label" || (id =="id" && inverter.get() == 0)) {
+        if (id == "label") {
           inverter.reset(index.back()->getInverter());
           index.back() = inverter.get();
@@ -1156 +1156 @@
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "EdgeSet section not found in file: " << name;
+      msg << "EdgeSet section not found in file: @edgeset " << name;
       throw IOParameterError(msg.message());
     }
@@ -1180 +1180 @@
   private:
 
-    typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> MapReaders;
+    typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> 
+    MapReaders;
+    
     MapReaders readers;
    
@@ -1214 +1216 @@
   ///
   /// The undirected edgeset reader needs a node id reader to identify which 
-  /// nodes have to be connected. If a NodeSetReader reads an "label" named map,
-  /// it will be able to resolve the nodes by ids.
+  /// nodes have to be connected. If a NodeSetReader reads an "label" named 
+  /// map, it will be able to resolve the nodes by ids.
   ///
   /// \relates LemonReader
@@ -1432 +1434 @@
           index.push_back(&skipper);
         }
-        if (id == "label" || (id =="id" && inverter.get() == 0)) {
+        if (id == "label") {
           inverter.reset(index.back()->getInverter());
           index.back() = inverter.get();
@@ -1459 +1461 @@
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "UEdgeSet section not found in file: " << name;
+      msg << "UEdgeSet section not found in file: @uedgeset " << name;
       throw IOParameterError(msg.message());
     }
@@ -1616 +1618 @@
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "Nodes section not found in file: " << name;
+      msg << "Nodes section not found in file: @nodes " << name;
       throw IOParameterError(msg.message());
     }
@@ -1729 +1731 @@
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "Edges section not found in file: " << name;
+      msg << "Edges section not found in file: @edges " << name;
       throw IOParameterError(msg.message());
     }
@@ -1881 +1883 @@
       if (edgeReaders.empty() && uEdgeReaders.empty()) return;
       ErrorMessage msg;
-      msg << "UEdges section not found in file: " << name;
+      msg << "UEdges section not found in file: @uedges " << name;
       throw IOParameterError(msg.message());
     }
@@ -2008 +2010 @@
       if (readers.empty()) return;
       ErrorMessage msg;
-      msg << "Attribute section not found in file: " << name;
+      msg << "Attribute section not found in file: @attributes " << name;
       throw IOParameterError(msg.message());
     }