消除警告
将几个同步算法中的InitSelf()函数作适当调整ID的改变
Merge remote-tracking branch 'upstream/master' into temp

Conflicts:
	DCOPSolver/dfsTree.txt
save
引入新参数到用户界面
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DCOPSolver/dfsTree.txt
	DCOPSolver/src/com/cqu/main/SolverWindow.java
merge
save
修改AODPT_K
在问题与DFS生成树中增加了一个辅助分层的树的伪高度（树中从根结点开始的链的长度）
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DCOPSolver/dfsTree.txt
	DCOPSolver/src/com/cqu/parser/ParserGeneral.java
Merge pull request #11 from heniancheng/master

merge