A refined consumer behavior model for energy systems: Application to the pricing and energy-efficiency problems. (15th February 2022)