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

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_io_test.cc (modified) (3 diffs)

src/work/deba/graph_io_test.cc

@@ -19 +19 @@
 
   SmartGraph::NodeMap<int> id(graph);
-  reader.readNodeMap("id", id);
+  reader.addNodeMap("id", id);
 
   SmartGraph::NodeMap<int> cost(graph);
-  reader.readNodeMap("cost", cost);
+  reader.addNodeMap("cost", cost);
  
   SmartGraph::NodeMap<string> color(graph);
-  reader.readNodeMap("color", color);
+  reader.addNodeMap("color", color);
 
   SmartGraph::NodeMap<string> description(graph);
-  reader.readNodeMap<QuotedStringReader>("description", description);
+  reader.addNodeMap<QuotedStringReader>("description", description);
 
   SmartGraph::EdgeMap<char> mmap(graph);
-  reader.readEdgeMap("mmap", mmap);
+  reader.addEdgeMap("mmap", mmap);
 
   reader.skipEdgeMap<QuotedStringReader>("description");
 
   SmartGraph::Node source;
-  reader.readNode("source", source);
+  reader.addNode("source", source);
   
   SmartGraph::Edge newedge;
-  reader.readEdge("newedge", newedge);
+  reader.addEdge("newedge", newedge);
 
   try {
@@ -48 +48 @@
     cerr << e.what() << endl;
   }
+
   for (SmartGraph::NodeIt it(graph); it != INVALID; ++it) {
     cout << cost[it] << ' ' << color[it] << ' ' << description[it] << endl;
@@ -53 +54 @@
 
   for (SmartGraph::EdgeIt it(graph); it != INVALID; ++it) {
-    cout << mmap[it] << ' ' << id[graph.source(it)] << ' ' << id[graph.target(it)]  << endl;
+    cout << mmap[it] << ' ' << id[graph.source(it)] << ' ' << 
+      id[graph.target(it)]  << endl;
   }
 
-  cout << id[source] << ' ' << cost[source] << ' ' << color[source] << ' ' << description[source] << endl;
-  cout << mmap[newedge] << ' ' << id[graph.source(newedge)] << ' ' << id[graph.target(newedge)]  << endl;
+  cout << id[source] << ' ' << cost[source] << ' ' <<
+    color[source] << ' ' << description[source] << endl;
+  cout << mmap[newedge] << ' ' << id[graph.source(newedge)] << 
+    ' ' << id[graph.target(newedge)]  << endl;
 
   ofstream output("copy.lgf");
   GraphWriter<SmartGraph> writer(output, graph);
   
-  DescriptorMap<SmartGraph, SmartGraph::Node, SmartGraph::NodeIt, SmartGraph::NodeMap<int> > node_ids(graph);
+  DescriptorMap<SmartGraph, SmartGraph::Node, SmartGraph::NodeMap<int> > 
+    node_ids(graph);
   
-  writer.writeNodeMap("id", node_ids);
-  writer.writeNodeMap<QuotedStringWriter>("format", description);
+  writer.addNodeMap("id", node_ids);
+  writer.addNodeMap<QuotedStringWriter>("format", description);
 
-  DescriptorMap<SmartGraph, SmartGraph::Edge, SmartGraph::EdgeIt, SmartGraph::EdgeMap<int> > edge_ids(graph);
+  IdMap<SmartGraph, SmartGraph::Edge > edge_ids(graph);
 
-  writer.writeEdgeMap("id", edge_ids);
-  writer.writeEdgeMap("chars", mmap);
+  writer.addEdgeMap("id", edge_ids);
+  writer.addEdgeMap("chars", mmap);
   
-  writer.writeNode("source", node_ids.inverse()[3]);
-  writer.writeEdge("elek", edge_ids.inverse()[6]);
+  writer.addNode("source", node_ids.inverse()[3]);
+  //  writer.addEdge("elek", edge_ids.inverse()[6]);
   writer.write();