Probabilistic Model for Robust Affine and Non-Rigid Point Set Matching