Merge branch 'generate-graphs' into development

Author: baatochan

DirectedGraph.cpp

@@ -2,6 +2,8 @@
 // Created by barto on 19.05.18.
 //
 
+#include <cmath>
+#include <random>
 #include "DirectedGraph.h"
 
 using namespace std;
@@ -19,6 +21,56 @@ std::string DirectedGraph::getAvailableAlgorithms() {
 }
 
 void DirectedGraph::generate(int numberOfVertices, int density) {
+	double dens = (double)density / 100;
+	dens *= numberOfVertices * (numberOfVertices - 1);
+	int numberOfEdges = round(dens);
+
+	// prepare matrix and list
+	incidenceMatrix.clear();
+	adjacencyList.clear();
+
+	incidenceMatrix.resize(numberOfEdges);
+	adjacencyList.resize(numberOfVertices);
+
+	for (auto& row : incidenceMatrix) {
+		row.assign(numberOfVertices, 0);
+	}
+
+	// declare rands
+	std::random_device rd;
+	std::mt19937 mt(rd());
+	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);
+
+	int beginningVertex = 0;
+	int endVertex = 0;
+	int value;
+	bool edgeBeginningNotAvailable = true;
+	bool edgeEndNotAvailable = true;
+
+	// generate rand edges
+	for (int i = 0; i < numberOfEdges; i++) {
+		// random beggining
+		edgeBeginningNotAvailable = true;
+		while (edgeBeginningNotAvailable){
+			beginningVertex = randomVertex(mt);
+			edgeBeginningNotAvailable = !edgeBeginningAvailable(beginningVertex);
+		};
+		// random end
+		edgeEndNotAvailable = true;
+		while (edgeEndNotAvailable){
+			endVertex = randomVertex(mt);
+			edgeEndNotAvailable = !edgeEndAvailable(beginningVertex, endVertex);
+		};
+
+		value = randomValue(mt);
+
+		adjacencyList[beginningVertex].push_front({endVertex, value});
+		incidenceMatrix[i][beginningVertex] = value;
+		incidenceMatrix[i][endVertex] = -1 * value;
+	}
 
 }
 

DirectedGraph.h

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

Graph.cpp

@@ -151,3 +151,25 @@ vector<int> Graph::loadRawDataFrom(string path) {
 
 	return returnIntVector;
 }
+
+bool Graph::edgeBeginningAvailable(int vertex) {
+	int i = 0;
+	for (auto& v : adjacencyList[vertex]) {
+		i++;
+	}
+
+	if (i < (adjacencyList.size() - 1)) return true;
+	return false;
+}
+
+bool Graph::edgeEndAvailable(int beginning, int end) {
+	if (beginning == end) {
+		return false;
+	}
+
+	for (auto& v : adjacencyList[beginning]) {
+		if (v.edgeEnd == end)
+			return false;
+	}
+	return true;
+}

Graph.h

@@ -56,6 +56,9 @@ class Graph {
 	virtual void loadRawDataToMatrix(std::vector<int> rawData)= 0;
 	virtual void loadRawDataToList(std::vector<int> rawData)= 0;
 
+	bool edgeBeginningAvailable(int vertex);
+	bool edgeEndAvailable(int beginning, int end);
+
 };
 
 

UndirectedGraph.cpp

@@ -2,6 +2,7 @@
 // Created by barto on 19.05.18.
 //
 
+#include <random>
 #include "UndirectedGraph.h"
 
 using namespace std;
@@ -19,7 +20,58 @@ std::string UndirectedGraph::getAvailableAlgorithms() {
 }
 
 void UndirectedGraph::generate(int numberOfVertices, int density) {
+	double dens = (double)density / 100;
+	dens *= numberOfVertices * (numberOfVertices - 1);
+	dens /= 2;
+	int numberOfEdges = round(dens);
 
+	// prepare matrix and list
+	incidenceMatrix.clear();
+	adjacencyList.clear();
+
+	incidenceMatrix.resize(numberOfEdges);
+	adjacencyList.resize(numberOfVertices);
+
+	for (auto& row : incidenceMatrix) {
+		row.assign(numberOfVertices, 0);
+	}
+
+	// declare rands
+	std::random_device rd;
+	std::mt19937 mt(rd());
+	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);
+
+	int beginningVertex = 0;
+	int endVertex = 0;
+	int value;
+	bool edgeBeginningNotAvailable = true;
+	bool edgeEndNotAvailable = true;
+
+	// generate rand edges
+	for (int i = 0; i < numberOfEdges; i++) {
+		// random beggining
+		edgeBeginningNotAvailable = true;
+		while (edgeBeginningNotAvailable) {
+			beginningVertex = randomVertex(mt);
+			edgeBeginningNotAvailable = !edgeBeginningAvailable(beginningVertex);
+		};
+		// random end
+		edgeEndNotAvailable = true;
+		while (edgeEndNotAvailable) {
+			endVertex = randomVertex(mt);
+			edgeEndNotAvailable = !edgeEndAvailable(beginningVertex, endVertex);
+		};
+
+		value = randomValue(mt);
+
+		adjacencyList[beginningVertex].push_front({endVertex, value});
+		adjacencyList[endVertex].push_front({beginningVertex, value});
+		incidenceMatrix[i][beginningVertex] = value;
+		incidenceMatrix[i][endVertex] = value;
+	}
 }
 
 void UndirectedGraph::runAlgorithm(int index, int arg1, int arg2) {