A demand model with departure time choice for within-day dynamic traffic assignment