rm-archive/PuzzleSolver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into Team_CMU_MergeBase

Browse Source
This commit is contained in:
Raphael Maenle 2018-01-10 17:42:23 +01:00
commit 5e669fe68c
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -41,3 +41,8 @@ cmake-build-debug
.idea .idea
.DS_Store .DS_Store
#Directories
cmake-build-debug
.idea
.DS_Store

30
README.md
View File

@ -1,41 +1,19 @@
# MPK.Puzzle # MPK.Puzzle
MPK Projekt Puzzle Solver MPK Projekt Puzzle Solver
Don't merge branch to master unless you are absolutely, 100% sure it works and you have discussed it with pm!
# Git intro # Git intro
0, read github tutorial 0, read github tutorial
1, Clone repository 1, Clone repository
2, branch master into a team branch 2, branch master into a team branch (named "Team"+[teamname])
3, work only in this branch 3, work only in this team branch or subbranches
4, don't ever touch the master. 4, don't ever touch the master.
Seriously. don't merge branch to master unless you are absolutely, 100% sure it works and you have discussed it with pm. Seriously. don't merge branch to master unless you are absolutely, 100% sure it works and you have discussed it with pm.
# Current Todo
Git for Puzzle solving project
1, Input:
-Puzzle Bilder in richtige Orientierung bringen
-Puzzle Bilder informaion rein raus oder kante extrahieren
-Schnittstelle zwischen Input und Solver definieren
2, Solver
-Grundsätzliche Aufbauweise
-Puzzle nach bekommenen Informationen der Input Gruppe lösen -soweit dies möglich ist-
3, Output
-Transparenz der Bilder einstellen
-visuelle Darstellung des outputs von Solver
-Schnittstelle zwischen Solver und Output definieren