Investing in generation and storage capacity in a liberalised electricity market: An agent based approach. (15th July 2021)