Unit Commitment With Ideal and Generic Energy Storage Units