Merge pull request #3 from dgq2010/master

update ruleFunction and CollisionDetectionAlgorithm
Merge pull request #2 from cnnic/master

update code