add 2 approximations to bayesian rule, and reformat c++
get bayesian-same-neighborhood right