Merge branch 'dijkstras-fix'

Author: baatochan

DirectedGraph.cpp

@@ -118,7 +118,7 @@ void DirectedGraph::test() {
 				path = "..\\wyniki\\";
 				path += to_string(time(0));
 				path += "-gSkierowany-algorytmDijkstry-n" + to_string(numberOfElements[i]) + "-g" +
-				        to_string(density[j]) + "-r" + representationType[k] + ".txt";
+						to_string(density[j]) + "-r" + representationType[k] + ".txt";
 
 				cout << "Test - Graf: Skierowany - Algorytm: Dijkstry - Ilosc elem: " << numberOfElements[i] << " - Gestosc: " << density[j] << " - Reprezentacja: " << representationType[k] << endl;
 
@@ -289,25 +289,51 @@ std::string DirectedGraph::dijkstrasAlgorithmOnMatrix(int beginVertex, int endVe
 		}
 
 		if ((i != numberOfVertices - 1) && (shortestPathVertex == -1))
-			throw "Graf niespojny!";
+			break;
 
 		currentVertex = shortestPathVertex;
 
 	}
 
 	if (print) {
 		string output;
-		output = "Najkrotsza droga z wierzch.: " + to_string(beginVertex) + " do wierzch.: " + to_string(endVertex) +
-		         " wynosi: " + to_string(pathLength[endVertex]) + ".\n";
-		output += "Prowadzi nastepujaca droga: ";
+		shortestPath = pathLength[endVertex];
 
-		currentVertex = endVertex;
+		if (shortestPath == ULONG_MAX) {
+			output += "Droga pomiedzy wybranymi wierzcholkami nie istnieje!\n\n";
+		} else {
+			output =
+					"Najkrotsza droga z wierzch.: " + to_string(beginVertex) + " do wierzch.: " + to_string(endVertex) +
+					" wynosi: " + to_string(shortestPath) + ".\n";
+			output += "Prowadzi nastepujaca droga: ";
+
+			currentVertex = endVertex;
+
+			output += to_string(currentVertex);
+
+			while (currentVertex != beginVertex) {
+				currentVertex = previousVertex[currentVertex];
+				output += " <- " + to_string(currentVertex);
+			}
 
-		output += to_string(currentVertex);
+			output += "\n\n";
+		}
+
+		output += "Najkrotsza droga do innych wierzcholkow: \n";
+		output += "W | Dlugosc\n";
+		output += "------------------\n";
+		for (int i = 0; i < numberOfVertices; i++) {
+			shortestPath = pathLength[i];
+
+			output += to_string(i) + " | ";
+
+			if (shortestPath == ULONG_MAX) {
+				output += "BRAK";
+			} else {
+				output += to_string(shortestPath);
+			}
 
-		while (currentVertex != beginVertex) {
-			currentVertex = previousVertex[currentVertex];
-			output += " <- " + to_string(currentVertex);
+			output += "\n";
 		}
 
 		return output;
@@ -366,25 +392,51 @@ std::string DirectedGraph::dijkstrasAlgorithmOnList(int beginVertex, int endVert
 		}
 
 		if ((i != numberOfVertices - 1) && (shortestPathVertex == -1))
-			throw "Graf niespojny!";
+			break;
 
 		currentVertex = shortestPathVertex;
 
 	}
 
 	if (print) {
 		string output;
-		output = "Najkrotsza droga z wierzch.: " + to_string(beginVertex) + " do wierzch.: " + to_string(endVertex) +
-		         " wynosi: " + to_string(pathLength[endVertex]) + ".\n";
-		output += "Prowadzi nastepujaca droga: ";
+		shortestPath = pathLength[endVertex];
 
-		currentVertex = endVertex;
+		if (shortestPath == ULONG_MAX) {
+			output += "Droga pomiedzy wybranymi wierzcholkami nie istnieje!\n\n";
+		} else {
+			output =
+					"Najkrotsza droga z wierzch.: " + to_string(beginVertex) + " do wierzch.: " + to_string(endVertex) +
+					" wynosi: " + to_string(shortestPath) + ".\n";
+			output += "Prowadzi nastepujaca droga: ";
+
+			currentVertex = endVertex;
+
+			output += to_string(currentVertex);
+
+			while (currentVertex != beginVertex) {
+				currentVertex = previousVertex[currentVertex];
+				output += " <- " + to_string(currentVertex);
+			}
 
-		output += to_string(currentVertex);
+			output += "\n\n";
+		}
+
+		output += "Najkrotsza droga do innych wierzcholkow: \n";
+		output += "W | Dlugosc\n";
+		output += "------------------\n";
+		for (int i = 0; i < numberOfVertices; i++) {
+			shortestPath = pathLength[i];
+
+			output += to_string(i) + " | ";
+
+			if (shortestPath == ULONG_MAX) {
+				output += "BRAK";
+			} else {
+				output += to_string(shortestPath);
+			}
 
-		while (currentVertex != beginVertex) {
-			currentVertex = previousVertex[currentVertex];
-			output += " <- " + to_string(currentVertex);
+			output += "\n";
 		}
 
 		return output;