@@ -9,6 +9,25 @@ Graph::~Graph() { delete (*i).second; } +/** + * Method adds a vertex to the graph + * + * @param int + * @param int + * @param int + * + */ +void Graph::addVertex(unsigned int k, double x, double y) { + vertex_map::iterator i = vmap.find(k); + + if (i == vmap.end() ) { + Vertex *new_vertex = new Vertex(x, k); + vmap[ k ] = new_vertex; + return new_vertex; + } + + return (*i).second; +} /** * getVertex method @@ -18,8 +37,7 @@ Graph::~Graph() { * @param int * @return Vertex* */ - -Graph::getVertex(int v) { +Vertex* Graph::getVertex(int v) { vertex_map::iterator i = vmap.find(v); if (i == vmap.end() ) { graf.cpp @@ -16,8 +16,8 @@ class Vertex { public: - unsigned int x; // Vertex x coordinate - unsigned int y; // Vertex y cooridnate + double x; // Vertex x coordinate + double y; // Vertex y cooridnate vector<Edge> adj; // Vector of adjacent vert. double dist; // to compute dist in finding shortest path alg. Vertex *prev; // Previous Vertex on the path - to help print it @@ -30,7 +30,7 @@ public: * @para int * */ - Vertex ( int xco, int yco ) : x(xco), y(yco) { + Vertex ( double xco, double yco ) : x(xco), y(yco) { reset(); } private: @@ -104,6 +104,7 @@ public: Graph() {} ~Graph(); + void addVertex (int key, double x, double y); void addEdge (int from, int to, double cost); void printPath (int to) const; void unweighted (int from); graf.h 7fac74fbf49cdde2b2a5082da85a977f5457aa24 Pawel Ptaszynski pptaszynski@gmail.com http://github.com/pptaszynski/aisdi-graf/commit/34248a334ccae0c4a340c0468e5bf9b9692c1028 34248a334ccae0c4a340c0468e5bf9b9692c1028 2008-06-11T18:24:48-07:00 2008-06-11T18:24:48-07:00 Added addVertex method. Changed type of x and y fields in Vertex class, so it fits the specification 7441e0efb87d8c430d2788f5abd2cd5185ced91e Pawel Ptaszynski pptaszynski@gmail.com