Electric Power Planning for Regulated and Deregulated Markets