Fix Dijkstra's algorithm

baatochan · baatochan · commit 93d4be61fca6 · 2018-05-21T00:56:03.000+02:00
diff --git a/DirectedGraph.cpp b/DirectedGraph.cpp
@@ -177,11 +177,11 @@ std::string DirectedGraph::dijkstrasAlgorithmOnMatrix(int beginVertex, int endVe
 		unsigned long currentLength = pathLength[currentVertex];
 
 		for (auto& row : incidenceMatrix) {
-			if (row[beginVertex] > 0) {
+			if (row[currentVertex] > 0) {
 				for (int j = 0; j < numberOfVertices; j++) {
 					if (row[j] < 0) {
-						if (pathLength[j] > currentLength + row[beginVertex]) {
-							pathLength[j] = currentLength + row[beginVertex];
+						if (pathLength[j] > currentLength + row[currentVertex]) {
+							pathLength[j] = currentLength + row[currentVertex];
 							previousVertex[j] = currentVertex;
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -177,11 +177,11 @@ std::string DirectedGraph::dijkstrasAlgorithmOnMatrix(int beginVertex, int endVe`
`177`	`177`	`unsigned long currentLength = pathLength[currentVertex];`
`178`	`178`
`179`	`179`	`for (auto& row : incidenceMatrix) {`
`180`		`- if (row[beginVertex] > 0) {`
	`180`	`+ if (row[currentVertex] > 0) {`
`181`	`181`	`for (int j = 0; j < numberOfVertices; j++) {`
`182`	`182`	`if (row[j] < 0) {`
`183`		`- if (pathLength[j] > currentLength + row[beginVertex]) {`
`184`		`- pathLength[j] = currentLength + row[beginVertex];`
	`183`	`+ if (pathLength[j] > currentLength + row[currentVertex]) {`
	`184`	`+ pathLength[j] = currentLength + row[currentVertex];`
`185`	`185`	`previousVertex[j] = currentVertex;`
`186`	`186`	`}`
`187`	`187`	`}`