Merge branch 'exploration' into hydro-devel

- Add two more cost function, not used yet
- Param tunning
- Initial turn issue not fully resolved