This paper considers the theory of market versus optimal product diversity in the light of two recent advances in oligopoly theory. The first is the development of discrete choice models to describe heterogeneous consumer tastes, and the application of such models to oligopolistic competition....