Added MacroSimulator state extracting code
Made parameter dimensions consistent (seconds, vehicles, meter)
Resolved conflict at MacroSimulator