Improved Formulations and Computational Strategies for the Solution and Nonconvex Generalized Disjunctive Programs