Commit Graph

79 Commits

Author SHA1 Message Date
TabDragon
60e57b9ae0 Added forward declarations to avoid ring compiler errors 2017-12-20 22:58:00 +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
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
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
c-weidinger
3ddb217f6d Merged First and NextCoor 2017-12-03 20:12:32 +01:00
Raphael Maenle
e2d2e403f5 changed all uint to unsigned int 2017-12-02 17:03:12 +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
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
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
95cf7cc7b3 edited file structure to better represent our current system. added entire code base 2017-11-18 08:16:05 +01:00
g-spacewhale
0c8ecb456a edited file structure, added git instructions 2017-11-17 21:31:45 +01:00