Modeling aggregate outcomes of heterogeneous non-IIA choice