Merge branch 'fix-args' into development

Author: baatochan

DirectedGraph.cpp

@@ -11,7 +11,7 @@ DirectedGraph::DirectedGraph() : Graph("Graf skierowany", 1) {}
 std::string DirectedGraph::getAvailableAlgorithms() {
 	std::string output = "";
 
-	output += "5. Algorytm Dijkstry (SP)\n";
+	output += "6. Algorytm Dijkstry (SP) [arg1 <- wierzch. pocz.; arg2 <- wierzch. konc.]\n";
 
 	return output;
 }
@@ -24,7 +24,7 @@ void DirectedGraph::generate(int numberOfVertices, int density) {
 
 }
 
-void DirectedGraph::runAlgorithm(int index) {
+void DirectedGraph::runAlgorithm(int index, int arg1, int arg2) {
 
 }
 

DirectedGraph.h

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

Program.cpp

@@ -20,6 +20,7 @@ void Program::start() {
 	int density;
 	string matrix;
 	string list;
+	char index;
 
 	do {
 		printGraphTypeSelect();
@@ -96,45 +97,16 @@ void Program::start() {
 					cout << endl;
 					break;
 
-				case '5': // algorytm 1
-					if (graph->getNumberOfAvailableAlgorithms() > 0) {
-						graph->runAlgorithm(1);
-					} else {
-						cout << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
-					}
-					break;
-
-				case '6': // algorytm 2
-					if (graph->getNumberOfAvailableAlgorithms() > 1) {
-						graph->runAlgorithm(2);
-					} else {
-						cout << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
-					}
-					break;
-
-				case '7': // algorytm 3
-					if (graph->getNumberOfAvailableAlgorithms() > 2) {
-						graph->runAlgorithm(3);
-					} else {
-						cout << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
-					}
-					break;
-
-				case '8': // algorytm 4
-					if (graph->getNumberOfAvailableAlgorithms() > 3) {
-						graph->runAlgorithm(4);
-					} else {
-						cout << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
-					}
+				case '5':
+					graph->test();
 					break;
 
-				case '9': // algorytm 5
-					if (graph->getNumberOfAvailableAlgorithms() > 4) {
-						graph->runAlgorithm(5);
-					} else {
-						cout << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
-					}
-					break;
+				case '6':
+				case '7':
+				case '8':
+				case '9':
+					index = option2 - 53;
+					runAlgorithm(index);
 
 				case '0':
 					break;
@@ -172,10 +144,33 @@ void Program::printGraphMenu() {
 	cout << "2. Generuj losowo" << endl;
 	cout << "3. Wyswietl graf jako macierz" << endl;
 	cout << "4. Wyswietl graf jako lista" << endl;
+	cout << "5. Wykonaj testy" << endl;
 
 	string availableAlgorithms = graph->getAvailableAlgorithms();
 	cout << availableAlgorithms;
 
 	cout << "0. Wyjscie" << endl;
 	cout << "Podaj opcje:";
 }
+
+void Program::runAlgorithm(char index) {
+	int arg1;
+	int arg2;
+	if (graph->getNumberOfAvailableAlgorithms() > index - 1) {
+		cout<<"Podaj argument 1: ";
+		while (!(cin >> arg1)) {
+			cin.clear();
+			cin.ignore(numeric_limits<streamsize>::max(), '\n');
+			cout << "Bledna wartosc! Podaj argument 1: ";
+		}
+		cout<<"Podaj argument 2: ";
+		while (!(cin >> arg2)) {
+			cin.clear();
+			cin.ignore(numeric_limits<streamsize>::max(), '\n');
+			cout << "Bledna wartosc! Podaj argument 2: ";
+		}
+		graph->runAlgorithm(index, arg1, arg2);
+	} else {
+		cout << "Nie ma takiej opcji, wybierz jeszcze raz." << endl;
+	}
+}

Program.h

@@ -20,6 +20,8 @@ class Program {
 	void printGraphTypeSelect();
 
 	void printGraphMenu();
+
+	void runAlgorithm(char index);
 };
 
 

UndirectedGraph.cpp

@@ -11,7 +11,7 @@ UndirectedGraph::UndirectedGraph() : Graph("Graf nieskierowany", 1) {}
 std::string UndirectedGraph::getAvailableAlgorithms() {
 	std::string output = "";
 
-	output += "5. Algorytm Prima (MST)\n";
+	output += "6. Algorytm Prima (MST) [arg1 <- 0; arg2 <- 0]\n";
 
 	return output;
 }
@@ -24,7 +24,7 @@ void UndirectedGraph::generate(int numberOfVertices, int density) {
 
 }
 
-void UndirectedGraph::runAlgorithm(int index) {
+void UndirectedGraph::runAlgorithm(int index, int arg1, int arg2) {
 
 }
 

UndirectedGraph.h

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