Changeset 2416:261b4701405d in lemon-0.x

Timestamp:

03/30/07 16:17:28 (16 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Small improvments

Files:

• demo/reader_writer_demo.cc (modified) (2 diffs)
• demo/sample.lgf (modified) (1 diff)
• lemon/lemon_reader.h (modified) (3 diffs)

demo/reader_writer_demo.cc

@@ -40 +40 @@
   try {
     std::string filename="sample.lgf";
+    std::string name;
     GraphReader<SmartGraph> reader(filename,graph);
     SmartGraph::EdgeMap<int> cap(graph);
     reader.readEdgeMap("capacity",cap);
+    reader.readAttribute("name",name);
     reader.run();
 
@@ -52 +54 @@
     GraphWriter<SmartGraph> writer(std::cout, graph);
     writer.writeEdgeMap("multiplicity", cap);
+    writer.writeAttribute("name",name);
     writer.run();
      

demo/sample.lgf

@@ -21 +21 @@
 target 5
 @edges 
-@attributes 
+@attributes
+name "Simple Sample Graph"
 author "Attila BERNATH"
 @end

lemon/lemon_reader.h

@@ -1952 +1952 @@
     /// Add an attribute reader command for the reader.
     template <typename Value>
-    AttributeReader& readAttribute(const std::string& id, Value& value) {
+    AttributeReader& readAttribute(const std::string& label, Value& value) {
       return readAttribute<typename Traits::template Reader<Value> >
-        (id, value);
+        (label, value);
     }
 
@@ -1961 +1961 @@
     /// Add an attribute reader command for the reader.
     template <typename ItemReader, typename Value>
-    AttributeReader& readAttribute(std::string label, Value& value,
+    AttributeReader& readAttribute(const std::string& label, Value& value,
                                    const ItemReader& ir = ItemReader()) {
       checkConcept<_reader_bits::ItemReader<Value>, ItemReader>();
@@ -2013 +2013 @@
       }
     }    
-
+    
     virtual void missing() {
       if (readers.empty()) return;