Optimal control of heat-pump/heat-storage systems with time-of-day energy price incentive