Merge pull request #1 from cnnic/master

update code
update RuleFunction and CollisionDetectAlgorithm
update rulefunction and collisiondetectionalgorithm
Merge pull request #3 from dgq2010/master

update ruleFunction and CollisionDetectionAlgorithm