Skip to content

Commit 0129bc2

Browse files
committed
linux release ready
1 parent 06b5f3a commit 0129bc2

File tree

5 files changed

+51
-10
lines changed

5 files changed

+51
-10
lines changed

CMakeLists.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(WIN32)
44
set(CMAKE_INSTALL_PREFIX C:\\)
55
endif()
66
set(PR_NAME Sorting)
7-
project(${PR_NAME})
7+
project(${PR_NAME} VERSION 0.1.0)
88
set(CMAKE_CXX_STANDARD)
99

1010
include(GNUInstallDirs)
@@ -32,7 +32,7 @@ endif()
3232

3333

3434
#source files
35-
set(SOURCE_FILES_NAMES
35+
set(SOURCES
3636
BinaryTree
3737
Bubble
3838
Bucket
@@ -46,18 +46,19 @@ set(SOURCE_FILES_NAMES
4646
Quick
4747
QuickTree
4848
Selection
49-
SortingAlgorithms
49+
SortingAlgorithm
5050
StringU
5151
)
5252

53-
list(TRANSFORM SOURCE_FILES_NAMES APPEND ".cpp")
54-
list(TRANSFORM SOURCE_FILES_NAMES PREPEND "src/")
53+
list(TRANSFORM SOURCES APPEND ".cpp")
54+
list(TRANSFORM SOURCES PREPEND "src/")
5555

5656
if(UNIX)
5757
set(CMAKE_INSTALL_RPATH $ORIGIN/../lib)
5858
endif()
5959

60-
add_executable(${PR_NAME} ${SOURCE_FILES_NAMES})
60+
add_executable(${PR_NAME} ${SOURCES})
61+
6162
target_include_directories(${PR_NAME}
6263
PRIVATE
6364
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
@@ -85,7 +86,7 @@ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/external/SFML")
8586
target_link_libraries(${PR_NAME} sfml-graphics sfml-audio)
8687

8788
#------------------INSTALL SECTION----------------------
88-
install(TARGETS Arcade
89+
install(TARGETS ${PR_NAME}
8990
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
9091

9192
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/font DESTINATION ${CMAKE_INSTALL_BINDIR})

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#Sorting Algortihms Visualization
1+
## Sorting Algortihms Visualization

src/Bucket.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "Bucket.h"
2+
#include <math.h>
23

34
Bucket::Bucket(std::vector<int>& vec)
45
{
@@ -77,7 +78,7 @@ void Bucket::mergeNodes()
7778
void Bucket::setupNewNodes()
7879
{
7980
float vecSize = dataVector.size();
80-
float midpoint = std::ceilf(vecSize / 2.f);
81+
float midpoint = std::ceil(vecSize / 2.f);
8182

8283
if (vecSize == 1) {
8384
isLeaf = true;

src/Bucket.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22
#include <vector>
3-
#include <cmath>
43
#include "BinaryTree.h"
54

65
class Bucket : public BinaryTree<Bucket>{

src/SortingAlgorithm.h

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#pragma once
2+
#include <vector>
3+
#include <deque>
4+
#include <SFML/Graphics.hpp>
5+
#include <random>
6+
7+
using namespace sf;
8+
class SortingAlgorithm {
9+
public:
10+
virtual void sortArray() = 0;
11+
void init(Vector2f screenSize);
12+
void drawVector(RenderWindow &window);
13+
void randomizeUnsortedVector();
14+
void updateStepDelay(Event event);
15+
16+
std::string getAlgorithmName();
17+
18+
std::deque<int> getColorArray();
19+
int getMaxColorArraySize();
20+
21+
int getStepDelay();
22+
void setStepDelay(int newStepDelay);
23+
void sleep();
24+
private:
25+
Color chooseLineColor(int arrayValue);
26+
27+
protected:
28+
void updateColorArray(int indexToAdd);
29+
std::vector<int> vector;
30+
31+
std::deque<int> colorArray;
32+
int maxColorArraySize = 10;
33+
std::string algorithmName;
34+
35+
int SCR_WIDTH, SCR_HEIGHT;
36+
private:
37+
int vectorSize = 80;
38+
39+
int stepDelay = 0;
40+
};

0 commit comments

Comments
 (0)