Raphael Maenle
bd07d291db
started random algorithm. problem with funciton separation between properties and layer
2017-12-21 12:43:31 +01:00
Raphael Maenle
dd9f8f3250
redid some of the includes and changed way statics are saved
2017-12-21 12:20:57 +01:00
TabDragon
0faadc8c25
Fixed Merge Errors
2017-12-20 23:15:17 +01:00
Raphael Maenle
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
Raphael Maenle
37eed7ef88
edited destructionLayer, changed includes
2017-12-20 23:01:04 +01:00
TabDragon
60e57b9ae0
Added forward declarations to avoid ring compiler errors
2017-12-20 22:58:00 +01:00
Raphael Maenle
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
Raphael Maenle
b0aaeb84b2
added DestructionLayer, fixed minor problems
2017-12-20 22:10:08 +01:00
TabDragon
7ba76b4881
Fixed error in AbstractionLayer + redefine of solve.h
2017-12-20 22:09:41 +01:00
Raphael Maenle
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
Raphael Maenle
058a96ab08
added destructionPower as abstractionLayer
2017-12-20 22:05:04 +01:00
TabDragon
1fabe84848
Fixed compiler errors with ring initialisation and qVector + MakeFile included
2017-12-20 22:02:09 +01:00
Raphael Maenle
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
Raphael Maenle
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
Raphael Maenle
507533531c
unfinished merge, problems with randomgenerator
...
random generator in class needs to return a randomized puzzlebox
2017-12-18 22:50:03 +01:00
Raphael Maenle
90e31ddba6
Merge branch 'TeamCGPU_TestWithBaseLayer' into Team_CMU_MergeBase
2017-12-18 21:24:21 +01:00
Raphael Maenle
0048f5b42d
removed comments form non working
2017-12-18 13:37:31 +01:00
g-spacewhale
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
Raphael Maenle
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
Raphael Maenle
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
g-spacewhale
bf3b103251
Added David Code, removed Clion Stuff
2017-12-07 16:26:45 +01:00
d-kaselautzke
26ce1477bd
Merge Branch TeamCMU the last
2017-12-06 21:56:26 +01:00
d-kaselautzke
f0e287af20
Merge branch TeamCMU
...
random generator v2 + coor class
2017-12-06 21:24:11 +01:00
d-kaselautzke
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
Raphael Maenle
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
Raphael Maenle
eb489a58c2
removed bulk project files
...
Lets see if this works.
2017-12-06 11:02:19 +01:00
c-weidinger
067f64c9ab
Deleted Source/.idea
2017-12-05 19:52:54 +01:00
c-weidinger
586f9d0d3e
Merge
2017-12-03 20:18:52 +01:00
c-weidinger
3ddb217f6d
Merged First and NextCoor
2017-12-03 20:12:32 +01:00
TabDragon
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
c-weidinger
e12550274b
Corrected Raphis destroyed Project
2017-12-03 11:02:59 +01:00
Raphael Maenle
e2d2e403f5
changed all uint to unsigned int
2017-12-02 17:03:12 +01:00
Raphael Maenle
b1b6d55fc6
removes previously tracked files from commit
2017-12-02 17:01:51 +01:00
c-weidinger
17c3841650
Clion Project created
...
Included Raphaels code in CLion Project
2017-12-02 14:39:19 +01:00
g-spacewhale
92eb243268
minor edit in structure. cleanup
2017-11-30 22:29:52 +01:00
g-spacewhale
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
g-spacewhale
6c81722d02
removed a.out from HEAD cache. less spamming now, sry about that.
2017-11-21 16:14:12 +01:00
g-spacewhale
74e1e2e224
changed to use heavypuzzle in main
2017-11-21 16:05:38 +01:00
g-spacewhale
1e0018c6a4
changed minor stuff
2017-11-21 15:07:15 +01:00
g-spacewhale
e947a8b24f
slight update to structure. going into subbranch now
2017-11-21 11:19:51 +01:00
g-spacewhale
665ad108d4
changed review and log
2017-11-21 10:31:48 +01:00
g-spacewhale
772a1d815a
added hardest puzzle #evafornoobs. does not compute
2017-11-19 23:03:11 +01:00
g-spacewhale
aa00553bdb
removed bugs. some puzzles take forever. most can be solved
2017-11-19 22:53:00 +01:00
g-spacewhale
15940f41da
added more strucuture to strucutur.cpp. commiting now to extract new debugging branch
2017-11-19 17:52:02 +01:00
c308b6d9e8
furthered structure.cpp with code segments. edited log class in solve.h
2017-11-18 22:48:40 +01:00
g-spacewhale
4aeb90259f
code not functional, added in new function reverted original function
2017-11-18 09:50:09 +01:00
g-spacewhale
204387c42f
resolved readme.m conflict to master
2017-11-18 08:36:50 +01:00
g-spacewhale
037d20096a
added codebase. changed folderstructure
2017-11-18 08:22:35 +01:00
