- 
				
					
					
						aa0b19bdd5
					
					
						updates readme with project history and a description
					
					
						
							
							
								
									 master
								
							
						
					
					
						
						
							
							raphael
						
					
					2021-08-09 09:45:41 +02:00
				
			 
		
			- 
				
					
					
						3ae27ebc13
					
					
						all layers activated
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-30 19:04:07 +01:00
				
			 
		
			- 
				
					
					
						38a621380c
					
					
						decreased layer count
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-30 18:59:20 +01:00
				
			 
		
			- 
				
					
					
						dd69066c76
					
					
						Added KantenLaenge
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-30 18:45:54 +01:00
				
			 
		
			- 
				
					
					
						6f02bf4f97
					
					
						added Histogramm Layer
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-30 18:16:26 +01:00
				
			 
		
			- 
				
					
					
						564053797a
					
					
						removed surf layer
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-29 20:25:33 +01:00
				
			 
		
			- 
				
					
					
						9f876e5c34
					
					
						Merge branch 'RM_tryColor' of https://github.com/MMRVZ2017/MPK.Puzzle into RM_tryColor
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-29 20:05:39 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						cf576db19d
					
					
						added dp calcualtion
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-29 20:05:37 +01:00
				
			 
		
			- 
				
					
					
						a073453a82
					
					
						Added combinedQualityTop2 and SetBestTop2
					
					
						
					
					
						
						
							
							d-kaselautzke
						
					
					2018-01-29 19:32:09 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						a6da2298c8
					
					
						added outputfuntion
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-29 16:32:55 +01:00
				
			 
		
			- 
				
					
					
						df071457d0
					
					
						fully added color implementation
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-29 16:16:27 +01:00
				
			 
		
			- 
				
					
					
						5029044157
					
					
						stash
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-29 13:41:19 +01:00
				
			 
		
			- 
				
					
					
						79109e1d34
					
					
						simplifed cut
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-27 18:27:20 +01:00
				
			 
		
			- 
				
					
					
						884a20eb44
					
					
						changed cut function
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-27 18:14:57 +01:00
				
			 
		
			- 
				
					
					
						4ed991539d
					
					
						poempelfind broken
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-27 18:07:42 +01:00
				
			 
		
			- 
				
					
					
						9cd267bc7d
					
					
						added color check
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-27 16:27:06 +01:00
				
			 
		
			- 
				
					
					
						e906b63dc1
					
					
						removed minor changes
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-27 16:06:03 +01:00
				
			 
		
			- 
				
					
					
						d3d7d53a45
					
					
						added a4 result presentation
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-27 13:54:09 +01:00
				
			 
		
			- 
				
					
					
						a289ccee57
					
					
						added cut back
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-27 13:24:44 +01:00
				
			 
		
			- 
				
					
					
						be49687f31
					
					
						Debug-Stuff, Part turned 4x for partArray, Unbelieveable slow when layer is on...
					
					
						
					
					
						
						
							
							JRauer
						
					
					2018-01-27 12:35:14 +01:00
				
			 
		
			- 
				
					
					
						9e2abfd64d
					
					
						Layer Poempl and SURF working together
					
					
						
					
					
						
						
							
							c-weidinger
						
					
					2018-01-27 10:22:24 +01:00
				
			 
		
			- 
				
					
					
						b0cb1aa417
					
					
						changed col rows
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-26 23:01:21 +01:00
				
			 
		
			- 
				
					
					
						9a3661647a
					
					
						Merge branch 'Layer_SURFFeatures' of https://github.com/MMRVZ2017/MPK.Puzzle into Layer_SURFFeatures
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-26 22:30:08 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						7920e73bfb
					
					
						removed calls to other layers to get into solver
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-26 22:27:46 +01:00
				
			 
		
			- 
				
					
					
						1787af11ab
					
					
						One Bug found and changed
					
					
						
					
					
						
						
							
							JRauer
						
					
					2018-01-26 22:26:19 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						3a57fbd5e9
					
					
						Implemented Evaluate Quality
					
					
						
					
					
						
						
							
							JRauer
						
					
					2018-01-26 20:30:17 +01:00
				
			 
		
			- 
				
					
					
						3bf8ed4adf
					
					
						Made sub-functions for better readability
					
					
						
					
					
						
						
							
							JRauer
						
					
					2018-01-26 19:59:12 +01:00
				
			 
		
			- 
				
					
					
						faeeeb8d71
					
					
						Added code for processing of puzzle-pieces
					
					
						
					
					
						
						
							
							JRauer
						
					
					2018-01-26 18:47:41 +01:00
				
			 
		
			- 
				
					
					
						c59c72c3fc
					
					
						Empty matrix when start
					
					
						
					
					
						
						
							
							JRauer
						
					
					2018-01-26 17:35:21 +01:00
				
			 
		
			- 
				
					
					
						1a7a0931c1
					
					
						Changed Matrix Calls
					
					
						
					
					
						
						
							
							c-weidinger
						
					
					2018-01-26 17:24:21 +01:00
				
			 
		
			- 
				
					
					
						462be02105
					
					
						Processing of complete image added
					
					
						
					
					
						
						
							
							JRauer
						
					
					2018-01-26 14:58:51 +01:00
				
			 
		
			- 
				
					
					
						75e449b3c3
					
					
						Improved the size of the constraint matrix
					
					
						
					
					
						
						
							
							Maximilian Papa
						
					
					2018-01-26 14:13:14 +01:00
				
			 
		
			- 
				
					
					
						486ebc16b1
					
					
						Updated Preprocessing
					
					
						
					
					
						
						
							
							Maximilian Papa
						
					
					2018-01-26 14:12:16 +01:00
				
			 
		
			- 
				
					
					
						b4641fe65b
					
					
						Included the Layer_SURFFeature in code
					
					
						
					
					
						
						
							
							Maximilian Papa
						
					
					2018-01-25 22:14:00 +01:00
				
			 
		
			- 
				
					
					
						ec4a5da05c
					
					
						added AbstractionLayer Template
					
					
						
					
					
						
						
							
							PGotzmann
						
					
					2018-01-23 19:35:02 +01:00
				
			 
		
			- 
				
					
					
						5be9f6cbf7
					
					
						refined comments
					
					
						
					
					
						
						
							
							g-spacewhale
						
					
					2018-01-23 13:09:58 +01:00
				
			 
		
			- 
				
					
					
						a9731c2edd
					
					
						readded RemoveSimilar
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-23 09:07:26 +01:00
				
			 
		
			- 
				
					
					
						a7ce247eb9
					
					
						debugging
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-22 20:09:57 +01:00
				
			 
		
			- 
				
					
					
						7979d28422
					
					
						Layer logic done, dispatcher simplified
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-22 19:20:25 +01:00
				
			 
		
			- 
				
					
					
						1161b972ba
					
					
						Merge branch 'master' into Layer_PoempelPosition
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 22:53:05 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						1f87d00d8b
					
					
						removed debug messages
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 22:41:48 +01:00
				
			 
		
			- 
				
					
					
						cefa63da54
					
					
						fixed backtrack bug in logslasher function
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 22:31:56 +01:00
				
			 
		
			- 
				
					
					
						bc1a7eb6b5
					
					
						Merge branch 'master' into MergeBranch_resultImage
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 22:01:53 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						e3cec3295e
					
					
						stash
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 20:07:55 +01:00
				
			 
		
			- 
				
					
					
						ea60145566
					
					
						Merge branch 'master' into Layer_PoempelPosition
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 20:05:56 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
				
			
 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						57c1f50a8f
					
					
						Korrigierte Ecken, Alle Teile richtig
					
					
						
					
					
						
						
							
							mreitter
						
					
					2018-01-20 20:03:34 +01:00
				
			 
		
			- 
				
					
					
						5950ba7c5e
					
					
						added base structure into code
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 16:02:44 +01:00
				
			 
		
			- 
				
					
					
						fe04ebcd01
					
					
						removed bloat
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 15:05:54 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						9863c8b9e8
					
					
						created Preprocessing check if true
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 11:58:32 +01:00
				
			 
		
			- 
				
					
					
						7a3b33455d
					
					
						Changed dp calculation
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-20 09:40:03 +01:00
				
			 
		
			- 
				
					
					
						1c85bee091
					
					
						RM: aging, minor edits
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-19 22:09:12 +01:00
				
			 
		
			- 
				
					
					
						d91dded858
					
					
						RM: added into dispatcher strucure
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-19 21:36:31 +01:00
				
			 
		
			- 
				
					
					
						ddd5d80750
					
					
						added to dispatcher_part2
					
					
						
					
					
						
						
							
							niko-fhtw
						
					
					2018-01-19 17:01:52 +01:00
				
			 
		
			- 
				
					
					
						c724354efd
					
					
						Merge branch 'master' into Team_ADWP_Histogram
					
					
						
					
					
						
						
							
							niko-fhtw
						
					
					2018-01-19 16:54:32 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						dc71f6fa63
					
					
						added firstdraft code
					
					
						
					
					
						
						
							
							niko-fhtw
						
					
					2018-01-19 16:53:53 +01:00
				
			 
		
			- 
				
					
					
						229afbc68a
					
					
						added better visualization
					
					
						
					
					
						
						
							
							g-spacewhale
						
					
					2018-01-19 16:12:45 +01:00
				
			 
		
			- 
				
					
					
						6bfa5b1f7c
					
					
						stash3
					
					
						
					
					
						
						
							
							g-spacewhale
						
					
					2018-01-19 16:00:38 +01:00
				
			 
		
			- 
				
					
					
						2d84f7273b
					
					
						stash2
					
					
						
					
					
						
						
							
							g-spacewhale
						
					
					2018-01-19 15:59:19 +01:00
				
			 
		
			- 
				
					
					
						9b0bacf6d7
					
					
						stash
					
					
						
					
					
						
						
							
							g-spacewhale
						
					
					2018-01-19 15:57:48 +01:00
				
			 
		
			- 
				
					
					
						f68a6b5559
					
					
						Merge branch 'MergeBranch_resultImage' of https://github.com/MMRVZ2017/MPK.Puzzle into MergeBranch_resultImage
					
					
						
					
					
						
						
							
							c-weidinger
						
					
					2018-01-19 15:36:18 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						922a98082e
					
					
						First Working Version with Result Image
					
					
						
					
					
						
						
							
							c-weidinger
						
					
					2018-01-19 15:26:53 +01:00
				
			 
		
			- 
				
					
					
						a3e2b2a10b
					
					
						manual debugger action
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-18 22:14:45 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						0a2de22e63
					
					
						cw: added multios
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-18 21:47:53 +01:00
				
			 
		
			- 
				
					
					
						835cba33dd
					
					
						added differenct mat read
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-18 21:36:38 +01:00
				
			 
		
			- 
				
					
					
						4701720d3a
					
					
						edited in puzzlecreator
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-16 22:53:05 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						490db896bf
					
					
						Merged: Dispatcher, Abstraction 1 Preprocessing, Solver
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-10 17:48:12 +01:00
				
			 
		
			- 
				
					
					
						735dea64db
					
					
						updated readme
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-10 17:45:34 +01:00
				
			 
		
			- 
				
					
					
						5e669fe68c
					
					
						Merge branch 'master' into Team_CMU_MergeBase
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-10 17:42:23 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						070ecdba8b
					
					
						changed to solve real puzzle
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-10 17:40:12 +01:00
				
			 
		
			- 
				
					
					
						ab2741a743
					
					
						changed name of layer 1 to layer 0
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-08 18:44:32 +01:00
				
			 
		
			- 
				
					
					
						c0f0417d3b
					
					
						dispatcher-a1 now functional
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-08 18:33:30 +01:00
				
			 
		
			- 
				
					
					
						6754873cfd
					
					
						Dispatcherprobleme bestehen
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-07 21:58:16 +01:00
				
			 
		
			- 
				
					
					
						c78518b1e9
					
					
						code now functional
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-07 20:08:50 +01:00
				
			 
		
			- 
				
					
					
						fc9743a77a
					
					
						dispatcher funktioniert halb, es fehlt noch 'setflag' und average quality calculation
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-07 14:16:57 +01:00
				
			 
		
			- 
				
					
					
						882737bd30
					
					
						Abstraction1 Komplett eingebunden - Probleme nun auf Dispatcherseite
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2018-01-06 23:23:42 +01:00
				
			 
		
			- 
				
					
					
						9d98ed83fa
					
					
						Added SetBestOrMoreLayersArithmetical and CalculateNewCombinedQuality
					
					
						
					
					
						
						
							
							d-kaselautzke
						
					
					2018-01-05 01:18:23 +01:00
				
			 
		
			- 
				
					
					
						4f9f43991c
					
					
						Changed qualityVector from map to vector of pairs
					
					
						
					
					
						
						
							
							TabDragon
						
					
					2018-01-02 13:59:16 +01:00
				
			 
		
			- 
				
					
					
						ce6fc0db72
					
					
						Fixed errors if not enough corners were found!
					
					
						
					
					
						
						
							
							TabDragon
						
					
					2017-12-29 15:00:43 +01:00
				
			 
		
			- 
				
					
					
						f76a5dd73d
					
					
						Revert "Revert "removedPictures - to big""
					
					
						
					
					
						
						
							
							TabDragon
						
					
					2017-12-29 14:59:32 +01:00
				
			 
		
			- 
				
					
					
						fb8cf12e64
					
					
						Revert "removedPictures - to big"
					
					
						
					
					
						
						
							
							TabDragon
						
					
					2017-12-29 14:33:47 +01:00
				
			 
		
			- 
				
					
					
						cba4d204c8
					
					
						Fixed errors due to no pictures in pieces folder
					
					
						
					
					
						
						
							
							TabDragon
						
					
					2017-12-29 14:33:22 +01:00
				
			 
		
			- 
				
					
					
						4c59e04fa7
					
					
						removedPictures - to big
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-29 12:26:03 +01:00
				
			 
		
			- 
				
					
					
						9de04656e4
					
					
						started include of ab1 opencv - segfault!
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-29 12:07:56 +01:00
				
			 
		
			- 
				
					
					
						caa74198bd
					
					
						NON FINAL: added dp calculation and most of RW code, included david code
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-23 21:46:41 +01:00
				
			 
		
			- 
				
					
					
						7c5cfc8c6b
					
					
						removed printBox from Main
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-23 10:12:16 +01:00
				
			 
		
			- 
				
					
					
						eada1bba96
					
					
						split functions, added printbox, fixed put into box
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-23 10:11:07 +01:00
				
			 
		
			- 
				
					
					
						93226cca1b
					
					
						Fixed errors with different col and row problems
					
					
						
					
					
						
						
							
							TabDragon
						
					
					2017-12-23 00:17:56 +01:00
				
			 
		
			- 
				
					
					
						ad3aa1295a
					
					
						edit: now its up printmatrix
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-22 23:30:05 +01:00
				
			 
		
			- 
				
					
					
						12574279ce
					
					
						added printpuzzle fucntions
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-22 23:27:50 +01:00
				
			 
		
			- 
				
					
					
						ae9e4633d6
					
					
						added dp to puzzle
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-22 23:09:23 +01:00
				
			 
		
			- 
				
					
					
						6f57b382cb
					
					
						added preprocessing call
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					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
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-22 23:00:31 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						edd3c8620b
					
					
						beforemerge
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-22 22:55:55 +01:00
				
			 
		
			- 
				
					
					
						a81c39125f
					
					
						Segmentation error fixed
					
					
						
					
					
						
						
							
							TabDragon
						
					
					2017-12-22 22:47:14 +01:00
				
			 
		
			- 
				
					
				
			
 
		
			- 
				
					
					
						bfed4aba05
					
					
						added positive ageing to destructionPower
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-21 13:35:13 +01:00
				
			 
		
			- 
				
					
					
						86c4e26bc7
					
					
						improved random generator, made information call from Part more direct
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-21 13:07:01 +01:00
				
			 
		
			- 
				
					
					
						bd07d291db
					
					
						started random algorithm. problem with funciton separation between properties and layer
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-21 12:43:31 +01:00
				
			 
		
			- 
				
					
					
						dd9f8f3250
					
					
						redid some of the includes and changed way statics are saved
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-21 12:20:57 +01:00
				
			 
		
			- 
				
					
					
						0faadc8c25
					
					
						Fixed Merge Errors
					
					
						
					
					
						
						
							
							TabDragon
						
					
					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
					
					
						
					
					
						
						
							
							Raphael Maenle
						
					
					2017-12-20 23:03:49 +01:00
				
			 
		
			-