fix bug and fit coding style to some python convention
Merge branch 'feature/regression' of https://github.com/WemyJu/TOC_proj into feature/regression