The Competitive Facility Location Problem in a Duopoly: Advances Beyond Trees