Macroscopic Traffic-Flow Modelling Based on Gap-Filling Behavior of Heterogeneous Traffic