Extension of Edie's Definitions for Pedestrian Dynamics