Measurements and analysis of a solar-assisted city bus with a diesel engine