6f02bf4f97
added Histogramm Layer
...
multiple errors
2018-01-30 18:16:26 +01:00
a073453a82
Added combinedQualityTop2 and SetBestTop2
...
Probably a better version of CalculateNewCombinedQuality and SetBestOrMoreLayersArithmetical. Use this two new functions or the two Arithmetical functions!
2018-01-29 19:32:09 +01:00
4ed991539d
poempelfind broken
2018-01-27 18:07:42 +01:00
9cd267bc7d
added color check
2018-01-27 16:27:06 +01:00
e906b63dc1
removed minor changes
2018-01-27 16:06:03 +01:00
9e2abfd64d
Layer Poempl and SURF working together
2018-01-27 10:22:24 +01:00
7920e73bfb
removed calls to other layers to get into solver
...
problem with imread in preprocess when multiple layers make call. This was subv. by deactivating these layers.
2018-01-26 22:27:46 +01:00
faeeeb8d71
Added code for processing of puzzle-pieces
...
Code working until now
Commented out other layers in solve.h
Path now in header-file
Small changes to full-puzzle-processing
2018-01-26 18:47:41 +01:00
b4641fe65b
Included the Layer_SURFFeature in code
2018-01-25 22:14:00 +01:00
1161b972ba
Merge branch 'master' into Layer_PoempelPosition
2018-01-20 22:53:05 +01:00
5950ba7c5e
added base structure into code
...
needs picture information
expanded evaluation prototype
2018-01-20 16:02:44 +01:00
9863c8b9e8
created Preprocessing check if true
...
deactivate in header.h
2018-01-20 11:58:32 +01:00
7a3b33455d
Changed dp calculation
2018-01-20 09:40:03 +01:00
d91dded858
RM: added into dispatcher strucure
2018-01-19 21:36:31 +01:00
ddd5d80750
added to dispatcher_part2
2018-01-19 17:01:52 +01:00
c724354efd
Merge branch 'master' into Team_ADWP_Histogram
2018-01-19 16:54:32 +01:00
dc71f6fa63
added firstdraft code
2018-01-19 16:53:53 +01:00
4701720d3a
edited in puzzlecreator
2018-01-16 22:53:05 +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
cba4d204c8
Fixed errors due to no pictures in pieces folder
2017-12-29 14:33:22 +01:00
eada1bba96
split functions, added printbox, fixed put into box
2017-12-23 10:11:07 +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
6f57b382cb
added preprocessing call
2017-12-22 23:02:08 +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
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
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
058a96ab08
added destructionPower as abstractionLayer
2017-12-20 22:05:04 +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
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
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
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
