2d84f7273b
stash2
2018-01-19 15:59:19 +01:00
9b0bacf6d7
stash
2018-01-19 15:57:48 +01:00
f68a6b5559
Merge branch 'MergeBranch_resultImage' of https://github.com/MMRVZ2017/MPK.Puzzle into MergeBranch_resultImage
2018-01-19 15:36:18 +01:00
922a98082e
First Working Version with Result Image
2018-01-19 15:26:53 +01:00
a3e2b2a10b
manual debugger action
...
program seems to break debugger. not sure why.
2018-01-18 22:14:45 +01:00
0a2de22e63
cw: added multios
2018-01-18 21:47:53 +01:00
835cba33dd
added differenct mat read
2018-01-18 21:36:38 +01:00
4701720d3a
edited in puzzlecreator
2018-01-16 22:53:05 +01:00
ab2741a743
changed name of layer 1 to layer 0
...
and slightly modified speedtable: hard coded inverse to make calculation easier
2018-01-08 18:44:32 +01:00
c0f0417d3b
dispatcher-a1 now functional
...
a1 Solver finds solutions for puzzles, dispatcher correctly distributes layers.
2018-01-08 18:33:30 +01:00
6754873cfd
Dispatcherprobleme bestehen
...
Springt momentan nicht in die nächste Reihe. Debugging gehört hier weiter gemacht.
2018-01-07 21:58:16 +01:00
c78518b1e9
code now functional
2018-01-07 20:08:50 +01:00
fc9743a77a
dispatcher funktioniert halb, es fehlt noch 'setflag' und average quality calculation
2018-01-07 14:16:57 +01:00
882737bd30
Abstraction1 Komplett eingebunden - Probleme nun auf Dispatcherseite
...
Die Bilder sind in einem Ordner über dem Github abgespeichert, sieht man eh wohin die PATH zeigt. Bilder werden die "WORKING PIECES" verwendet.
2018-01-06 23:23:42 +01:00
9d98ed83fa
Added SetBestOrMoreLayersArithmetical and CalculateNewCombinedQuality
2018-01-05 01:18:23 +01:00
4f9f43991c
Changed qualityVector from map to vector of pairs
...
This change is better for the dispatcher, as he can sort the qualityvector now easily by the quality of each part
2018-01-02 13:59:16 +01:00
ce6fc0db72
Fixed errors if not enough corners were found!
2017-12-29 15:00:43 +01:00
cba4d204c8
Fixed errors due to no pictures in pieces folder
2017-12-29 14:33:22 +01:00
9de04656e4
started include of ab1 opencv - segfault!
...
added pictures into git for easier debug, can remove again
2017-12-29 12:07:56 +01:00
caa74198bd
NON FINAL: added dp calculation and most of RW code, included david code
...
still not runable code as dispatcher functions are only placeholders!
2017-12-23 21:46:41 +01:00
eada1bba96
split functions, added printbox, fixed put into box
2017-12-23 10:11:07 +01:00
93226cca1b
Fixed errors with different col and row problems
2017-12-23 00:17:56 +01:00
ad3aa1295a
edit: now its up printmatrix
2017-12-22 23:30:05 +01:00
12574279ce
added printpuzzle fucntions
2017-12-22 23:27:50 +01:00
ae9e4633d6
added dp to puzzle
2017-12-22 23:09:23 +01:00
7c8d9cffe9
Merge branch 'Team_CMU_MergeBase' of https://github.com/MMRVZ2017/MPK.Puzzle into Team_CMU_MergeBase
2017-12-22 23:00:31 +01:00
edd3c8620b
beforemerge
2017-12-22 22:55:55 +01:00
a81c39125f
Segmentation error fixed
2017-12-22 22:47:14 +01:00
bfed4aba05
added positive ageing to destructionPower
2017-12-21 13:35:13 +01:00
86c4e26bc7
improved random generator, made information call from Part more direct
...
todo: add indexing to puzzlepieces and all four rotation into puzzlebox (or maybe only log?). this needs to be done for random algorithm and for realPuzzle
2017-12-21 13:07:01 +01:00
bd07d291db
started random algorithm. problem with funciton separation between properties and layer
2017-12-21 12:43:31 +01:00
dd9f8f3250
redid some of the includes and changed way statics are saved
2017-12-21 12:20:57 +01:00
0faadc8c25
Fixed Merge Errors
2017-12-20 23:15:17 +01:00
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
b0aaeb84b2
added DestructionLayer, fixed minor problems
2017-12-20 22:10:08 +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
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
