COMPREHENSIVE BENEFIT ASSESSMENT OF PHOTOVOLTAIC AND ENERGY STORAGE