A new mathematical formulation to integrate supply and demand within a choice-based optimization framework