Added new mock file

CMakeLists.txt

@@ -6,7 +6,9 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set (CMAKE_PREFIX_PATH "C:\\Qt\\5.15.2\\msvc2019_64\\lib\\cmake")
 
 include_directories(src)
+include_directories(tst)
+include_directories(lib/include(GoogleTest))
 
 add_subdirectory(src)
 add_subdirectory(tst)
-add_subdirectory(lib/googletest)
+add_subdirectory(lib/googletest)

Readme.md

@@ -1,49 +1,40 @@
 <h1>Geometric Algorithms</h1>
 
-<h2>Purpose of this project</h2>
+<h2>Tech stack</h2>
 
--Learn geometric algorithms
+-C++ 17
 
--Improve C++ and project patterns skills
+-Googletest
 
-<h2>Demands</h2>
-
--visual studio 2019 (project include windows libraries)
+-Qt 5.15.2
 
--google test (every algorithm has test cases)
+<h2>Demands</h2>
 
--compiler which supports C++2017 features (I'm compiling using msvc_2019)
+Project was designed to be built using msvcc19 compiler. It hasn't been testing for any unix-like system. To built, there is need to provide googletest manually to destination: lib/googletest/. Also project doesn't include any tool for installation of Qt packages, interested person should perfomr it manually. If both googletest and qt will be provided, build should be done successfuly. I'm planning to implement building console app in case if no Qt packages were detected. Unit tests covers only algorithms
 
 <h2>Build</h2>
 
-For now there is need to add google test manually to the lib as directory is empty (will be made as subdirectory)</br>
-Project demand qt 5.15.2, in the future cmake will be modified to allow creting version without GUI
 ```
 mkdir build
 cd build
 cmake -S .. -B $(pwd)
 ```
-Project is build, by there is need to made such a configuration:
-
--load project, change <keyword> to QtVS_v302, reload project
-
--Convert custom steps to MS/Qt build
 
--in Properties, select modules: Core, XML, Widget, GUI, select QtInstallation to 5.15.2 (if you haven't create it, create one)
+<h2> Implemented algorithms </h2>
 
--Properties/ Qt Settings/ Paths/ Additional header search path and Additional Qt library search path- you need to paste your paths into them
+- Bounding box (rectangle)
 
--save
+-Finding way (stupid algorithm- choosing always the longest path)
 
--load project, change Keyword back to Win32Proj
+-Finding verticies
 
--you should be able to use qt libraries from now
+-Voronoi Diagram
 
--<b>If it is not possible try to use backupCmakeLists.txt (2) - they have versio without qt, probably there will be need to change source code
+-Delano Traingulation
 
 <h2>Implemented algorithms </h2>
 
--finding path in labirynth
+-finding path in labirynth- select longest possible road or road to glory, don't check if repeat
 
 -minimum square bounding box
 
@@ -53,30 +44,30 @@ Project is build, by there is need to made such a configuration:
 
 -Delano triangulation
 
-<h2>To implement </h2>
+-finding path in labirynth- check if repeat, randomly select way 
+
+<h2>Gui app information </h2>
+
+<b> Meaningufull (constant) colors: </b> 
+
+⬜- empty/ not initialized
+
+⬛- wall / shape boundary /line
 
--GUI
+🟥- goal / founded
 
--better input
+🟩- position / movement
 
--algorithm parallelism
+<b> Interfaces: </b>
 
--working on png files as inputs
+Data interface:
 
--algorithms: other ways of finding paths, checking if figure is contiunues, blending figures, ncellular automata
+![alt text](https://github.com/Swistusmen/Geometric-Algorithms/blob/master/screenshots/input.png)
 
+Algorithm iterface:
+![alt text](https://github.com/Swistusmen/Geometric-Algorithms/blob/master/screenshots/algorithm.png)
 
-<h4>Currently adding gui</h4>
-https://stackoverflow.com/questions/4028604/add-qt-to-existing-visual-studio-c-project
-https://forum.qt.io/topic/114299/convert-visual-studio-2017-solution-to-use-qt/2
 
-Steps done to switch to Qt:
 
--changing on CMakeList.txt: Adding set (CMAKE_PREFIX_PATH "C:\\Qt\\5.9.9\\msvc2017_64\\") to main, find_package(Qt5 COMPONENTS Widgets REQUIRED), find_package(Qt5 COMPONENTS Widgets REQUIRED)
 
--Switching to Qt project by changin .vcxproj <Keyword> to different options
-
-  -using Qt5.9.9
-
-  -always couldn't find Qt files
 

saves/b.txt

@@ -0,0 +1,2 @@
+2
+{86}0{1}1{8}0{1}2{8}0{1}1{6}0{1}1{17}0{1}1{6}0{1}1{18}0{1}1{5}0{1}1{19}0{1}1{4}0{1}1{2}0{5}1{18}0{3}1{3}0{2}1{13}0{1}1{4}0{2}1{4}0{1}1{19}0{2}1{5}0{2}1{11}0{1}1{5}0{2}1{7}0{1}1{10}0{1}1{4}0{2}1{23}0{2}1{8}0{1}1{10}0{1}1{4}0{1}1{10}0{1}1{3}0{2}1{4}0{1}1{15}0{1}1{2}0{1}1{1}0{3}1{1}0{1}1{16}0{1}1{1}0{1}1{3}0{4}1{15}0{1}1{1}0{1}1{5}0{2}1{15}0{1}1{2}0{1}1{20}0{2}1{3}0{1}1{18}0{2}1{6}0{1}1{1}0{1}1{13}0{1}1{5}0{1}3{6}0{1}1{8}0{3}1{15}0{1}1{1}0{1}1{1}0{2}1{28}0

saves/boundary_test.txt

@@ -0,0 +1,2 @@
+2
+{30}0{4}1{4}0{1}2{3}0{1}3{1}1{9}0{1}1{7}0{3}1{36}0

saves/finding_way_2.txt

@@ -0,0 +1,2 @@
+2
+{31}0{5}1{5}0{7}1{3}0{1}1{8}0{4}1{8}0{1}1{3}0{1}1{11}0{1}1{1}0{1}2{3}0{4}1{3}0{2}1{1}0{7}1{2}0{1}1{2}0{1}1{10}0{1}1{7}0{1}1{2}0{1}1{2}0{1}1{10}0{1}1{7}0{1}1{2}0{1}1{2}0{6}1{5}0{1}1{3}0{5}1{5}0{1}1{4}0{2}1{4}0{2}1{2}0{1}1{9}0{1}1{5}0{1}1{8}0{1}1{9}0{1}1{5}0{1}1{8}0{1}1{5}0{9}1{1}0{1}1{2}0{2}1{4}0{1}1{15}0{1}1{8}0{2}1{14}0{1}1{9}0{1}1{4}0{1}1{9}0{1}1{19}0{3}1{2}0{1}1{4}0{5}1{10}0{1}1{2}0{3}1{8}0{8}1{23}0{2}1{23}0{1}1{4}0{6}1{14}0{1}1{9}0{1}1{4}0{6}1{4}0{1}1{9}0{1}1{7}0{1}1{6}0{1}1{5}0{1}1{2}0{2}1{7}0{1}1{8}0{2}1{2}0{1}1{2}0{1}1{5}0{1}3{12}0{4}1{2}0{1}1{28}0

scripts/rebuild.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd src
+rm -r ALL_BUILD* CMakeFiles/ CMakeFiles/ INSTALL* GeometricAlgorithms* release/ src/ tst/ debug/ lib/ ZERO* src.v*
+cd ../build 
+cmake -S .. -B $(pwd)

src/.gitignore

@@ -2,4 +2,6 @@ release/
 debug/
 src.vcxproj.user
 src.vcxproj.filters
+src.vcxproj
+
 

src/Board.cpp → src/Algorithms/Board.cpp

@@ -6,7 +6,6 @@ BoardImplementation::BoardImplementation(std::shared_ptr<AlgorithmsKeeper> str,
 	auto size = input.size();
 	double number = std::sqrt(static_cast<double>(size));
 	int buffer = number;
-	std::cout << number-buffer << std::endl;
 	if (static_cast<double>(number - buffer) != 0.0||size<9)
 	{
 		std::cerr << "[E1] Wrong Board initialization- wrong size\n";
@@ -41,7 +40,9 @@ FieldRepresentation BoardImplementation::Representation()
 
 AlgoType BoardImplementation::GetAlgorithm()
 {
-	return algo->Type();
+	if(algo!=nullptr)
+		return algo->Type();
+	return AlgoType::None;
 }
 
 AlgoState BoardImplementation::PerformAlgorithm()

src/BoundingBox.cpp → src/Algorithms/BoundingBox.cpp

@@ -14,20 +14,20 @@ std::vector<unsigned int> BoundingBox::Perform(std::vector<unsigned int> data)
 	}
 	if (geometries.empty())
 	{
-		std::cerr << "No geoemtires inside\n";
+		this->state == AlgoState::FINISHED_FAILURE;
 		return data;
 	}
 	auto indexes = FindEdgeIndexes(geometries,dimension,size);
 	indexes = CalculateEdgeRows(indexes, dimension);
 	if (indexes[3] == -1 || indexes[1] == -1 || indexes[0] < 0 || indexes[2] < 0)
 	{
-		std::cerr << "Size of board is to small\n";
+		this->state == AlgoState::FINISHED_FAILURE;
 		return data;
 	}
 	int tl =  indexes[0] * dimension + indexes[3];
 	int tr = indexes[0] * dimension + indexes[1];
-	int br =  (indexes[2] -1) * dimension + indexes[1];
-	int bl =  (indexes[1] -1)* dimension + indexes[3];
+	int br =  (indexes[2]) * dimension + indexes[1];
+	int bl =  (indexes[2])* dimension + indexes[3];
 
 	for (int i = tl; i < tr; i ++)
 		data[i] = 2;
@@ -48,33 +48,13 @@ std::array<int, 4> BoundingBox::FindEdgeIndexes(std::vector<int> data, int dim,
 {
 	int topIndex = data.front();
 	int botIndex = data.back();
-	int rightIndex = -1, leftIndex = -1;
-	for (int i = 0; i < dim; i++)
+	int rightIndex = -1, leftIndex = 10000000000;
+	const int noCells = data.size();
+	for (int i = 0; i < noCells; i++)
 	{
-		for (int j = i; j < size; j += dim)
-		{
-			if (data[j] == 1)
-			{
-				leftIndex = j;
-				break;
-			}
-		}
-		if (leftIndex != -1)
-			break;
-	}
-
-	for (int i = dim - 1; i >= 0; i--)
-	{
-		for (int j = i; j < size; j += dim)
-		{
-			if (data[j] == 1)
-			{
-				rightIndex = j;
-				break;
-			}
-		}
-		if (rightIndex != -1)
-			break;
+		int value = data[i] % dim;
+		leftIndex=value < leftIndex ? value : leftIndex;
+		rightIndex = value > rightIndex ? value : rightIndex;
 	}
 	std::array<int, 4> a{ topIndex,rightIndex,botIndex,leftIndex };
 	return a;
@@ -84,7 +64,7 @@ std::array<int, 4> BoundingBox::CalculateEdgeRows(std::array<int, 4> data, int d
 {
 	data[0] = floor(static_cast<double>(data[0] - dim) / dim);
 	data[1] = (data[1] + 1) % dim == 0 ? -1 : (data[1] + 1) % dim + 1;
-	data[2] = ceil(static_cast<double>(data[2] + dim) / dim);
+	data[2] = ceil(static_cast<double>((data[2] + dim) / dim));
 	data[3] = data[3] % dim == 0 ? -1 : (data[3]) % dim - 1;
 	return data;
 }

src/Algorithms/CMakeLists.txt

@@ -0,0 +1,7 @@
+set(BINARY ${CMAKE_PROJECT_NAME})
+
+file(GLOB_RECURSE SOURCES LIST_DIRECTORIES true *.h *.cpp)
+
+set(SOURCES ${SOURCES})
+
+add_executable(${BINARY}_algo ${SOURCES})

src/FindingWay.cpp → src/Algorithms/FindingWay.cpp

@@ -55,20 +55,19 @@ std::pair<FindingWay::RobotAction, int> FindingWay::ScanForAWay(std::vector<unsi
 				break;
 			if (board[tempRobot]== 0|| board[tempRobot] == 2)
 			{
-				distances[i]++;
 				if (board[tempRobot] == 2)
 				{
+					distances[i]++;
 					founded = i;
-					std::cout << "Founded\n";
 					break;
 				}
 				if((tempRobot%dimension==0&&(previousRobot+1)%dimension==0) || (previousRobot % dimension == 0 && (tempRobot + 1) % dimension == 0))
 					break;
+				distances[i]++;
 			}
 		}
 	}
 
-
 	int rightEdge = dimension - (robot % dimension)-1;
 	int leftEdge = dimension - rightEdge -1;
 	distances[1] = distances[1] > rightEdge ? rightEdge : distances[1];