Merge branch 'deny-loop' into development

Author: baatochan

DirectedGraph.cpp

@@ -47,6 +47,11 @@ void DirectedGraph::loadRawDataToMatrix(std::vector<int> rawData) {
 		int edgeEnd = rawData[i++];
 		int edgeValue = rawData[i++];
 
+		if (edgeBeginning == edgeEnd) {
+			incidenceMatrix.clear();
+			throw "Petle sa nieakceptowane!";
+		}
+
 		incidenceMatrix[j][edgeEnd] = edgeValue * -1;
 		incidenceMatrix[j][edgeBeginning] = edgeValue;
 	}
@@ -65,6 +70,11 @@ void DirectedGraph::loadRawDataToList(std::vector<int> rawData) {
 		int edgeEnd = rawData[i++];
 		int edgeValue = rawData[i++];
 
+		if (edgeBeginning == edgeEnd) {
+			incidenceMatrix.clear();
+			throw "Petle sa nieakceptowane!";
+		}
+
 		adjacencyList[edgeBeginning].push_front({edgeEnd, edgeValue});
 	}
 }

Graph.cpp

@@ -137,7 +137,7 @@ vector<int> Graph::loadRawDataFrom(string path) {
 	fstream file(path, ios::in);
 
 	if (!file.is_open())
-		return returnIntVector; // should throw an error
+		throw "Plik nie istnieje, badz zablokowany dostep!";
 
 	string temp = "";
 	while (file >> temp) {

UndirectedGraph.cpp

@@ -47,6 +47,11 @@ void UndirectedGraph::loadRawDataToMatrix(vector<int> rawData) {
 		int edgeEnd = rawData[i++];
 		int edgeValue = rawData[i++];
 
+		if (edgeBeginning == edgeEnd) {
+			incidenceMatrix.clear();
+			throw "Petle sa nieakceptowane!";
+		}
+
 		incidenceMatrix[j][edgeEnd] = edgeValue;
 		incidenceMatrix[j][edgeBeginning] = edgeValue;
 	}
@@ -65,11 +70,12 @@ void UndirectedGraph::loadRawDataToList(std::vector<int> rawData) {
 		int edgeEnd = rawData[i++];
 		int edgeValue = rawData[i++];
 
-		adjacencyList[edgeBeginning].push_front({edgeEnd, edgeValue});
-
-		if (edgeBeginning == edgeEnd)
-			continue;
+		if (edgeBeginning == edgeEnd) {
+			incidenceMatrix.clear();
+			throw "Petle sa nieakceptowane!";
+		}
 
+		adjacencyList[edgeBeginning].push_front({edgeEnd, edgeValue});
 		adjacencyList[edgeEnd].push_front({edgeBeginning, edgeValue});
 	}
 }