[Lemon-commits] [lemon_svn] hegyi: r1719 - hugo/trunk/src/work/peter

[Lemon SVN]

Author: hegyi
Date: Fri Apr  1 10:28:51 2005
New Revision: 1719

Modified:
   hugo/trunk/src/work/peter/xy-reader.cc

Log:
Peter is able to read xy vector from file.

Modified: hugo/trunk/src/work/peter/xy-reader.cc
==============================================================================
--- hugo/trunk/src/work/peter/xy-reader.cc	(original)
+++ hugo/trunk/src/work/peter/xy-reader.cc	Fri Apr  1 10:28:51 2005
@@ -14,14 +14,16 @@
 typedef xy<double> Coordinates;
 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)
 	{
@@ -39,10 +41,10 @@
 	switch(xoy)
 	{
 	    case 'x':
-		(*cm)[node].x=coord;
+		cm[node].x=coord;
 		break;
 	    case 'y':
-		(*cm)[node].y=coord;
+		cm[node].y=coord;
 		break;
 	    default:
 		throw UninitializedParameter() ;
@@ -55,15 +57,20 @@
     Graph g;
     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);
     reader.addNodeMap("coordinates_x", xreader);
     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;
 }