Make all algorithms return string

Author: baatochan

DirectedGraph.cpp

@@ -74,7 +74,7 @@ void DirectedGraph::generate(int numberOfVertices, int density) {
 
 }
 
-void DirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
+string DirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
 	if (index == 1) {
 		if (arg1 == 0) {
 			dijkstrasAlgorithmOnMatrix();

DirectedGraph.h

@@ -16,7 +16,7 @@ class DirectedGraph : public Graph {
 
 	void generate(int numberOfVertices, int density) override;
 
-	void runAlgorithm(char index, char arg1, int arg2, int arg3) override;
+	std::string runAlgorithm(char index, char arg1, int arg2, int arg3) override;
 
 	void test() override;
 

Graph.h

@@ -45,7 +45,7 @@ class Graph {
 
 	virtual void generate(int numberOfVertices, int density)= 0;
 
-	virtual void runAlgorithm(char index, char arg1, int arg2, int arg3)= 0;
+	virtual std::string runAlgorithm(char index, char arg1, int arg2, int arg3)= 0;
 
 	virtual void test()= 0;
 

Program.cpp

@@ -21,6 +21,7 @@ void Program::start() {
 	string matrix;
 	string list;
 	char index;
+	string result;
 
 	do {
 		printGraphTypeSelect();
@@ -111,7 +112,8 @@ void Program::start() {
 				case '9':
 					index = option2 - 53;
 					try {
-						runAlgorithm(index);
+						result = runAlgorithm(index);
+						cout << result << endl;
 					} catch (const char* e) {
 						cerr << e << endl;
 					}
@@ -163,12 +165,14 @@ void Program::printGraphMenu() {
 	cout << "Podaj opcje: ";
 }
 
-void Program::runAlgorithm(char index) {
+string Program::runAlgorithm(char index) {
 	string arg1s;
 	char arg1;
 	int arg2;
 	int arg3;
 
+	string output;
+
 	if (graph->getNumberOfAvailableAlgorithms() > index - 1) {
 		cout << "Podaj argument 1: ";
 		cin >> arg1s;
@@ -198,8 +202,10 @@ void Program::runAlgorithm(char index) {
 			cerr << "Bledna wartosc! Podaj argument 3: ";
 		}
 
-		graph->runAlgorithm(index, arg1, arg2, arg3);
+		output = graph->runAlgorithm(index, arg1, arg2, arg3);
 	} else {
 		cerr << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
 	}
+
+	return output;
 }

Program.h

@@ -21,7 +21,7 @@ class Program {
 
 	void printGraphMenu();
 
-	void runAlgorithm(char index);
+	std::string runAlgorithm(char index);
 };
 
 

UndirectedGraph.cpp

@@ -77,18 +77,22 @@ void UndirectedGraph::generate(int numberOfVertices, int density) {
 	}
 }
 
-void UndirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
+string UndirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
+	string output;
+
 	if (index == 1) {
 		if (arg1 == 0) {
-			primsAlgorithmOnMatrix();
+			output = primsAlgorithmOnMatrix();
 		} else if (arg1 == 1) {
-			primsAlgorithmOnList();
+			output = primsAlgorithmOnList();
 		} else {
 			throw "Nieznany blad!"; // should never be thrown
 		}
 	} else {
 		throw "Algorytm nie istnieje!";
 	}
+
+	return  output;
 }
 
 void UndirectedGraph::test() {
@@ -218,6 +222,6 @@ string UndirectedGraph::primsAlgorithmOnMatrix() {
 	return output;
 }
 
-void UndirectedGraph::primsAlgorithmOnList() {
+string UndirectedGraph::primsAlgorithmOnList() {
 	throw "Algorytm jeszcze nie zaimplementowany!";
 }

UndirectedGraph.h

@@ -16,7 +16,7 @@ class UndirectedGraph : public Graph {
 
 	void generate(int numberOfVertices, int density) override;
 
-	void runAlgorithm(char index, char arg1, int arg2, int arg3) override;
+	std::string runAlgorithm(char index, char arg1, int arg2, int arg3) override;
 
 	void test() override;
 
@@ -26,7 +26,7 @@ class UndirectedGraph : public Graph {
 
 private:
 	std::string primsAlgorithmOnMatrix();
-	void primsAlgorithmOnList();
+	std::string primsAlgorithmOnList();
 
 };