Raphael Maenle
9f876e5c34
Merge branch 'RM_tryColor' of https://github.com/MMRVZ2017/MPK.Puzzle into RM_tryColor
2018-01-29 20:05:39 +01:00
Raphael Maenle
cf576db19d
added dp calcualtion
2018-01-29 20:05:37 +01:00
d-kaselautzke
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
Raphael Maenle
a6da2298c8
added outputfuntion
2018-01-29 16:32:55 +01:00
Raphael Maenle
df071457d0
fully added color implementation
2018-01-29 16:16:27 +01:00
Raphael Maenle
5029044157
stash
2018-01-29 13:41:19 +01:00
Raphael Maenle
79109e1d34
simplifed cut
2018-01-27 18:27:20 +01:00
Raphael Maenle
884a20eb44
changed cut function
2018-01-27 18:14:57 +01:00
Raphael Maenle
4ed991539d
poempelfind broken
2018-01-27 18:07:42 +01:00
Raphael Maenle
9cd267bc7d
added color check
2018-01-27 16:27:06 +01:00
Raphael Maenle
e906b63dc1
removed minor changes
2018-01-27 16:06:03 +01:00
Raphael Maenle
d3d7d53a45
added a4 result presentation
2018-01-27 13:54:09 +01:00
Raphael Maenle
a289ccee57
added cut back
2018-01-27 13:24:44 +01:00
JRauer
be49687f31
Debug-Stuff, Part turned 4x for partArray, Unbelieveable slow when layer is on...
...
Unbelieveable slow when layer is on... -> may be a solver problem?
Solution found (see slack). Pömpel ignored. No Seg-Faults anymore
2018-01-27 12:35:14 +01:00
c-weidinger
9e2abfd64d
Layer Poempl and SURF working together
2018-01-27 10:22:24 +01:00
Raphael Maenle
b0cb1aa417
changed col rows
2018-01-26 23:01:21 +01:00
Raphael Maenle
9a3661647a
Merge branch 'Layer_SURFFeatures' of https://github.com/MMRVZ2017/MPK.Puzzle into Layer_SURFFeatures
2018-01-26 22:30:08 +01:00
Raphael Maenle
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
JRauer
1787af11ab
One Bug found and changed
2018-01-26 22:26:19 +01:00
JRauer
3a57fbd5e9
Implemented Evaluate Quality
...
should work now... trying to test and debug
2018-01-26 20:30:17 +01:00
JRauer
3bf8ed4adf
Made sub-functions for better readability
...
Also error catching if img does not exist
2018-01-26 19:59:12 +01:00
JRauer
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
JRauer
c59c72c3fc
Empty matrix when start
...
There were not only zeros in matrix at program-start --> Fixed
2018-01-26 17:35:21 +01:00
c-weidinger
1a7a0931c1
Changed Matrix Calls
2018-01-26 17:24:21 +01:00
JRauer
462be02105
Processing of complete image added
...
Actually not running - never did since Max did stuff :)
2018-01-26 14:58:51 +01:00
Maximilian Papa
75e449b3c3
Improved the size of the constraint matrix
2018-01-26 14:13:14 +01:00
Maximilian Papa
486ebc16b1
Updated Preprocessing
...
Inserted InitialiseConstraintMatrixSize
Inserted an example to fill the constraintMatrix
Inserted an example to fill the Features into the parts of partArray
2018-01-26 14:12:16 +01:00
Maximilian Papa
b4641fe65b
Included the Layer_SURFFeature in code
2018-01-25 22:14:00 +01:00
PGotzmann
ec4a5da05c
added AbstractionLayer Template
...
Basic layer implementation to use as a template for new layers. Including detailed ToDos.
2018-01-23 19:35:02 +01:00
g-spacewhale
5be9f6cbf7
refined comments
2018-01-23 13:09:58 +01:00
Raphael Maenle
a9731c2edd
readded RemoveSimilar
2018-01-23 09:07:26 +01:00
Raphael Maenle
a7ce247eb9
debugging
2018-01-22 20:09:57 +01:00
Raphael Maenle
7979d28422
Layer logic done, dispatcher simplified
2018-01-22 19:20:25 +01:00
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
cefa63da54
fixed backtrack bug in logslasher function
2018-01-20 22:31:56 +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
Raphael Maenle
ea60145566
Merge branch 'master' into Layer_PoempelPosition
2018-01-20 20:05:56 +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
ddd5d80750
added to dispatcher_part2
2018-01-19 17:01:52 +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
g-spacewhale
229afbc68a
added better visualization
2018-01-19 16:12:45 +01:00
