Changeset 1115:444f69240539 in lemon-0.x for src/work/deba/graph_reader.h

Timestamp:

02/01/05 16:56:37 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some changes in the IO and map utilities.

File:

• src/work/deba/graph_reader.h (modified) (20 diffs)

src/work/deba/graph_reader.h

@@ -38 +38 @@
   class IOException {
   public:
+    virtual ~IOException() {}
     virtual string what() const = 0;
   };
@@ -56 +57 @@
     typedef _Exception Exception;
     StreamException(int _line, Exception _exception) 
-      : line_num(_line), Exception(_exception) {}
+      : Exception(_exception), line_num(_line) {}
     virtual int line() const {
       return line_num;
     }
+
+    virtual ~StreamException() {}
+
     virtual std::string what() const {
       ostringstream os;
@@ -71 +75 @@
 
   // Readers and ReaderTraits
-  
+  /// \brief Standard ReaderTraits for the GraphReader class.
+  ///
+  /// 
+ 
   struct DefaultReaderTraits {
 
@@ -97 +104 @@
       value.clear();
       is >> ws;
-      if (!is.get(c) || c != '\"') throw DataFormatException("Quoted string format");
+      if (!is.get(c) || c != '\"') 
+        throw DataFormatException("Quoted string format");
       while (is.get(c) && c != '\"') {
         if (escaped && c == '\\') {
@@ -193 +201 @@
     typedef typename ReaderTraits::DefaultReader DefaultReader;
 
-    GraphReader(std::istream& _is, Graph& _graph, const DefaultReader& _reader = DefaultReader()) 
+    GraphReader(std::istream& _is, Graph& _graph, 
+                const DefaultReader& _reader = DefaultReader()) 
       : is(_is), graph(_graph), nodeSkipper(_reader), edgeSkipper(_reader) {}
 
@@ -199 +208 @@
     ~GraphReader() {
 
-      for (typename NodeMapReaders::iterator it = node_map_readers.begin(); it != node_map_readers.end(); ++it) {
+      for (typename NodeMapReaders::iterator it = node_map_readers.begin(); 
+           it != node_map_readers.end(); ++it) {
         delete it->second;
       }
 
-      for (typename EdgeMapReaders::iterator it = edge_map_readers.begin(); it != edge_map_readers.end(); ++it) {
+      for (typename EdgeMapReaders::iterator it = edge_map_readers.begin(); 
+           it != edge_map_readers.end(); ++it) {
         delete it->second;
       }
@@ -212 +223 @@
 
     template <typename Map>
-    GraphReader& readNodeMap(std::string name, Map& map) {
-      return readNodeMap<typename ReaderTraits::template Reader<typename Map::Value>, Map>(name, map);
+    GraphReader& addNodeMap(std::string name, Map& map) {
+      return addNodeMap<typename ReaderTraits::template 
+        Reader<typename Map::Value>, Map>(name, map);
     }
 
     template <typename Reader, typename Map>
-    GraphReader& readNodeMap(std::string name, Map& map, const Reader& reader = Reader()) {
+    GraphReader& addNodeMap(std::string name, Map& map, 
+                             const Reader& reader = Reader()) {
       if (node_map_readers.find(name) != node_map_readers.end()) {
         throw Exception() << "Multiple read rule for node map: " << name;
       }
-      node_map_readers.insert(make_pair(name, new MapReader<Node, Map, Reader>(map, reader)));
+      node_map_readers.insert(
+        make_pair(name, new MapReader<Node, Map, Reader>(map, reader)));
       return *this;
     }
 
     template <typename Reader>
-    GraphReader& skipNodeMap(std::string name, const Reader& reader = Reader()) {
+    GraphReader& skipNodeMap(std::string name, 
+                             const Reader& reader = Reader()) {
       if (node_map_readers.find(name) != node_map_readers.end()) {
         throw Exception() << "Multiple read rule for node map: " << name;
       }
-      node_map_readers.insert(make_pair(name, new SkipReader<Node, Reader>(reader)));
+      node_map_readers.insert(
+        make_pair(name, new SkipReader<Node, Reader>(reader)));
       return *this;
     }
@@ -237 +253 @@
 
     template <typename Map>
-    GraphReader& readEdgeMap(std::string name, Map& map) { 
-      return readEdgeMap<typename ReaderTraits::template Reader<typename Map::Value>, Map>(name, map);
+    GraphReader& addEdgeMap(std::string name, Map& map) { 
+      return addEdgeMap<typename ReaderTraits::template
+        Reader<typename Map::Value>, Map>(name, map);
     }
 
 
     template <typename Reader, typename Map>
-    GraphReader& readEdgeMap(std::string name, Map& map, const Reader& reader = Reader()) {
+    GraphReader& addEdgeMap(std::string name, Map& map,
+                             const Reader& reader = Reader()) {
       if (edge_map_readers.find(name) != edge_map_readers.end()) {
         throw Exception() << "Multiple read rule for edge map: " << name;
       }
-      edge_map_readers.insert(make_pair(name, new MapReader<Edge, Map, Reader>(map, reader)));
+      edge_map_readers.insert(
+        make_pair(name, new MapReader<Edge, Map, Reader>(map, reader)));
       return *this;
     }
 
     template <typename Reader>
-    GraphReader& skipEdgeMap(std::string name, const Reader& reader = Reader()) {
+    GraphReader& skipEdgeMap(std::string name,
+                             const Reader& reader = Reader()) {
       if (edge_map_readers.find(name) != edge_map_readers.end()) {
         throw Exception() << "Multiple read rule for edge map: " << name;
       }
-      edge_map_readers.insert(make_pair(name, new SkipReader<Edge, Reader>(reader)));
+      edge_map_readers.insert(
+        make_pair(name, new SkipReader<Edge, Reader>(reader)));
       return *this;
     }
 
     // Node rules
-    GraphReader& readNode(std::string name, Node& node) {
+    GraphReader& addNode(std::string name, Node& node) {
       if (node_readers.find(name) != node_readers.end()) {
         throw Exception() << "Multiple read rule for node";
       }
       node_readers.insert(make_pair(name, &node));
+      return *this;
     }
 
     // Edge rules
 
-    GraphReader& readEdge(std::string name, Edge& edge) {
+    GraphReader& addEdge(std::string name, Edge& edge) {
       if (edge_readers.find(name) != edge_readers.end()) {
         throw Exception() << "Multiple read rule for edge";
       }
       edge_readers.insert(make_pair(name, &edge));
+      return *this;
     }
 
@@ -307 +330 @@
     template <typename Item> class InverterBase;
 
-    std::string readNodeSet(int& line_num, auto_ptr<InverterBase<Node> > & nodeInverter) {
+    std::string readNodeSet(int& line_num, 
+                            auto_ptr<InverterBase<Node> > & nodeInverter) {
       std::vector<ReaderBase<Node>* > index;
       {
@@ -335 +359 @@
         std::istringstream ls(line);
         nodeInverter->read(ls, node);
-        for (int i = 1; i < index.size(); ++i) {
+        for (int i = 1; i < (int)index.size(); ++i) {
           index[i]->read(ls, node);
         }
@@ -343 +367 @@
 
     std::string readEdgeSet(int& line_num, 
-                     auto_ptr<InverterBase<Edge> > & edgeInverter, auto_ptr<InverterBase<Node> > & nodeInverter) {
+                            auto_ptr<InverterBase<Edge> > & edgeInverter, 
+                            auto_ptr<InverterBase<Node> > & nodeInverter) {
       std::vector<ReaderBase<Edge>*> index;
       {
@@ -373 +398 @@
         Edge edge = graph.addEdge(source, target);
         edgeInverter->read(ls, edge);
-        for (int i = 1; i < index.size(); ++i) {
+        for (int i = 1; i < (int)index.size(); ++i) {
           index[i]->read(ls, edge);
         }
@@ -380 +405 @@
     }
 
-    std::string readNodes(int& line_num, auto_ptr<InverterBase<Node> >& nodeInverter) {
+    std::string readNodes(int& line_num, 
+                          auto_ptr<InverterBase<Node> >& nodeInverter) {
       std::string line;
       while (line = readNotEmptyLine(is, line_num), line[0] != '@') {
@@ -394 +420 @@
     }
 
-    std::string readEdges(int& line_num, auto_ptr<InverterBase<Edge> >& edgeInverter) {
+    std::string readEdges(int& line_num, 
+                          auto_ptr<InverterBase<Edge> >& edgeInverter) {
       std::string line;
       while (line = readNotEmptyLine(is, line_num), line[0] != '@') {
@@ -412 +439 @@
       while (++line_num, getline(is, line)) {   
         int vi = line.find_first_not_of(" \t");
-        if (vi != string::npos && line[vi] != '#') {
+        if (vi != (int)string::npos && line[vi] != '#') {
           return line.substr(vi);
         }
@@ -446 +473 @@
         : map(_map), reader(_reader) {}
 
+      virtual ~MapReaderInverter() {}
+
       virtual void read(std::istream& is, const Item& item) {
         Value value;
@@ -483 +512 @@
         : reader(_reader) {}
 
+      virtual ~SkipReaderInverter() {}
+
       virtual void read(std::istream& is, const Item& item) {
         Value value;
@@ -514 +545 @@
     public:
       typedef _Item Item;
+
+      //      virtual ~ReaderBase() {}
 
       virtual void read(std::istream& is, const Item& item) = 0;
@@ -533 +566 @@
         : map(_map), reader(_reader) {}
 
+      virtual ~MapReader() {}
 
       virtual void read(std::istream& is, const Item& item) {
@@ -556 +590 @@
       SkipReader(const Reader& _reader) : reader(_reader) {}
 
+      virtual ~SkipReader() {}
+
       virtual void read(std::istream& is, const Item& item) {
         Value value;