Merge branch 'base-for-algoritms' into development

Author: baatochan

DirectedGraph.cpp

@@ -75,14 +75,24 @@ void DirectedGraph::generate(int numberOfVertices, int density) {
 }
 
 void DirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
-
+	if (index == 1) {
+		if (arg1 == 0) {
+			dijkstrasAlgorithmOnMatrix();
+		} else if (arg1 == 1) {
+			dijkstrasAlgorithmOnList();
+		} else {
+			throw "Nieznany blad!"; // should never be thrown
+		}
+	} else {
+		throw "Algorytm nie istnieje!";
+	}
 }
 
 void DirectedGraph::test() {
 
 }
 
-// private
+// protected
 
 void DirectedGraph::loadRawDataToMatrix(std::vector<int> rawData) {
 	incidenceMatrix.clear();
@@ -130,3 +140,13 @@ void DirectedGraph::loadRawDataToList(std::vector<int> rawData) {
 		adjacencyList[edgeBeginning].push_front({edgeEnd, edgeValue});
 	}
 }
+
+// private
+
+void DirectedGraph::dijkstrasAlgorithmOnMatrix() {
+	throw "Algorytm jeszcze nie zaimplementowany!";
+}
+
+void DirectedGraph::dijkstrasAlgorithmOnList() {
+	throw "Algorytm jeszcze nie zaimplementowany!";
+}

DirectedGraph.h

@@ -23,6 +23,11 @@ class DirectedGraph : public Graph {
 protected:
 	void loadRawDataToMatrix(std::vector<int> rawData) override ;
 	void loadRawDataToList(std::vector<int> rawData) override ;
+
+private:
+	void dijkstrasAlgorithmOnMatrix();
+	void dijkstrasAlgorithmOnList();
+
 };
 
 

UndirectedGraph.cpp

@@ -75,14 +75,24 @@ void UndirectedGraph::generate(int numberOfVertices, int density) {
 }
 
 void UndirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
-
+	if (index == 1) {
+		if (arg1 == 0) {
+			primsAlgorithmOnMatrix();
+		} else if (arg1 == 1) {
+			primsAlgorithmOnList();
+		} else {
+			throw "Nieznany blad!"; // should never be thrown
+		}
+	} else {
+		throw "Algorytm nie istnieje!";
+	}
 }
 
 void UndirectedGraph::test() {
 
 }
 
-// private
+// protected
 
 void UndirectedGraph::loadRawDataToMatrix(vector<int> rawData) {
 	incidenceMatrix.clear();
@@ -131,3 +141,13 @@ void UndirectedGraph::loadRawDataToList(std::vector<int> rawData) {
 		adjacencyList[edgeEnd].push_front({edgeBeginning, edgeValue});
 	}
 }
+
+// private
+
+void UndirectedGraph::primsAlgorithmOnMatrix() {
+	throw "Algorytm jeszcze nie zaimplementowany!";
+}
+
+void UndirectedGraph::primsAlgorithmOnList() {
+	throw "Algorytm jeszcze nie zaimplementowany!";
+}

UndirectedGraph.h

@@ -24,6 +24,10 @@ class UndirectedGraph : public Graph {
 	void loadRawDataToMatrix(std::vector<int> rawData) override ;
 	void loadRawDataToList(std::vector<int> rawData) override ;
 
+private:
+	void primsAlgorithmOnMatrix();
+	void primsAlgorithmOnList();
+
 };