Modified Chance-Constrained Optimization Applied to the Generation Expansion Problem