adjust probabilistc model
add shortcut set_based
Merge branch 'dev'