[Lemon-commits] deba: r3249 - in lemon/trunk: demo lemon

[Lemon SVN]

Author: deba
Date: Fri Mar 30 16:17:28 2007
New Revision: 3249

Modified:
   lemon/trunk/demo/reader_writer_demo.cc
   lemon/trunk/demo/sample.lgf
   lemon/trunk/lemon/lemon_reader.h

Log:
Small improvments


Modified: lemon/trunk/demo/reader_writer_demo.cc
==============================================================================
--- lemon/trunk/demo/reader_writer_demo.cc	(original)
+++ lemon/trunk/demo/reader_writer_demo.cc	Fri Mar 30 16:17:28 2007
@@ -39,9 +39,11 @@
 
   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();
 
     std::cout << "Hello! We have read a graph from file " << filename<< 
@@ -51,6 +53,7 @@
 
     GraphWriter<SmartGraph> writer(std::cout, graph);
     writer.writeEdgeMap("multiplicity", cap);
+    writer.writeAttribute("name",name);
     writer.run();
      
   } catch (DataFormatError& error) {

Modified: lemon/trunk/demo/sample.lgf
==============================================================================
--- lemon/trunk/demo/sample.lgf	(original)
+++ lemon/trunk/demo/sample.lgf	Fri Mar 30 16:17:28 2007
@@ -20,6 +20,7 @@
 source 0
 target 5
 @edges 
- at attributes 
+ at attributes
+name "Simple Sample Graph"
 author "Attila BERNATH"
 @end

Modified: lemon/trunk/lemon/lemon_reader.h
==============================================================================
--- lemon/trunk/lemon/lemon_reader.h	(original)
+++ lemon/trunk/lemon/lemon_reader.h	Fri Mar 30 16:17:28 2007
@@ -1951,16 +1951,16 @@
     ///
     /// 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);
     }
 
     /// \brief Add an attribute reader command for the reader.
     ///
     /// 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>();
       if (readers.find(label) != readers.end()) {
@@ -2012,7 +2012,7 @@
 	}	
       }
     }    
-
+    
     virtual void missing() {
       if (readers.empty()) return;
       ErrorMessage msg;