Raphael Maenle
1161b972ba
Merge branch 'master' into Layer_PoempelPosition
2018-01-20 22:53:05 +01:00
Raphael Maenle
1f87d00d8b
removed debug messages
2018-01-20 22:41:48 +01:00
Raphael Maenle
bc1a7eb6b5
Merge branch 'master' into MergeBranch_resultImage
2018-01-20 22:01:53 +01:00
Raphael Maenle
e3cec3295e
stash
2018-01-20 20:07:55 +01:00
mreitter
57c1f50a8f
Korrigierte Ecken, Alle Teile richtig
2018-01-20 20:03:34 +01:00
Raphael Maenle
5950ba7c5e
added base structure into code
...
needs picture information
expanded evaluation prototype
2018-01-20 16:02:44 +01:00
Raphael Maenle
fe04ebcd01
removed bloat
2018-01-20 15:05:54 +01:00
Raphael Maenle
9863c8b9e8
created Preprocessing check if true
...
deactivate in header.h
2018-01-20 11:58:32 +01:00
Raphael Maenle
7a3b33455d
Changed dp calculation
2018-01-20 09:40:03 +01:00
Raphael Maenle
1c85bee091
RM: aging, minor edits
...
aging erhöht, damit histo aufgerufen wird.
histo layer matrix position verändert, damit die stimmt
histo.image daten sind momentan immer NULL -> error bei Aufruf
2018-01-19 22:09:12 +01:00
Raphael Maenle
d91dded858
RM: added into dispatcher strucure
2018-01-19 21:36:31 +01:00
niko-fhtw
c724354efd
Merge branch 'master' into Team_ADWP_Histogram
2018-01-19 16:54:32 +01:00
niko-fhtw
dc71f6fa63
added firstdraft code
2018-01-19 16:53:53 +01:00
Raphael Maenle
0a2de22e63
cw: added multios
2018-01-18 21:47:53 +01:00
Raphael Maenle
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
Raphael Maenle
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
Raphael Maenle
c78518b1e9
code now functional
2018-01-07 20:08:50 +01:00
Raphael Maenle
fc9743a77a
dispatcher funktioniert halb, es fehlt noch 'setflag' und average quality calculation
2018-01-07 14:16:57 +01:00
Raphael Maenle
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
TabDragon
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
TabDragon
ce6fc0db72
Fixed errors if not enough corners were found!
2017-12-29 15:00:43 +01:00
TabDragon
cba4d204c8
Fixed errors due to no pictures in pieces folder
2017-12-29 14:33:22 +01:00
Raphael Maenle
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
Raphael Maenle
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
Raphael Maenle
eada1bba96
split functions, added printbox, fixed put into box
2017-12-23 10:11:07 +01:00
TabDragon
93226cca1b
Fixed errors with different col and row problems
2017-12-23 00:17:56 +01:00
Raphael Maenle
ad3aa1295a
edit: now its up printmatrix
2017-12-22 23:30:05 +01:00
Raphael Maenle
12574279ce
added printpuzzle fucntions
2017-12-22 23:27:50 +01:00
Raphael Maenle
ae9e4633d6
added dp to puzzle
2017-12-22 23:09:23 +01:00
Raphael Maenle
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
Raphael Maenle
edd3c8620b
beforemerge
2017-12-22 22:55:55 +01:00
TabDragon
a81c39125f
Segmentation error fixed
2017-12-22 22:47:14 +01:00
Raphael Maenle
bfed4aba05
added positive ageing to destructionPower
2017-12-21 13:35:13 +01:00
Raphael Maenle
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
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
b0aaeb84b2
added DestructionLayer, fixed minor problems
2017-12-20 22:10:08 +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
