From e2d2e403f5d397b83cd8778a400d48d9f82f81a4 Mon Sep 17 00:00:00 2001 From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com> Date: Sat, 2 Dec 2017 17:03:12 +0100 Subject: [PATCH] changed all uint to unsigned int --- Source/CMakeLists.txt | 4 +--- Source/functions/solve/classExtension.cpp | 2 +- Source/header/solve.h | 18 +++++++++--------- Source/main.cpp | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index d434e54..49741b2 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -4,6 +4,4 @@ project(Source) set(CMAKE_CXX_STANDARD 11) set(SOURCE_FILES main.cpp header.h) -add_executable(Source ${SOURCE_FILES}) - - +add_executable(Source ${SOURCE_FILES}) \ No newline at end of file diff --git a/Source/functions/solve/classExtension.cpp b/Source/functions/solve/classExtension.cpp index 6b35e83..dd3bd46 100755 --- a/Source/functions/solve/classExtension.cpp +++ b/Source/functions/solve/classExtension.cpp @@ -242,7 +242,7 @@ vector randomBox::shuffle() } //creates a random box size m, n, shuffles it, and then retuns it -vector createBox(uint m, uint n) +vector createBox(unsigned int m, unsigned int n) { randomBox myFirstPuzzleBox(m,n); myFirstPuzzleBox.createRandomPuzzle(); diff --git a/Source/header/solve.h b/Source/header/solve.h index bd7aa16..efce116 100755 --- a/Source/header/solve.h +++ b/Source/header/solve.h @@ -48,7 +48,7 @@ class Puzzle friend class randomBox; public: //constructor creates matrix with 00 outside and 11 inside - Puzzle(uint m = 7, uint n = 4): col(m), row(n) + Puzzle(unsigned int m = 7, unsigned int n = 4): col(m), row(n) { Matrix = new PuzzlePiece* [n+2]; for(int i = 0;i myBox); -vector createBox(uint m, uint n); +vector createBox(unsigned int m, unsigned int n); void numerateBox(vector& myBox); bool next(vector& log, vector& p_Box, Puzzle& puzzleMat); diff --git a/Source/main.cpp b/Source/main.cpp index ed8a608..ee7e737 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -9,7 +9,7 @@ int main() { - int cols=20, rows=20; + int cols=10, rows=10; //some basic part stuff vector myFirstPuzzle; Part myFirstPart;