Changeset 1286:692948b894e8 in lemon-0.x for src/work/peter

Timestamp:

04/01/05 10:28:51 (21 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

Peter is able to read xy vector from file.

File:

• src/work/peter/xy-reader.cc (modified) (4 diffs)

src/work/peter/xy-reader.cc

@@ -15 +15 @@
 typedef Graph::NodeMap<Coordinates> CoordinatesMap;
 typedef Graph::Node Node;
+typedef Graph::EdgeIt EdgeIt;
+typedef Graph::NodeIt NodeIt;
 
-class CoordReaderMap: public MapBase<Node, double>
+class CoordReaderMap: public MapBase <Node, double>
 {
-    CoordinatesMap * cm;
+    CoordinatesMap & cm;
     char xoy;
 
 public:
-    CoordReaderMap(char xory, CoordinatesMap * coordmap): cm(coordmap)
+    CoordReaderMap(char xory, CoordinatesMap & coordmap): cm(coordmap)
     {
         switch(xory)
@@ -40 +42 @@
         {
             case 'x':
-                (*cm)[node].x=coord;
+                cm[node].x=coord;
                 break;
             case 'y':
-                (*cm)[node].y=coord;
+                cm[node].y=coord;
                 break;
             default:
@@ -56 +58 @@
     CoordinatesMap cm(g);
 
-    CoordReaderMap xreader('x',&cm);
-    CoordReaderMap yreader('y',&cm);
+    CoordReaderMap xreader('x',cm);
+    CoordReaderMap yreader('y',cm);
 
-    std::ifstream is("dijkstra_test.lemon");
+    std::ifstream is("graphocska.lemon");
     
     GraphReader<Graph> reader(is, g);
@@ -65 +67 @@
     reader.addNodeMap("coordinates_y", yreader);
     reader.run();
-    
+    std::cout << "Megvagyok" << std::endl;
+
+    for (NodeIt i(g); i!=INVALID; ++i)
+        std::cout << " " << g.id(i) << " " << cm[i];
+    std::cout << std::endl;
+
     return 0;
 }