Nucleon-nucleon elastic scattering analysis to 2.5-GeV