Merge branch 'fix-args-again' into development

Author: baatochan

DirectedGraph.cpp

@@ -15,7 +15,7 @@ DirectedGraph::DirectedGraph() : Graph("Graf skierowany", 1) {}
 std::string DirectedGraph::getAvailableAlgorithms() {
 	std::string output = "";
 
-	output += "6. Algorytm Dijkstry (SP) [arg1 <- wierzch. pocz.; arg2 <- wierzch. konc.]\n";
+	output += "6. Algorytm Dijkstry (SP) [arg1 <- rodzaj reprezentacji (m - macierz, l - lista); arg2 <- wierzch. pocz.; arg3 <- wierzch. konc.]\n";
 
 	return output;
 }
@@ -74,7 +74,7 @@ void DirectedGraph::generate(int numberOfVertices, int density) {
 
 }
 
-void DirectedGraph::runAlgorithm(int index, int arg1, int arg2) {
+void DirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
 
 }
 

DirectedGraph.h

@@ -16,7 +16,7 @@ class DirectedGraph : public Graph {
 
 	void generate(int numberOfVertices, int density) override;
 
-	void runAlgorithm(int index, int arg1, int arg2) override;
+	void 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(int index, int arg1, int arg2)= 0;
+	virtual void runAlgorithm(char index, char arg1, int arg2, int arg3)= 0;
 
 	virtual void test()= 0;
 

Program.cpp

@@ -110,7 +110,11 @@ void Program::start() {
 				case '8':
 				case '9':
 					index = option2 - 53;
-					runAlgorithm(index);
+					try {
+						runAlgorithm(index);
+					} catch (const char* e) {
+						cerr << e << endl;
+					}
 
 				case '0':
 					break;
@@ -136,7 +140,7 @@ void Program::printGraphTypeSelect() {
 	cout << "1. Graf nieskierowany" << endl;
 	cout << "2. Graf skierowany" << endl;
 	cout << "0. Wyjscie" << endl;
-	cout << "Podaj opcje:";
+	cout << "Podaj opcje: ";
 }
 
 void Program::printGraphMenu() {
@@ -156,26 +160,45 @@ void Program::printGraphMenu() {
 	cout << availableAlgorithms;
 
 	cout << "0. Wyjscie" << endl;
-	cout << "Podaj opcje:";
+	cout << "Podaj opcje: ";
 }
 
 void Program::runAlgorithm(char index) {
-	int arg1;
+	string arg1s;
+	char arg1;
 	int arg2;
+	int arg3;
+	
 	if (graph->getNumberOfAvailableAlgorithms() > index - 1) {
 		cout << "Podaj argument 1: ";
-		while (!(cin >> arg1)) {
-			cin.clear();
-			cin.ignore(numeric_limits<streamsize>::max(), '\n');
+		cin >> arg1s;
+		while (arg1s != "l" || arg1s != "L" || arg1s != "m" || arg1s != "M") {
 			cerr << "Bledna wartosc! Podaj argument 1: ";
+			cin >> arg1s;
 		}
+
+		if (arg1s == "m" || arg1s == "M")
+			arg1 = 0; // reprezentacja macierzowa
+		else if (arg1s == "l" || arg1s == "L")
+			arg1 = 1; // reprezentacja listowa
+		else
+			throw "Nieznany blad!"; // should never be thrown
+
 		cout << "Podaj argument 2: ";
 		while (!(cin >> arg2)) {
 			cin.clear();
 			cin.ignore(numeric_limits<streamsize>::max(), '\n');
 			cerr << "Bledna wartosc! Podaj argument 2: ";
 		}
-		graph->runAlgorithm(index, arg1, arg2);
+
+		cout << "Podaj argument 3: ";
+		while (!(cin >> arg3)) {
+			cin.clear();
+			cin.ignore(numeric_limits<streamsize>::max(), '\n');
+			cerr << "Bledna wartosc! Podaj argument 3: ";
+		}
+
+		graph->runAlgorithm(index, arg1, arg2, 0);
 	} else {
 		cerr << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
 	}

UndirectedGraph.cpp

@@ -14,7 +14,7 @@ UndirectedGraph::UndirectedGraph() : Graph("Graf nieskierowany", 1) {}
 std::string UndirectedGraph::getAvailableAlgorithms() {
 	std::string output = "";
 
-	output += "6. Algorytm Prima (MST) [arg1 <- 0; arg2 <- 0]\n";
+	output += "6. Algorytm Prima (MST) [arg1 <- rodzaj reprezentacji (m - macierz, l - lista); arg2 <- 0; arg3 <- 0]\n";
 
 	return output;
 }
@@ -74,7 +74,7 @@ void UndirectedGraph::generate(int numberOfVertices, int density) {
 	}
 }
 
-void UndirectedGraph::runAlgorithm(int index, int arg1, int arg2) {
+void UndirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
 
 }
 

UndirectedGraph.h

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