Merge branch 'development'

Looks like everything is done

Author: baatochan

.gitignore

@@ -47,3 +47,6 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+
+# Test results folder
+wyniki/

CMakeLists.txt

@@ -7,5 +7,5 @@ if (CMAKE_BUILD_TYPE MATCHES RELEASE)
 	set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
 endif (CMAKE_BUILD_TYPE MATCHES RELEASE)
 
-set(SOURCE_FILES main.cpp Program.cpp Graph.cpp DirectedGraph.cpp UndirectedGraph.cpp MinHeapElement.cpp)
+set(SOURCE_FILES main.cpp Program.cpp Graph.cpp DirectedGraph.cpp UndirectedGraph.cpp MinHeapElement.cpp Counter.cpp)
 add_executable(GraphRepresentationsAndAlgorithmsComparison ${SOURCE_FILES})

Counter.cpp

@@ -0,0 +1,24 @@
+//
+// Created by barto on 18.04.17.
+//
+
+#include "Counter.h"
+
+// public
+
+void Counter::startCounter() {
+	LARGE_INTEGER li;
+	if (!QueryPerformanceFrequency(&li))
+		std::cout << "QueryPerformanceFrequency failed!\n";
+
+	PCFreq = double(li.QuadPart) / 1000000.0;
+
+	QueryPerformanceCounter(&li);
+	CounterStart = li.QuadPart;
+}
+
+double Counter::getCounter() {
+	LARGE_INTEGER li;
+	QueryPerformanceCounter(&li);
+	return double(li.QuadPart - CounterStart) / PCFreq;
+}

Counter.h

@@ -0,0 +1,31 @@
+//
+// Created by barto on 18.04.17.
+//
+// Code written by Ramonster.
+// It was said in task description that we can use code from that link.
+//
+
+#ifndef DATASTRUCTURESSDIZO_COUNTER_H
+#define DATASTRUCTURESSDIZO_COUNTER_H
+
+
+#include <windows.h>
+#include <iostream>
+
+class Counter {
+private:
+
+	double PCFreq = 0.0;
+
+	__int64 CounterStart = 0;
+
+public:
+
+	void startCounter();
+
+	double getCounter();
+
+};
+
+
+#endif //DATASTRUCTURESSDIZO_COUNTER_H

DirectedGraph.cpp

@@ -5,7 +5,11 @@
 #include <cmath>
 #include <random>
 #include <climits>
+#include <iostream>
+#include <fstream>
+#include <ctime>
 #include "DirectedGraph.h"
+#include "Counter.h"
 
 using namespace std;
 
@@ -94,7 +98,88 @@ string DirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3) {
 }
 
 void DirectedGraph::test() {
+	int numberOfElements[5] = {50, 100, 150, 200, 250};
+	int density[4] = {25, 50, 75, 99};
+	char representationType[2] = {'M', 'L'};
+	int range = 1000;
+	int numberOfTests = 100;
+	string path;
+	double sumOfResults;
+	Counter counter;
+	double result = 0;
+	int beginVertex;
+	int endVertex;
+	
+	cout.setf(ios::fixed);
+
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 4; j++) {
+			for (int k = 0; k < 2; k++) {
+				path = "..\\wyniki\\";
+				path += to_string(time(0));
+				path += "-gSkierowany-algorytmDijkstry-n" + to_string(numberOfElements[i]) + "-g" +
+				        to_string(density[j]) + "-r" + representationType[k] + ".txt";
+
+				cout << "Test - Graf: Skierowany - Algorytm: Dijkstry - Ilosc elem: " << numberOfElements[i] << " - Gestosc: " << density[j] << " - Reprezentacja: " << representationType[k] << endl;
+
+				fstream file(path, fstream::out);
+
+				file.setf(ios::fixed);
+
+				sumOfResults = 0;
+
+				if (!file.is_open()) {
+					cerr << "Wyniki sie nie zapisza!!!" << endl;
+				}
+
+				for (int l = 0; l < numberOfTests; l++) {
+					generate(numberOfElements[i], density[j], range);
+
+					cout << "Test: " << l << " - ";
+
+					std::random_device rd;
+					std::mt19937 mt(rd());
+					std::uniform_int_distribution<int> randomVertex(0, numberOfElements[i] - 1);
+					beginVertex = randomVertex(mt);
+					endVertex = randomVertex(mt);
+
+					cout << "PW: " << beginVertex << ", KW: " << endVertex << " - ";
+
+					if (representationType[k] == 'M') {
+						try {
+							counter.startCounter();
+							dijkstrasAlgorithmOnMatrix(beginVertex, endVertex, false);
+							result = counter.getCounter();
+						} catch (const char* e) {
+							l--;
+							result = 0;
+						}
+					} else {
+						try {
+							counter.startCounter();
+							dijkstrasAlgorithmOnList(beginVertex, endVertex, false);
+							result = counter.getCounter();
+						} catch (const char* e) {
+							l--;
+							result = 0;
+						}
+					}
 
+					cout << "Czas: " << result << endl;
+					file << result << endl;
+
+					sumOfResults += result;
+				}
+
+				sumOfResults /= numberOfTests;
+
+				cout << "Srednia: " << sumOfResults << endl;
+				file << "Srednia" << endl << sumOfResults << endl;
+
+				file.close();
+			}
+		}
+	}
 }
 
 // protected

