suppressed Dxy in psm if not right censoring; added new tests cph2 model.matrix psm3