Changeset 2000:ebcc93ead7da in lemon-0.x

Timestamp:

03/06/06 18:32:35 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2610

Message:

Checking missing section reader

Files:

• lemon/lemon_reader.h (modified) (11 diffs)
• test/dijkstra_test.lgf (modified) (1 diff)

lemon/lemon_reader.h

@@ -652 +652 @@
       /// It reads the content of the section.
       virtual void read(std::istream& is) = 0;
+
+      /// \brief The given section missing in the file.
+      ///
+      /// The given section missing in the file.
+      virtual void missing() {};
     };
 
@@ -685 +690 @@
 
     void attach(SectionReader& reader) {
-      readers.push_back(&reader);
+      readers.push_back(std::make_pair(&reader, false));
     }
 
@@ -696 +701 @@
       std::string line;
       try {
+        SectionReaders::iterator it;
         while ((++line_num, getline(*is, line)) && line.find("@end") != 0) {
-          SectionReaders::iterator it;
           for (it = readers.begin(); it != readers.end(); ++it) {
-            if ((*it)->header(line)) {
+            if (it->first->header(line)) {
+              it->second = true;
               char buf[2048];
               FilterStreamBuf buffer(*is, line_num);
               buffer.pubsetbuf(buf, sizeof(buf));
               std::istream is(&buffer);
-              (*it)->read(is);
+              it->first->read(is);
               break;
             }
           }
         }
+        for (it = readers.begin(); it != readers.end(); ++it) {
+          if (!it->second) {
+            it->first->missing();
+          }
+        }
       } catch (DataFormatError& error) {
         error.line(line_num);
@@ -721 +732 @@
     bool own_is;
 
-    typedef std::vector<SectionReader*> SectionReaders;
+    typedef std::vector<std::pair<SectionReader*, bool> > SectionReaders;
     SectionReaders readers;
 
@@ -905 +916 @@
         }
       }
+    }
+
+    virtual void missing() {
+      if (readers.empty()) return;
+      ErrorMessage msg;
+      msg << "NodeSet section not found in file: " << name;
+      throw IOParameterError(msg.message());
     }
 
@@ -1135 +1153 @@
     }
 
+    virtual void missing() {
+      if (readers.empty()) return;
+      ErrorMessage msg;
+      msg << "EdgeSet section not found in file: " << name;
+      throw IOParameterError(msg.message());
+    }
+
   public:
 
@@ -1431 +1456 @@
     }
 
+    virtual void missing() {
+      if (readers.empty()) return;
+      ErrorMessage msg;
+      msg << "UEdgeSet section not found in file: " << name;
+      throw IOParameterError(msg.message());
+    }
+
   public:
 
@@ -1580 +1612 @@
       }
     }
+
+    virtual void missing() {
+      if (readers.empty()) return;
+      ErrorMessage msg;
+      msg << "Nodes section not found in file: " << name;
+      throw IOParameterError(msg.message());
+    }
     
   private:
@@ -1685 +1724 @@
         }
       }
+    }
+
+    virtual void missing() {
+      if (readers.empty()) return;
+      ErrorMessage msg;
+      msg << "Edges section not found in file: " << name;
+      throw IOParameterError(msg.message());
     }
     
@@ -1831 +1877 @@
       }
     }
+
+    virtual void missing() {
+      if (edgeReaders.empty() && uEdgeReaders.empty()) return;
+      ErrorMessage msg;
+      msg << "UEdges section not found in file: " << name;
+      throw IOParameterError(msg.message());
+    }
     
   private:
@@ -1951 +2004 @@
       }
     }    
+
+    virtual void missing() {
+      if (readers.empty()) return;
+      ErrorMessage msg;
+      msg << "Attribute section not found in file: " << name;
+      throw IOParameterError(msg.message());
+    }
 
   private:

test/dijkstra_test.lgf

@@ -1001 +1001 @@
 1       
 0       
-@edgeset
+@edgeset 
                 label   capacity        
 75      377     6906    27