UndirectedGraph.cpp

@@ -5,8 +5,12 @@
 #include <random>
 #include <queue>
 #include <algorithm>
+#include <iostream>
+#include <fstream>
+#include <ctime>
 #include "UndirectedGraph.h"
 #include "MinHeapElement.h"
+#include "Counter.h"
 
 using namespace std;
 
@@ -96,7 +100,78 @@ string UndirectedGraph::runAlgorithm(char index, char arg1, int arg2, int arg3)
 }
 
 void UndirectedGraph::test() {
+	int numberOfElements[5] = {50, 100, 150, 200, 250};
+	int density[4] = {25, 50, 75, 99};
+	char representationType[2] = {'M', 'L'};
+	int range = 1000;
+	int numberOfTests = 100;
+	string path;
+	double sumOfResults;
+	Counter counter;
+	double result = 0;
 
+	cout.setf(ios::fixed);
+
+	for (int i = 0; i < 5; i++) {
+		for (int j = 0; j < 4; j++) {
+			for (int k = 0; k < 2; k++) {
+				path = "..\\wyniki\\";
+				path += to_string(time(0));
+				path += "-gNieskierowany-algorytmPrima-n" + to_string(numberOfElements[i]) + "-g" +
+				        to_string(density[j]) + "-r" + representationType[k] + ".txt";
+
+				cout << "Test - Graf: Nieskierowany - Algorytm: Prima - Ilosc elem: " << numberOfElements[i] << " - Gestosc: " << density[j] << " - Reprezentacja: " << representationType[k] << endl;
+
+				fstream file(path, fstream::out);
+
+				file.setf(ios::fixed);
+
+				sumOfResults = 0;
+
+				if (!file.is_open()) {
+					cerr << "Wyniki sie nie zapisza!!!" << endl;
+				}
+
+				for (int l = 0; l < numberOfTests; l++) {
+					generate(numberOfElements[i], density[j], range);
+
+					cout << "Test: " << l << " - ";
+
+					if (representationType[k] == 'M') {
+						try {
+							counter.startCounter();
+							primsAlgorithmOnMatrix(false);
+							result = counter.getCounter();
+						} catch (const char* e) {
+							l--;
+							result = 0;
+						}
+					} else {
+						try {
+							counter.startCounter();
+							primsAlgorithmOnList(false);
+							result = counter.getCounter();
+						} catch (const char* e) {
+							l--;
+							result = 0;
+						}
+					}
+
+					cout << "Czas: " << result << endl;
+					file << result << endl;
+
+					sumOfResults += result;
+				}
+
+				sumOfResults /= numberOfTests;
+
+				cout << "Srednia: " << sumOfResults << endl;
+				file << "Srednia" << endl << sumOfResults << endl;
+
+				file.close();
+			}
+		}
+	}
 }
 
 // protected