test
Merge branch 'master' of https://github.com/WeiFoo/Research
kkkkk
change parameters in base.py