合并算法的参数设为0－1
加入了ADOPT(K)算法，正确性还待验证。
Merge remote-tracking branch 'upstream/master'
save
save
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DCOPSolver/dfsTree.txt
	DCOPSolver/src/com/cqu/settings/DialogSettings.java
先保留前面的MainFrame
Merge pull request #10 from heniancheng/master

Merge