Merge branch 'quick-fixes' into development

Author: baatochan

DirectedGraph.cpp

@@ -20,7 +20,7 @@ std::string DirectedGraph::getAvailableAlgorithms() {
 	return output;
 }
 
-void DirectedGraph::generate(int numberOfVertices, int density) {
+void DirectedGraph::generate(int numberOfVertices, int density, int range) {
 	double dens = (double)density / 100;
 	dens *= numberOfVertices * (numberOfVertices - 1);
 	int numberOfEdges = round(dens);
@@ -42,7 +42,7 @@ void DirectedGraph::generate(int numberOfVertices, int density) {
 	std::uniform_int_distribution<int> randomVertex(0, numberOfVertices - 1);
 	// std::uniform_int_distribution<int> randomEdge(0, numberOfEdges - 1);
 	// std::uniform_int_distribution<int> randomValue(1, 15);
-	std::uniform_int_distribution<int> randomValue(1, INT32_MAX);
+	std::uniform_int_distribution<int> randomValue(1, range);
 
 	int beginningVertex = 0;
 	int endVertex = 0;

DirectedGraph.h

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

Graph.h

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

Program.cpp

@@ -22,6 +22,7 @@ void Program::start() {
 	string list;
 	char index;
 	string result;
+	int range;
 
 	do {
 		printGraphTypeSelect();
@@ -82,8 +83,14 @@ void Program::start() {
 						cin.ignore(numeric_limits<streamsize>::max(), '\n');
 						cerr << "Bledna wartosc! Podaj gestosc grafu: ";
 					}
+					cout << "Wagi krawedzi beda generowane z zakresu [1, max_value]. Podaj maksymalna wartosc: ";
+					while (!(cin >> range)) {
+						cin.clear();
+						cin.ignore(numeric_limits<streamsize>::max(), '\n');
+						cerr << "Bledna wartosc! Podaj maksymalna wartosc: : ";
+					}
 
-					graph->generate(numberOfVerticles, density);
+					graph->generate(numberOfVerticles, density, range);
 					break;
 
 				case '3': // wyswietl macierz

UndirectedGraph.cpp

@@ -22,7 +22,7 @@ std::string UndirectedGraph::getAvailableAlgorithms() {
 	return output;
 }
 
-void UndirectedGraph::generate(int numberOfVertices, int density) {
+void UndirectedGraph::generate(int numberOfVertices, int density, int range) {
 	double dens = (double)density / 100;
 	dens *= numberOfVertices * (numberOfVertices - 1);
 	dens /= 2;
@@ -45,7 +45,7 @@ void UndirectedGraph::generate(int numberOfVertices, int density) {
 	std::uniform_int_distribution<int> randomVertex(0, numberOfVertices - 1);
 	// std::uniform_int_distribution<int> randomEdge(0, numberOfEdges - 1);
 	// std::uniform_int_distribution<int> randomValue(1, 15);
-	std::uniform_int_distribution<int> randomValue(1, INT32_MAX);
+	std::uniform_int_distribution<int> randomValue(1, range);
 
 	int beginningVertex = 0;
 	int endVertex = 0;
@@ -266,6 +266,7 @@ string UndirectedGraph::primsAlgorithmOnList() {
 		foundVertices.push_back(edgeEnd);
 
 		minimumSpanningTree[vertexID].push_front({edgeEnd, edgeValue});
+		minimumSpanningTree[edgeEnd].push_front({vertexID, edgeValue});
 
 		vertexID = edgeEnd;
 		j++;

UndirectedGraph.h

@@ -14,7 +14,7 @@ class UndirectedGraph : public Graph {
 
 	std::string getAvailableAlgorithms() override;
 
-	void generate(int numberOfVertices, int density) override;
+	void generate(int numberOfVertices, int density, int range) override;
 
 	std::string runAlgorithm(char index, char arg1, int arg2, int arg3) override;