9720613543
Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase
2017-12-20 23:03:49 +01:00
37eed7ef88
edited destructionLayer, changed includes
2017-12-20 23:01:04 +01:00
60e57b9ae0
Added forward declarations to avoid ring compiler errors
2017-12-20 22:58:00 +01:00
e641199ce4
Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase
2017-12-20 22:11:49 +01:00
b0aaeb84b2
added DestructionLayer, fixed minor problems
2017-12-20 22:10:08 +01:00
7ba76b4881
Fixed error in AbstractionLayer + redefine of solve.h
2017-12-20 22:09:41 +01:00
23d97293a3
Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase
2017-12-20 22:05:30 +01:00
058a96ab08
added destructionPower as abstractionLayer
2017-12-20 22:05:04 +01:00
1fabe84848
Fixed compiler errors with ring initialisation and qVector + MakeFile included
2017-12-20 22:02:09 +01:00
ce5e007bc7
Removed lots of slack, edited map functions into dispatcher, puzzleMat missing
...
Removed overconstructed logic, changed vector to map. PuzzleMat object not defined yet, for implementation, make the functions that have already been called through it.
2017-12-20 18:23:39 +01:00
c885e472fb
implemented #1 layer
...
everything with the excemtion of image recogniation in preprocessing should be fully implemented. Can now begin deleting all legacy code.
2017-12-20 17:35:52 +01:00
507533531c
unfinished merge, problems with randomgenerator
...
random generator in class needs to return a randomized puzzlebox
2017-12-18 22:50:03 +01:00
90e31ddba6
Merge branch 'TeamCGPU_TestWithBaseLayer' into Team_CMU_MergeBase
2017-12-18 21:24:21 +01:00
0048f5b42d
removed comments form non working
2017-12-18 13:37:31 +01:00
ffac7fbcb9
removed todo
2017-12-16 22:01:18 +01:00
ba4d757c5a
minor code improvements
...
changed coor from m,n to col,row as per philipp request. added typecast to uint8 before bitmaskconversion.
2017-12-16 00:10:52 +01:00
2ef3f164c7
added basic dP calculation, removed deprication warnings
...
Changed for loops to auto range, changed returns to bool literals, changed return of constructor to more basic call.
added dP calculation, save of the per piece runtime is still missing in puzzlebox or constraint matrix.
2017-12-13 10:47:15 +01:00
ccf26f8d8a
added empty functions for calls in structure.cpp
...
check if set or next abstraction is now done at the very beginning!
2017-12-12 11:42:31 +01:00
bf3b103251
Added David Code, removed Clion Stuff
2017-12-07 16:26:45 +01:00
26ce1477bd
Merge Branch TeamCMU the last
2017-12-06 21:56:26 +01:00
0469915cd9
Merge branch TeamCMU the 2nd
2017-12-06 21:26:06 +01:00
f0e287af20
Merge branch TeamCMU
...
random generator v2 + coor class
2017-12-06 21:24:11 +01:00
e66aa080bb
changed m,n to Coor class
...
changed every unsigned int m,n to coor myCoor. except of getPiece
2017-12-06 20:56:01 +01:00
9b282e83ca
generating "Random" Pieces from picture source now
...
rgb values stored as double in the piece base class. this is bound to change once other group has expanded piece base class.
2017-12-06 16:25:13 +01:00
cd7bc1c42a
removed legacy
2017-12-06 11:03:38 +01:00
eb489a58c2
removed bulk project files
...
Lets see if this works.
2017-12-06 11:02:19 +01:00
067f64c9ab
Deleted Source/.idea
2017-12-05 19:52:54 +01:00
bf521f741d
Gitignore
2017-12-05 19:47:20 +01:00
a78ec0c34e
Changed Gitignore
2017-12-05 19:44:54 +01:00
abb2126d61
updated readme to show todos
2017-12-03 20:35:35 +01:00
586f9d0d3e
Merge
2017-12-03 20:18:52 +01:00
3ddb217f6d
Merged First and NextCoor
2017-12-03 20:12:32 +01:00
8dd7f400f7
Deleted CLion Projekt Files
...
Deleted all Files created from CLion, like the .idea and cmake-build-debug folder.
This files will be created automatically from CLion at the first start up of the CMakeList.txt File
2017-12-03 14:33:28 +01:00
e12550274b
Corrected Raphis destroyed Project
2017-12-03 11:02:59 +01:00
e2d2e403f5
changed all uint to unsigned int
2017-12-02 17:03:12 +01:00
b1b6d55fc6
removes previously tracked files from commit
2017-12-02 17:01:51 +01:00
2f91ceaccb
edited .gitignore once more
2017-12-02 16:54:00 +01:00
e303642409
edited gitignore to not sync .idea and cmap-build-debug
2017-12-02 16:52:32 +01:00
17c3841650
Clion Project created
...
Included Raphaels code in CLion Project
2017-12-02 14:39:19 +01:00
51dd40961f
added toto txt file
2017-12-02 11:37:37 +01:00
92eb243268
minor edit in structure. cleanup
2017-11-30 22:29:52 +01:00
82d0c740c3
added a simple converter from part to puzzlepiece called convertPart2PuzzlePiece. takes and gives vectors only
2017-11-30 14:19:25 +01:00
2c71dd7a47
Added rotation functionality, minor cleanups on the way
2017-11-28 21:35:49 +01:00
3567b77cec
added basic construct to keep on turning puzzle piece. non functional as of yet.
2017-11-22 16:06:23 +01:00
c56b117d81
Added CLions local project directories and .DS_Store (MAC OS) to gitignore
...
Local folders created by CLion and MAC OS are now excluded in gitignore. This allows users to work directly in the local Git directory without syncing unnessasary files.
2017-11-22 11:05:35 +01:00
17386304c5
Merge branch 'master' into inception
2017-11-22 10:56:11 +01:00
af3ba8da56
edited README Todo to reflect new steps in project.
2017-11-21 16:26:03 +01:00
742dbd3c36
edited todo in readme to new todos
2017-11-21 16:23:26 +01:00
6c81722d02
removed a.out from HEAD cache. less spamming now, sry about that.
2017-11-21 16:14:12 +01:00
74e1e2e224
changed to use heavypuzzle in main
2017-11-21 16:05:38 +01:00
