@@ -1,10 +1,12 @@ #include "graf.h" +using namespace std; + /** * Graph Destructor. Cleans the Vertex objects. * */ -Graph::~Graph() { + Graph::~Graph() { for(vertex_map::iterator i = vmap.begin(); i != vmap.end(); ++i) delete (*i).second; } @@ -17,7 +19,7 @@ Graph::~Graph() { * @param int * */ -void Graph::addVertex(unsigned int k, double x, double y) { +Vertex* Graph::addVertex(unsigned int k, double x, double y) { vertex_map::iterator i = vmap.find(k); if (i == vmap.end() ) { @@ -41,7 +43,7 @@ Vertex* Graph::getVertex(int v) { vertex_map::iterator i = vmap.find(v); if (i == vmap.end() ) { - Vertex *new_vert = new Vertex(v); + Vertex *new_vert = new Vertex(0.0, 0.0); vmap[ v ] = new_vert; return new_vert; } @@ -78,7 +80,7 @@ void Graph::clearAlg() { */ void Graph::printPath(const Vertex& to) const { if (to.prev != NULL) { - printPath(*from.prev); + printPath(*to.prev); cout << " to"; } cout << "(" << to.x << "," << to.y << ")"; @@ -90,16 +92,16 @@ void Graph::printPath(const Vertex& to) const { void Graph::printPath(int to) const { vertex_map::const_iterator i = vmap.find(to); if (i == vmap.end() ) - throw GraphException( "Destination vertex not found in the graph" ); + return; //throw GraphException( "Destination vertex not found in the graph" ); const Vertex& w = *(*i).second; - if (w.dist == INFINITY ) - cout << to; + if (w.dist == numeric_limits<double>::infinity() ) + std::cout << to; else { - cout << w.dist << " "; + std::cout << w.dist << " "; printPath(w); } - cout << endl; + std::cout << endl; } /** @@ -109,8 +111,8 @@ void Graph::printPath(int to) const { */ void Graph::unweighted(int from) { vertex_map::iterator i = vmap.find(from); - if (i == vmap.end() ) - throw GraphException(from + " isn't vertex in this Graph"); + if (i == vmap.end() ) return; + //throw GraphException(from + " isn't vertex in this Graph"); clearAlg(); Vertex *first = (*i).second; @@ -125,7 +127,7 @@ void Graph::unweighted(int from) { for (int i = 0; i < vadjs; ++i) { Edge e = v->adj[ i ]; Vertex *w = e.to; - if (w->dist == INFINITY) { + if (w->dist == numeric_limits<double>::infinity()) { w->dist = v->dist + 1; w->prev = v; q.push_back(w); @@ -144,33 +146,33 @@ void Graph::weighted(int from) { priority_queue<Path, vector<Path>, greater<Path> > pq; Path vrec; - vector_map::iterator i = vmap.find(from); + vertex_map::iterator i = vmap.find(from); if (i == vmap.end() ) - throw GraphException(from + " isn't a vertex in this graph"); + return; //throw GraphException(from + " isn't a vertex in this graph"); clearAlg(); Vertex *first = (*i).second; pq.push(Path(first, 0) ); - start->dist = 0; + first->dist = 0; int totalVs = vmap.size(); - for (int visitedVs = 0; visitedVs < totalVs; ++vistedVs) { + for (int visitedVs = 0; visitedVs < totalVs; ++visitedVs) { do { if (pq.empty() ) return; vrec = pq.top(); pq.pop(); - } while (vrec.to->scraatch != 0); + } while (vrec.to->scratch != 0); - Vertex *v vrec.dest; + Vertex *v = vrec.to; v->scratch = 1; int vadjs = v->adj.size(); for(int i = 0; i < vadjs; ++i) { Edge e = v->adj[ i ]; - Vertex *w = e.dest; + Vertex *w = e.to; double costvw = e.cost; if (costvw < 0) - throw GraphException("Edges can't have negative cost"); + //throw GraphException("Edges can't have negative cost"); if (w->dist > v->dist+costvw) { w->dist = v->dist + costvw; graf.cpp @@ -1,6 +1,8 @@ -#include <limits.h> +#include <math.h> +#include <limits> #include <fstream> #include <sstream> +#include <iostream> #include <map> #include <vector> #include <string> @@ -8,10 +10,13 @@ #include <functional> #include <list> +using namespace std; + /** * A Class representing a vertex of a graph * */ +class Edge; class Vertex { @@ -33,17 +38,17 @@ public: Vertex ( double xco, double yco ) : x(xco), y(yco) { reset(); } -private: + /** * Method to reset fields for the algorithm * */ void reset() { - dist = INFINITY; + dist = numeric_limits<double>::infinity(); prev = NULL; scratch = 0; } -} +}; /** * Class representing an edge in graph @@ -65,7 +70,7 @@ public: */ Edge( Vertex *d = 0, double c = 0.0 ) : to(d), cost(c) { } -} +}; /** * class for a priority queue for searching weighted shortest-path algorithm @@ -86,7 +91,7 @@ public: bool operator<(const Path& other) const { return cost < other.cost; } -} +}; /** * Graph class @@ -104,7 +109,7 @@ public: Graph() {} ~Graph(); - void addVertex (int key, double x, double y); + Vertex* addVertex (unsigned int key, double x, double y); void addEdge (int from, int to, double cost); void printPath (int to) const; void unweighted (int from); @@ -124,5 +129,5 @@ private: vertex_map vmap; -} +}; graf.h @@ -1,4 +1,5 @@ #include "graf.h" +using namespace std; int main(int argc, char* argv[] ) { @@ -14,7 +15,7 @@ int main(int argc, char* argv[] ) } Graph graph; - cout << "Reading graph from file..." >> endl; + cout << "Reading graph from file..." << endl; string curr_line; //Reead vertices @@ -26,7 +27,7 @@ int main(int argc, char* argv[] ) ++lcount; } unsigned int vertidx = 0; - while (in_file.gcount > 0) { + while (in_file.gcount() > 0) { double vx, vy; istringstream buff(line); @@ -47,7 +48,7 @@ int main(int argc, char* argv[] ) if (!getline(in_file, line).eof() ) { ++lcount; } - while (in_file.gcount > 0) { + while (in_file.gcount() > 0) { unsigned int v, w; double cost; istringstream buff(line); @@ -57,7 +58,7 @@ int main(int argc, char* argv[] ) if (buff.fail() ) cerr << "Incorrect line in input file: " << line << endl << "On line :" << lcount << endl; else { - graph.addEdge(v, y, cost); + graph.addEdge(v, w, cost); ++vertidx; } if (!getline(in_file, line).eof() ) { @@ -69,7 +70,7 @@ int main(int argc, char* argv[] ) if (!getline(in_file, line).eof() ) { ++lcount; } - while (in_file.gcount > 0) { + while (in_file.gcount() > 0) { unsigned int from, to; istringstream buff(line); buff >> from; @@ -77,13 +78,13 @@ int main(int argc, char* argv[] ) if (buff.fail() ) cerr << "Incorrect line in input file: " << line << endl << "On line :" << lcount << endl; else { - try { + //try { graph.unweighted(from); graph.printPath(to); - } - catch (const GraphException& e) { - cerr << e.toString( ) << endl; - } + //} + //catch (const GraphException& e) { + // cerr << e.toString( ) << endl; + //} } if (!getline(in_file, line).eof() ) { ++lcount; main.cpp e58b8e9842e5b8f9fb464ff26977b3921cb5ec34 Pawel Ptaszynski pptaszynski@gmail.com http://github.com/pptaszynski/aisdi-graf/commit/786bb80298bb597bc1f3b8520d774cfe8446773e 786bb80298bb597bc1f3b8520d774cfe8446773e 2008-06-11T20:01:34-07:00 2008-06-11T20:01:34-07:00 Removed errors pointed by compiler. Outcommented exception handling. f3a81ef39f51f5e3d9a7d8eab68285308f91c372 Pawel Ptaszynski pptaszynski@gmail.com