Riemannian and Non-commutative Geometry in Physics