[sumo] 02/03: Merge tag 'upstream/0.23.0+dfsg1' into experimental
Anton Gladky
gladk at moszumanska.debian.org
Thu Apr 16 21:59:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository sumo.
commit b27102652caebcc37739f900d1111e8b1ebc85b7
Merge: aad3ecb f68572e
Author: Anton Gladky <gladk at debian.org>
Date: Thu Apr 16 23:43:49 2015 +0200
Merge tag 'upstream/0.23.0+dfsg1' into experimental
Upstream version 0.23.0+dfsg1
INSTALL | 15 +-
Makefile.am | 2 +-
Makefile.in | 4 +-
bin/Makefile.am | 4 +-
bin/Makefile.in | 4 +-
config.guess | 421 ++-
config.sub | 277 +-
configure | 35 +-
configure.ac | 15 +-
data/emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh | 134 +
data/emissions/PHEMlight/PKW_D_EU4.csv | 68 +-
data/emissions/PHEMlight/PKW_D_EU4.dec.csv | 31 +
data/emissions/PHEMlight/PKW_D_EU4.veh | 120 -
data/emissions/PHEMlight/PKW_D_EU4_FC.csv | 44 +-
data/emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh | 133 +
data/emissions/PHEMlight/PKW_G_EU4.csv | 68 +-
data/emissions/PHEMlight/PKW_G_EU4.dec.csv | 31 +
data/emissions/PHEMlight/PKW_G_EU4.veh | 120 -
data/emissions/PHEMlight/PKW_G_EU4_FC.csv | 44 +-
data/typemap/osmNetconvert.typ.xml | 34 +-
data/typemap/osmNetconvertPedestrians.typ.xml | 10 +-
data/typemap/osmNetconvertRuralDe.typ.xml | 49 -
data/typemap/osmNetconvertShips.typ.xml | 4 +
data/typemap/osmNetconvertUrbanDe.typ.xml | 34 +-
data/xsd/activitygenConfiguration.xsd | 3 +-
data/xsd/additional_file.xsd | 13 +
data/xsd/baseTypes.xsd | 2 +-
data/xsd/connections_file.xsd | 9 +-
data/xsd/dfrouterConfiguration.xsd | 1 +
data/xsd/duarouterConfiguration.xsd | 1 +
data/xsd/edgediff_file.xsd | 7 +
data/xsd/edges_file.xsd | 1 +
data/xsd/emission_file.xsd | 4 +-
data/xsd/fcd_file.xsd | 2 +-
data/xsd/full_file.xsd | 8 +-
data/xsd/jtrrouterConfiguration.xsd | 1 +
data/xsd/marouterConfiguration.xsd | 1 +
data/xsd/net_file.xsd | 4 +
data/xsd/netconvertConfiguration.xsd | 5 +-
data/xsd/netgenerateConfiguration.xsd | 4 +-
data/xsd/netstate_file.xsd | 11 +
data/xsd/nodes_file.xsd | 2 +
data/xsd/od2tripsConfiguration.xsd | 1 +
data/xsd/polyconvertConfiguration.xsd | 2 +
data/xsd/routeTypes.xsd | 53 +-
data/xsd/routes_file.xsd | 1 +
data/xsd/sumoConfiguration.xsd | 41 +-
data/xsd/taz_file.xsd | 1 +
data/xsd/tripinfo_file.xsd | 26 +
depcomp | 531 ++--
docs/examples/dfrouter/input_tri.net.xml | 2 +-
.../duarouter/flows2routes/input_net.net.xml | 6 +-
.../flows2routes_100s_interval/input_net.net.xml | 6 +-
.../input_net.net.xml | 6 +-
.../flows2routes_200s_interval/input_net.net.xml | 6 +-
.../duarouter/trips2routes/input_net.net.xml | 6 +-
.../straight_only_sinks/input_net.net.xml | 10 +-
docs/examples/jtrrouter/turns/input_net.net.xml | 10 +-
.../cross3ltl_vtypeprobe/input_additional.add.xml | 2 +-
docs/examples/tools/dua-iterate/input_net.net.xml | 2 +-
docs/examples/tools/flowrouter/input_net.net.xml | 10 +-
docs/tutorial/city_mobil/agentManager.py | 32 +-
docs/tutorial/city_mobil/constants.py | 12 +-
docs/tutorial/city_mobil/createNet.py | 177 +-
docs/tutorial/city_mobil/runner.py | 17 +-
docs/tutorial/city_mobil/simpleManager.py | 13 +-
docs/tutorial/city_mobil/statistics.py | 41 +-
docs/tutorial/city_mobil/vehicleControl.py | 52 +-
docs/tutorial/hello/data/hello.net.xml | 2 +-
docs/tutorial/hello/runner.py | 33 +-
docs/tutorial/output_parsing/runner.py | 27 +-
docs/tutorial/quickstart/data/quickstart.net.xml | 32 +-
docs/tutorial/quickstart/runner.py | 28 +-
docs/tutorial/san_pablo_dam/data/analyzeData.py | 158 +-
docs/tutorial/san_pablo_dam/runner.py | 66 +-
docs/tutorial/san_pablo_dam/validate.py | 78 +-
docs/tutorial/traci_tls/data/cross.net.xml | 2 +-
docs/tutorial/traci_tls/embedded.py | 11 +-
docs/tutorial/traci_tls/runner.py | 69 +-
install-sh | 35 +-
missing | 461 ++--
src/Makefile.am | 17 +-
src/Makefile.in | 49 +-
src/activitygen/AGActivityGen.cpp | 12 +-
src/activitygen/AGActivityGen.h | 30 +-
src/activitygen/AGActivityGenHandler.cpp | 17 +-
src/activitygen/AGActivityGenHandler.h | 4 +-
src/activitygen/AGActivityTripWriter.cpp | 75 +-
src/activitygen/AGActivityTripWriter.h | 27 +-
src/activitygen/AGFrame.cpp | 21 +-
src/activitygen/AGFrame.h | 4 +-
src/activitygen/activities/AGActivities.cpp | 4 +-
src/activitygen/activities/AGActivities.h | 4 +-
src/activitygen/activities/AGActivity.cpp | 4 +-
src/activitygen/activities/AGActivity.h | 4 +-
src/activitygen/activities/AGFreeTime.cpp | 4 +-
src/activitygen/activities/AGFreeTime.h | 4 +-
src/activitygen/activities/AGTrip.cpp | 8 +-
src/activitygen/activities/AGTrip.h | 6 +-
src/activitygen/activities/AGWorkAndSchool.cpp | 16 +-
src/activitygen/activities/AGWorkAndSchool.h | 4 +-
src/activitygen/activitygen_main.cpp | 6 +-
src/activitygen/city/AGAdult.cpp | 4 +-
src/activitygen/city/AGAdult.h | 4 +-
src/activitygen/city/AGBus.cpp | 4 +-
src/activitygen/city/AGBus.h | 4 +-
src/activitygen/city/AGBusLine.cpp | 12 +-
src/activitygen/city/AGBusLine.h | 4 +-
src/activitygen/city/AGCar.cpp | 4 +-
src/activitygen/city/AGCar.h | 4 +-
src/activitygen/city/AGChild.cpp | 4 +-
src/activitygen/city/AGChild.h | 4 +-
src/activitygen/city/AGCity.cpp | 46 +-
src/activitygen/city/AGCity.h | 6 +-
src/activitygen/city/AGDataAndStatistics.cpp | 4 +-
src/activitygen/city/AGDataAndStatistics.h | 18 +-
src/activitygen/city/AGHousehold.cpp | 4 +-
src/activitygen/city/AGHousehold.h | 4 +-
src/activitygen/city/AGPerson.cpp | 4 +-
src/activitygen/city/AGPerson.h | 4 +-
src/activitygen/city/AGPosition.cpp | 8 +-
src/activitygen/city/AGPosition.h | 4 +-
src/activitygen/city/AGSchool.cpp | 4 +-
src/activitygen/city/AGSchool.h | 4 +-
src/activitygen/city/AGStreet.cpp | 39 +-
src/activitygen/city/AGStreet.h | 53 +-
src/activitygen/city/AGTime.cpp | 4 +-
src/activitygen/city/AGTime.h | 4 +-
src/activitygen/city/AGWorkPosition.cpp | 4 +-
src/activitygen/city/AGWorkPosition.h | 4 +-
src/config.h | 8 +-
src/dfrouter/RODFDetFlowLoader.cpp | 4 +-
src/dfrouter/RODFDetFlowLoader.h | 4 +-
src/dfrouter/RODFDetector.cpp | 17 +-
src/dfrouter/RODFDetector.h | 4 +-
src/dfrouter/RODFDetectorFlow.cpp | 4 +-
src/dfrouter/RODFDetectorFlow.h | 4 +-
src/dfrouter/RODFDetectorHandler.cpp | 4 +-
src/dfrouter/RODFDetectorHandler.h | 4 +-
src/dfrouter/RODFEdge.cpp | 4 +-
src/dfrouter/RODFEdge.h | 4 +-
src/dfrouter/RODFEdgeBuilder.cpp | 4 +-
src/dfrouter/RODFEdgeBuilder.h | 4 +-
src/dfrouter/RODFFrame.cpp | 4 +-
src/dfrouter/RODFFrame.h | 4 +-
src/dfrouter/RODFNet.cpp | 81 +-
src/dfrouter/RODFNet.h | 18 +-
src/dfrouter/RODFRouteCont.cpp | 12 +-
src/dfrouter/RODFRouteCont.h | 6 +-
src/dfrouter/RODFRouteDesc.h | 7 +-
src/dfrouter/dfrouter_main.cpp | 4 +-
src/duarouter/RODUAEdgeBuilder.cpp | 4 +-
src/duarouter/RODUAEdgeBuilder.h | 4 +-
src/duarouter/RODUAFrame.cpp | 4 +-
src/duarouter/RODUAFrame.h | 4 +-
src/duarouter/duarouter_main.cpp | 4 +-
src/foreign/rtree/LayeredRTree.h | 4 +-
src/foreign/rtree/SUMORTree.h | 4 +-
src/gui/GUIApplicationWindow.cpp | 118 +-
src/gui/GUIApplicationWindow.h | 23 +-
src/gui/GUIEvent_SimulationEnded.h | 4 +-
src/gui/GUIEvent_SimulationLoaded.h | 4 +-
src/gui/GUIGlobals.cpp | 4 +-
src/gui/GUIGlobals.h | 4 +-
src/gui/GUILoadThread.cpp | 19 +-
src/gui/GUILoadThread.h | 10 +-
src/gui/GUIManipulator.cpp | 4 +-
src/gui/GUIManipulator.h | 4 +-
src/gui/GUIRunThread.cpp | 5 +-
src/gui/GUIRunThread.h | 4 +-
src/gui/GUISUMOViewParent.cpp | 22 +-
src/gui/GUISUMOViewParent.h | 6 +-
src/gui/GUITLLogicPhasesTrackerWindow.cpp | 8 +-
src/gui/GUITLLogicPhasesTrackerWindow.h | 4 +-
src/gui/GUIViewTraffic.cpp | 10 +-
src/gui/GUIViewTraffic.h | 4 +-
src/gui/TraCIServerAPI_GUI.cpp | 4 +-
src/gui/TraCIServerAPI_GUI.h | 4 +-
src/gui/dialogs/GUIDialog_AboutSUMO.cpp | 6 +-
src/gui/dialogs/GUIDialog_AboutSUMO.h | 4 +-
src/gui/dialogs/GUIDialog_AppSettings.cpp | 4 +-
src/gui/dialogs/GUIDialog_AppSettings.h | 4 +-
src/gui/dialogs/GUIDialog_Breakpoints.cpp | 4 +-
src/gui/dialogs/GUIDialog_Breakpoints.h | 4 +-
src/guinetload/GUIDetectorBuilder.cpp | 4 +-
src/guinetload/GUIDetectorBuilder.h | 4 +-
src/guinetload/GUIEdgeControlBuilder.cpp | 4 +-
src/guinetload/GUIEdgeControlBuilder.h | 4 +-
src/guinetload/GUITriggerBuilder.cpp | 20 +-
src/guinetload/GUITriggerBuilder.h | 23 +-
src/guisim/GUIBusStop.cpp | 4 +-
src/guisim/GUIBusStop.h | 4 +-
src/guisim/GUICalibrator.cpp | 4 +-
src/guisim/GUICalibrator.h | 4 +-
src/guisim/GUIContainer.cpp | 408 +++
src/guisim/GUIContainer.h | 213 ++
src/guisim/GUIContainerControl.cpp | 59 +
src/guisim/GUIContainerControl.h | 66 +
src/guisim/GUIContainerStop.cpp | 188 ++
src/guisim/GUIContainerStop.h | 156 ++
src/guisim/GUIDetectorWrapper.cpp | 4 +-
src/guisim/GUIDetectorWrapper.h | 4 +-
src/guisim/GUIE3Collector.cpp | 4 +-
src/guisim/GUIE3Collector.h | 4 +-
src/guisim/GUIEdge.cpp | 79 +-
src/guisim/GUIEdge.h | 22 +-
src/guisim/GUIEventControl.cpp | 4 +-
src/guisim/GUIEventControl.h | 4 +-
src/guisim/GUIInductLoop.cpp | 4 +-
src/guisim/GUIInductLoop.h | 4 +-
src/guisim/GUIInstantInductLoop.cpp | 4 +-
src/guisim/GUIInstantInductLoop.h | 4 +-
src/guisim/GUIJunctionWrapper.cpp | 30 +-
src/guisim/GUIJunctionWrapper.h | 7 +-
src/guisim/GUILane.cpp | 307 ++-
src/guisim/GUILane.h | 25 +-
src/guisim/GUILaneSpeedTrigger.cpp | 4 +-
src/guisim/GUILaneSpeedTrigger.h | 4 +-
src/guisim/GUINet.cpp | 26 +-
src/guisim/GUINet.h | 15 +-
src/guisim/GUIPerson.cpp | 154 +-
src/guisim/GUIPerson.h | 53 +-
src/guisim/GUIPersonControl.cpp | 13 +-
src/guisim/GUIPersonControl.h | 9 +-
src/guisim/GUIShapeContainer.cpp | 161 --
src/guisim/GUIShapeContainer.h | 148 --
src/guisim/GUITrafficLightLogicWrapper.cpp | 4 +-
src/guisim/GUITrafficLightLogicWrapper.h | 4 +-
src/guisim/GUITriggeredRerouter.cpp | 46 +-
src/guisim/GUITriggeredRerouter.h | 14 +-
src/guisim/GUIVehicle.cpp | 81 +-
src/guisim/GUIVehicle.h | 6 +-
src/guisim/GUIVehicleControl.cpp | 4 +-
src/guisim/GUIVehicleControl.h | 4 +-
src/guisim/GUI_E2_ZS_Collector.cpp | 4 +-
src/guisim/GUI_E2_ZS_Collector.h | 4 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.cpp | 4 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.h | 4 +-
src/guisim/Makefile.am | 4 +-
src/guisim/Makefile.in | 12 +-
src/guisim_main.cpp | 6 +-
src/jtrrouter/ROJTREdge.cpp | 4 +-
src/jtrrouter/ROJTREdge.h | 4 +-
src/jtrrouter/ROJTREdgeBuilder.cpp | 4 +-
src/jtrrouter/ROJTREdgeBuilder.h | 4 +-
src/jtrrouter/ROJTRFrame.cpp | 4 +-
src/jtrrouter/ROJTRFrame.h | 4 +-
src/jtrrouter/ROJTRRouter.cpp | 10 +-
src/jtrrouter/ROJTRRouter.h | 8 +-
src/jtrrouter/ROJTRTurnDefLoader.cpp | 4 +-
src/jtrrouter/ROJTRTurnDefLoader.h | 4 +-
src/jtrrouter/jtrrouter_main.cpp | 4 +-
src/marouter/Makefile.am | 6 +-
src/marouter/Makefile.in | 12 +-
src/marouter/ROMAAssignments.cpp | 26 +-
src/marouter/ROMAAssignments.h | 6 +-
src/marouter/ROMAEdge.cpp | 4 +-
src/marouter/ROMAEdge.h | 4 +-
src/marouter/ROMAEdgeBuilder.cpp | 4 +-
src/marouter/ROMAEdgeBuilder.h | 4 +-
src/marouter/ROMAFrame.cpp | 4 +-
src/marouter/ROMAFrame.h | 4 +-
src/marouter/marouter_main.cpp | 26 +-
src/microsim/MSAbstractLaneChangeModel.cpp | 221 --
src/microsim/MSAbstractLaneChangeModel.h | 376 ---
src/microsim/MSBaseVehicle.cpp | 52 +-
src/microsim/MSBaseVehicle.h | 29 +-
src/microsim/MSBitSetLogic.h | 6 +-
src/microsim/MSCModel_NonInteracting.cpp | 158 ++
src/microsim/MSCModel_NonInteracting.h | 137 +
src/microsim/MSContainer.cpp | 563 ++++
src/microsim/MSContainer.h | 697 +++++
src/microsim/MSContainerControl.cpp | 239 ++
src/microsim/MSContainerControl.h | 145 ++
src/microsim/MSEdge.cpp | 66 +-
src/microsim/MSEdge.h | 90 +-
src/microsim/MSEdgeControl.cpp | 6 +-
src/microsim/MSEdgeControl.h | 12 +-
src/microsim/MSEdgeWeightsStorage.cpp | 4 +-
src/microsim/MSEdgeWeightsStorage.h | 4 +-
src/microsim/MSEventControl.cpp | 4 +-
src/microsim/MSEventControl.h | 4 +-
src/microsim/MSFrame.cpp | 33 +-
src/microsim/MSFrame.h | 4 +-
src/microsim/MSGlobals.cpp | 4 +-
src/microsim/MSGlobals.h | 4 +-
src/microsim/MSInsertionControl.cpp | 19 +-
src/microsim/MSInsertionControl.h | 10 +-
src/microsim/MSInternalJunction.cpp | 22 +-
src/microsim/MSInternalJunction.h | 4 +-
src/microsim/MSJunction.cpp | 4 +-
src/microsim/MSJunction.h | 14 +-
src/microsim/MSJunctionControl.cpp | 20 +-
src/microsim/MSJunctionControl.h | 4 +-
src/microsim/MSJunctionLogic.cpp | 4 +-
src/microsim/MSJunctionLogic.h | 4 +-
src/microsim/MSLCM_DK2008.cpp | 680 -----
src/microsim/MSLCM_DK2008.h | 172 --
src/microsim/MSLCM_JE2013.cpp | 1223 ---------
src/microsim/MSLCM_JE2013.h | 197 --
src/microsim/MSLCM_LC2013.cpp | 780 ------
src/microsim/MSLCM_LC2013.h | 199 --
src/microsim/MSLane.cpp | 96 +-
src/microsim/MSLane.h | 15 +-
src/microsim/MSLaneChanger.cpp | 14 +-
src/microsim/MSLaneChanger.h | 4 +-
src/microsim/MSLink.cpp | 161 +-
src/microsim/MSLink.h | 28 +-
src/microsim/MSLinkCont.cpp | 4 +-
src/microsim/MSLinkCont.h | 4 +-
src/microsim/MSLogicJunction.cpp | 4 +-
src/microsim/MSLogicJunction.h | 4 +-
src/microsim/MSMoveReminder.cpp | 17 +-
src/microsim/MSMoveReminder.h | 13 +-
src/microsim/MSNet.cpp | 79 +-
src/microsim/MSNet.h | 70 +-
src/microsim/MSNoLogicJunction.cpp | 4 +-
src/microsim/MSNoLogicJunction.h | 4 +-
src/microsim/MSPModel.cpp | 128 -
src/microsim/MSPModel.h | 119 -
src/microsim/MSPModel_NonInteracting.cpp | 175 --
src/microsim/MSPModel_NonInteracting.h | 119 -
src/microsim/MSPModel_Striping.cpp | 1042 --------
src/microsim/MSPModel_Striping.h | 346 ---
src/microsim/MSPerson.cpp | 641 -----
src/microsim/MSPerson.h | 643 -----
src/microsim/MSPersonControl.cpp | 33 +-
src/microsim/MSPersonControl.h | 64 +-
src/microsim/MSRightOfWayJunction.cpp | 4 +-
src/microsim/MSRightOfWayJunction.h | 8 +-
src/microsim/MSRoute.cpp | 52 +-
src/microsim/MSRoute.h | 37 +-
src/microsim/MSRouteHandler.cpp | 377 ++-
src/microsim/MSRouteHandler.h | 25 +-
src/microsim/MSStateHandler.cpp | 4 +-
src/microsim/MSStateHandler.h | 4 +-
src/microsim/MSVehicle.cpp | 205 +-
src/microsim/MSVehicle.h | 90 +-
src/microsim/MSVehicleContainer.cpp | 4 +-
src/microsim/MSVehicleContainer.h | 4 +-
src/microsim/MSVehicleControl.cpp | 66 +-
src/microsim/MSVehicleControl.h | 69 +-
src/microsim/MSVehicleTransfer.cpp | 10 +-
src/microsim/MSVehicleTransfer.h | 4 +-
src/microsim/MSVehicleType.cpp | 11 +-
src/microsim/MSVehicleType.h | 34 +-
src/microsim/Makefile.am | 15 +-
src/microsim/Makefile.in | 39 +-
src/microsim/actions/Command_SaveTLCoupledDet.cpp | 4 +-
src/microsim/actions/Command_SaveTLCoupledDet.h | 4 +-
.../actions/Command_SaveTLCoupledLaneDet.cpp | 4 +-
.../actions/Command_SaveTLCoupledLaneDet.h | 4 +-
src/microsim/actions/Command_SaveTLSState.cpp | 4 +-
src/microsim/actions/Command_SaveTLSState.h | 4 +-
.../actions/Command_SaveTLSSwitchStates.cpp | 4 +-
src/microsim/actions/Command_SaveTLSSwitchStates.h | 4 +-
src/microsim/actions/Command_SaveTLSSwitches.cpp | 4 +-
src/microsim/actions/Command_SaveTLSSwitches.h | 4 +-
src/microsim/cfmodels/MSCFModel.cpp | 8 +-
src/microsim/cfmodels/MSCFModel.h | 8 +-
src/microsim/cfmodels/MSCFModel_Daniel1.cpp | 6 +-
src/microsim/cfmodels/MSCFModel_Daniel1.h | 8 +-
src/microsim/cfmodels/MSCFModel_IDM.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_IDM.h | 8 +-
src/microsim/cfmodels/MSCFModel_Kerner.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_Kerner.h | 8 +-
src/microsim/cfmodels/MSCFModel_Krauss.cpp | 6 +-
src/microsim/cfmodels/MSCFModel_Krauss.h | 8 +-
.../cfmodels/MSCFModel_KraussAccelBound.cpp | 69 +
src/microsim/cfmodels/MSCFModel_KraussAccelBound.h | 96 +
src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp | 6 +-
src/microsim/cfmodels/MSCFModel_KraussOrig1.h | 8 +-
src/microsim/cfmodels/MSCFModel_KraussPS.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_KraussPS.h | 8 +-
src/microsim/cfmodels/MSCFModel_PWag2009.cpp | 28 +-
src/microsim/cfmodels/MSCFModel_PWag2009.h | 8 +-
src/microsim/cfmodels/MSCFModel_SmartSK.cpp | 12 +-
src/microsim/cfmodels/MSCFModel_SmartSK.h | 8 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.h | 8 +-
src/microsim/cfmodels/Makefile.am | 1 +
src/microsim/cfmodels/Makefile.in | 3 +
src/microsim/devices/MSDevice.cpp | 5 +-
src/microsim/devices/MSDevice.h | 4 +-
src/microsim/devices/MSDevice_BTreceiver.cpp | 177 +-
src/microsim/devices/MSDevice_BTreceiver.h | 123 +-
src/microsim/devices/MSDevice_BTsender.cpp | 21 +-
src/microsim/devices/MSDevice_BTsender.h | 14 +-
src/microsim/devices/MSDevice_Container.cpp | 135 +
src/microsim/devices/MSDevice_Container.h | 172 ++
src/microsim/devices/MSDevice_Emissions.cpp | 4 +-
src/microsim/devices/MSDevice_Emissions.h | 4 +-
src/microsim/devices/MSDevice_Example.cpp | 4 +-
src/microsim/devices/MSDevice_Person.cpp | 6 +-
src/microsim/devices/MSDevice_Person.h | 4 +-
src/microsim/devices/MSDevice_Routing.cpp | 86 +-
src/microsim/devices/MSDevice_Routing.h | 7 +-
src/microsim/devices/MSDevice_Tripinfo.cpp | 41 +-
src/microsim/devices/MSDevice_Tripinfo.h | 4 +-
src/microsim/devices/MSDevice_Vehroutes.cpp | 6 +-
src/microsim/devices/MSDevice_Vehroutes.h | 4 +-
src/microsim/devices/Makefile.am | 1 +
src/microsim/devices/Makefile.in | 9 +-
.../lcmodels/MSAbstractLaneChangeModel.cpp | 221 ++
src/microsim/lcmodels/MSAbstractLaneChangeModel.h | 377 +++
src/microsim/lcmodels/MSLCM_DK2008.cpp | 680 +++++
src/microsim/lcmodels/MSLCM_DK2008.h | 172 ++
src/microsim/lcmodels/MSLCM_JE2013.cpp | 1223 +++++++++
src/microsim/lcmodels/MSLCM_JE2013.h | 197 ++
src/microsim/lcmodels/MSLCM_LC2013.cpp | 780 ++++++
src/microsim/lcmodels/MSLCM_LC2013.h | 199 ++
src/microsim/lcmodels/Makefile.am | 8 +
src/microsim/lcmodels/Makefile.in | 624 +++++
src/microsim/logging/CastingFunctionBinding.h | 6 +-
src/microsim/logging/FuncBinding_IntParam.h | 6 +-
src/microsim/logging/FuncBinding_StringParam.h | 6 +-
src/microsim/logging/FunctionBinding.h | 6 +-
src/microsim/output/MSAmitranTrajectories.cpp | 4 +-
src/microsim/output/MSAmitranTrajectories.h | 4 +-
src/microsim/output/MSCrossSection.h | 4 +-
src/microsim/output/MSDetectorControl.cpp | 4 +-
src/microsim/output/MSDetectorControl.h | 4 +-
src/microsim/output/MSDetectorFileOutput.h | 4 +-
src/microsim/output/MSE3Collector.cpp | 4 +-
src/microsim/output/MSE3Collector.h | 4 +-
src/microsim/output/MSEmissionExport.cpp | 44 +-
src/microsim/output/MSEmissionExport.h | 4 +-
src/microsim/output/MSFCDExport.cpp | 65 +-
src/microsim/output/MSFCDExport.h | 4 +-
src/microsim/output/MSFullExport.cpp | 34 +-
src/microsim/output/MSFullExport.h | 4 +-
src/microsim/output/MSInductLoop.cpp | 4 +-
src/microsim/output/MSInductLoop.h | 4 +-
src/microsim/output/MSInstantInductLoop.cpp | 4 +-
src/microsim/output/MSInstantInductLoop.h | 4 +-
src/microsim/output/MSMeanData.cpp | 20 +-
src/microsim/output/MSMeanData.h | 7 +-
src/microsim/output/MSMeanData_Amitran.cpp | 4 +-
src/microsim/output/MSMeanData_Amitran.h | 4 +-
src/microsim/output/MSMeanData_Emissions.cpp | 4 +-
src/microsim/output/MSMeanData_Emissions.h | 4 +-
src/microsim/output/MSMeanData_Harmonoise.cpp | 4 +-
src/microsim/output/MSMeanData_Harmonoise.h | 4 +-
src/microsim/output/MSMeanData_Net.cpp | 6 +-
src/microsim/output/MSMeanData_Net.h | 4 +-
src/microsim/output/MSQueueExport.cpp | 8 +-
src/microsim/output/MSQueueExport.h | 4 +-
src/microsim/output/MSRouteProbe.cpp | 4 +-
src/microsim/output/MSRouteProbe.h | 4 +-
src/microsim/output/MSVTKExport.cpp | 4 +-
src/microsim/output/MSVTKExport.h | 4 +-
src/microsim/output/MSVTypeProbe.cpp | 44 +-
src/microsim/output/MSVTypeProbe.h | 4 +-
src/microsim/output/MSXMLRawOut.cpp | 44 +-
src/microsim/output/MSXMLRawOut.h | 7 +-
.../output/MS_E2_ZS_CollectorOverLanes.cpp | 8 +-
src/microsim/output/MS_E2_ZS_CollectorOverLanes.h | 4 +-
src/microsim/pedestrians/MSPModel.cpp | 128 +
src/microsim/pedestrians/MSPModel.h | 119 +
.../pedestrians/MSPModel_NonInteracting.cpp | 175 ++
src/microsim/pedestrians/MSPModel_NonInteracting.h | 119 +
src/microsim/pedestrians/MSPModel_Striping.cpp | 1200 +++++++++
src/microsim/pedestrians/MSPModel_Striping.h | 374 +++
src/microsim/pedestrians/MSPerson.cpp | 642 +++++
src/microsim/pedestrians/MSPerson.h | 644 +++++
src/microsim/pedestrians/Makefile.am | 6 +
src/microsim/pedestrians/Makefile.in | 622 +++++
.../traffic_lights/MSActuatedTrafficLightLogic.cpp | 17 +-
.../traffic_lights/MSActuatedTrafficLightLogic.h | 10 +-
.../MSAgentbasedTrafficLightLogic.cpp | 398 ---
.../traffic_lights/MSAgentbasedTrafficLightLogic.h | 212 --
.../traffic_lights/MSOffTrafficLightLogic.cpp | 4 +-
.../traffic_lights/MSOffTrafficLightLogic.h | 15 +-
src/microsim/traffic_lights/MSPhaseDefinition.h | 4 +-
src/microsim/traffic_lights/MSRailSignal.cpp | 279 ++
src/microsim/traffic_lights/MSRailSignal.h | 245 ++
.../traffic_lights/MSSimpleTrafficLightLogic.cpp | 12 +-
.../traffic_lights/MSSimpleTrafficLightLogic.h | 14 +-
src/microsim/traffic_lights/MSTLLogicControl.cpp | 6 +-
src/microsim/traffic_lights/MSTLLogicControl.h | 4 +-
.../traffic_lights/MSTrafficLightLogic.cpp | 21 +-
src/microsim/traffic_lights/MSTrafficLightLogic.h | 24 +-
src/microsim/traffic_lights/Makefile.am | 5 +-
src/microsim/traffic_lights/Makefile.in | 10 +-
src/microsim/trigger/MSBusStop.cpp | 4 +-
src/microsim/trigger/MSBusStop.h | 6 +-
src/microsim/trigger/MSCalibrator.cpp | 4 +-
src/microsim/trigger/MSCalibrator.h | 4 +-
src/microsim/trigger/MSContainerStop.cpp | 115 +
src/microsim/trigger/MSContainerStop.h | 205 ++
src/microsim/trigger/MSContainerTerminal.cpp | 111 +
src/microsim/trigger/MSContainerTerminal.h | 179 ++
src/microsim/trigger/MSLaneSpeedTrigger.cpp | 4 +-
src/microsim/trigger/MSLaneSpeedTrigger.h | 4 +-
src/microsim/trigger/MSTrigger.cpp | 4 +-
src/microsim/trigger/MSTrigger.h | 4 +-
src/microsim/trigger/MSTriggeredReader.cpp | 98 -
src/microsim/trigger/MSTriggeredReader.h | 91 -
src/microsim/trigger/MSTriggeredRerouter.cpp | 128 +-
src/microsim/trigger/MSTriggeredRerouter.h | 33 +-
src/microsim/trigger/Makefile.am | 3 +-
src/microsim/trigger/Makefile.in | 12 +-
src/netbuild/NBAlgorithms.cpp | 94 +-
src/netbuild/NBAlgorithms.h | 12 +-
src/netbuild/NBAlgorithms_Ramps.cpp | 39 +-
src/netbuild/NBAlgorithms_Ramps.h | 4 +-
src/netbuild/NBCapacity2Lanes.h | 4 +-
src/netbuild/NBConnection.cpp | 4 +-
src/netbuild/NBConnection.h | 4 +-
src/netbuild/NBConnectionDefs.h | 4 +-
src/netbuild/NBCont.h | 4 +-
src/netbuild/NBContHelper.cpp | 26 +-
src/netbuild/NBContHelper.h | 17 +-
src/netbuild/NBDistribution.cpp | 4 +-
src/netbuild/NBDistribution.h | 4 +-
src/netbuild/NBDistrict.cpp | 4 +-
src/netbuild/NBDistrict.h | 4 +-
src/netbuild/NBDistrictCont.cpp | 4 +-
src/netbuild/NBDistrictCont.h | 4 +-
src/netbuild/NBEdge.cpp | 236 +-
src/netbuild/NBEdge.h | 73 +-
src/netbuild/NBEdgeCont.cpp | 75 +-
src/netbuild/NBEdgeCont.h | 20 +-
src/netbuild/NBFrame.cpp | 12 +-
src/netbuild/NBFrame.h | 4 +-
src/netbuild/NBHeightMapper.cpp | 104 +-
src/netbuild/NBHeightMapper.h | 26 +-
src/netbuild/NBHelpers.cpp | 4 +-
src/netbuild/NBHelpers.h | 4 +-
src/netbuild/NBJoinedEdgesMap.cpp | 4 +-
src/netbuild/NBJoinedEdgesMap.h | 4 +-
src/netbuild/NBLinkPossibilityMatrix.h | 4 +-
src/netbuild/NBLoadedSUMOTLDef.cpp | 58 +-
src/netbuild/NBLoadedSUMOTLDef.h | 12 +-
src/netbuild/NBLoadedTLDef.cpp | 4 +-
src/netbuild/NBLoadedTLDef.h | 4 +-
src/netbuild/NBNetBuilder.cpp | 45 +-
src/netbuild/NBNetBuilder.h | 4 +-
src/netbuild/NBNode.cpp | 534 +++-
src/netbuild/NBNode.h | 97 +-
src/netbuild/NBNodeCont.cpp | 18 +-
src/netbuild/NBNodeCont.h | 9 +-
src/netbuild/NBNodeShapeComputer.cpp | 692 +++--
src/netbuild/NBNodeShapeComputer.h | 62 +-
src/netbuild/NBOwnTLDef.cpp | 115 +-
src/netbuild/NBOwnTLDef.h | 20 +-
src/netbuild/NBRequest.cpp | 39 +-
src/netbuild/NBRequest.h | 16 +-
src/netbuild/NBSign.cpp | 4 +-
src/netbuild/NBSign.h | 4 +-
src/netbuild/NBTrafficLightDefinition.cpp | 59 +-
src/netbuild/NBTrafficLightDefinition.h | 60 +-
src/netbuild/NBTrafficLightLogic.cpp | 4 +-
src/netbuild/NBTrafficLightLogic.h | 4 +-
src/netbuild/NBTrafficLightLogicCont.cpp | 18 +-
src/netbuild/NBTrafficLightLogicCont.h | 6 +-
src/netbuild/NBTypeCont.cpp | 4 +-
src/netbuild/NBTypeCont.h | 4 +-
src/netconvert_main.cpp | 4 +-
src/netgen/NGEdge.cpp | 4 +-
src/netgen/NGEdge.h | 4 +-
src/netgen/NGFrame.cpp | 8 +-
src/netgen/NGFrame.h | 4 +-
src/netgen/NGNet.cpp | 4 +-
src/netgen/NGNet.h | 4 +-
src/netgen/NGNode.cpp | 4 +-
src/netgen/NGNode.h | 4 +-
src/netgen/NGRandomNetBuilder.cpp | 4 +-
src/netgen/NGRandomNetBuilder.h | 4 +-
src/netgen/netgen_main.cpp | 4 +-
src/netimport/NIFrame.cpp | 7 +-
src/netimport/NIFrame.h | 4 +-
src/netimport/NIImporter_ArcView.cpp | 4 +-
src/netimport/NIImporter_ArcView.h | 4 +-
src/netimport/NIImporter_DlrNavteq.cpp | 4 +-
src/netimport/NIImporter_DlrNavteq.h | 4 +-
src/netimport/NIImporter_ITSUMO.cpp | 4 +-
src/netimport/NIImporter_ITSUMO.h | 4 +-
src/netimport/NIImporter_MATSim.cpp | 4 +-
src/netimport/NIImporter_MATSim.h | 4 +-
src/netimport/NIImporter_OpenDrive.cpp | 16 +-
src/netimport/NIImporter_OpenDrive.h | 4 +-
src/netimport/NIImporter_OpenStreetMap.cpp | 100 +-
src/netimport/NIImporter_OpenStreetMap.h | 4 +-
src/netimport/NIImporter_RobocupRescue.cpp | 4 +-
src/netimport/NIImporter_RobocupRescue.h | 4 +-
src/netimport/NIImporter_SUMO.cpp | 39 +-
src/netimport/NIImporter_SUMO.h | 10 +-
src/netimport/NIImporter_VISUM.cpp | 4 +-
src/netimport/NIImporter_VISUM.h | 4 +-
src/netimport/NILoader.cpp | 6 +-
src/netimport/NILoader.h | 4 +-
src/netimport/NINavTeqHelper.cpp | 4 +-
src/netimport/NINavTeqHelper.h | 4 +-
src/netimport/NIVisumTL.cpp | 4 +-
src/netimport/NIVisumTL.h | 4 +-
src/netimport/NIXMLConnectionsHandler.cpp | 29 +-
src/netimport/NIXMLConnectionsHandler.h | 15 +-
src/netimport/NIXMLEdgesHandler.cpp | 66 +-
src/netimport/NIXMLEdgesHandler.h | 7 +-
src/netimport/NIXMLNodesHandler.cpp | 10 +-
src/netimport/NIXMLNodesHandler.h | 4 +-
src/netimport/NIXMLTrafficLightsHandler.cpp | 81 +-
src/netimport/NIXMLTrafficLightsHandler.h | 4 +-
src/netimport/NIXMLTypesHandler.cpp | 4 +-
src/netimport/NIXMLTypesHandler.h | 4 +-
src/netimport/vissim/NIImporter_Vissim.cpp | 4 +-
src/netimport/vissim/NIImporter_Vissim.h | 4 +-
src/netimport/vissim/NIVissimElements.h | 4 +-
.../vissim/tempstructs/NIVissimAbstractEdge.cpp | 4 +-
.../vissim/tempstructs/NIVissimAbstractEdge.h | 4 +-
.../tempstructs/NIVissimBoundedClusterObject.cpp | 4 +-
.../tempstructs/NIVissimBoundedClusterObject.h | 4 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.cpp | 4 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.h | 4 +-
.../vissim/tempstructs/NIVissimClosedLanesVector.h | 4 +-
.../vissim/tempstructs/NIVissimClosures.cpp | 4 +-
.../vissim/tempstructs/NIVissimClosures.h | 4 +-
.../vissim/tempstructs/NIVissimConnection.cpp | 4 +-
.../vissim/tempstructs/NIVissimConnection.h | 4 +-
.../tempstructs/NIVissimConnectionCluster.cpp | 4 +-
.../vissim/tempstructs/NIVissimConnectionCluster.h | 4 +-
.../tempstructs/NIVissimDistrictConnection.cpp | 4 +-
.../tempstructs/NIVissimDistrictConnection.h | 4 +-
.../vissim/tempstructs/NIVissimDisturbance.cpp | 4 +-
.../vissim/tempstructs/NIVissimDisturbance.h | 4 +-
src/netimport/vissim/tempstructs/NIVissimEdge.cpp | 4 +-
src/netimport/vissim/tempstructs/NIVissimEdge.h | 4 +-
.../vissim/tempstructs/NIVissimEdgePosMap.cpp | 4 +-
.../vissim/tempstructs/NIVissimEdgePosMap.h | 4 +-
.../tempstructs/NIVissimExtendedEdgePoint.cpp | 4 +-
.../vissim/tempstructs/NIVissimExtendedEdgePoint.h | 4 +-
.../tempstructs/NIVissimExtendedEdgePointVector.h | 4 +-
.../vissim/tempstructs/NIVissimNodeCluster.cpp | 4 +-
.../vissim/tempstructs/NIVissimNodeCluster.h | 4 +-
.../vissim/tempstructs/NIVissimNodeDef.cpp | 4 +-
src/netimport/vissim/tempstructs/NIVissimNodeDef.h | 4 +-
.../vissim/tempstructs/NIVissimNodeDef_Edges.cpp | 4 +-
.../vissim/tempstructs/NIVissimNodeDef_Edges.h | 4 +-
.../vissim/tempstructs/NIVissimNodeDef_Poly.cpp | 4 +-
.../vissim/tempstructs/NIVissimNodeDef_Poly.h | 4 +-
.../tempstructs/NIVissimNodeParticipatingEdge.cpp | 4 +-
.../tempstructs/NIVissimNodeParticipatingEdge.h | 4 +-
.../NIVissimNodeParticipatingEdgeVector.h | 4 +-
.../vissim/tempstructs/NIVissimSource.cpp | 4 +-
src/netimport/vissim/tempstructs/NIVissimSource.h | 4 +-
src/netimport/vissim/tempstructs/NIVissimTL.cpp | 16 +-
src/netimport/vissim/tempstructs/NIVissimTL.h | 4 +-
.../tempstructs/NIVissimTrafficDescription.cpp | 4 +-
.../tempstructs/NIVissimTrafficDescription.h | 4 +-
.../vissim/tempstructs/NIVissimVehTypeClass.cpp | 4 +-
.../vissim/tempstructs/NIVissimVehTypeClass.h | 4 +-
.../vissim/tempstructs/NIVissimVehicleClass.cpp | 4 +-
.../vissim/tempstructs/NIVissimVehicleClass.h | 4 +-
.../tempstructs/NIVissimVehicleClassVector.h | 4 +-
.../vissim/tempstructs/NIVissimVehicleType.cpp | 4 +-
.../vissim/tempstructs/NIVissimVehicleType.h | 4 +-
...issimSingleTypeParser_Auswertungsdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Auswertungsdefinition.h | 4 +-
...NIVissimSingleTypeParser_Detektordefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Detektordefinition.h | 4 +-
.../typeloader/NIVissimSingleTypeParser_DynUml.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_DynUml.h | 4 +-
...IVissimSingleTypeParser_Einheitendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Einheitendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Emission.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_Emission.h | 4 +-
...IVissimSingleTypeParser_Fahrtverlaufdateien.cpp | 4 +-
.../NIVissimSingleTypeParser_Fahrtverlaufdateien.h | 4 +-
...simSingleTypeParser_Fahrverhaltendefinition.cpp | 4 +-
...issimSingleTypeParser_Fahrverhaltendefinition.h | 4 +-
...mSingleTypeParser_Fahrzeugklassendefinition.cpp | 4 +-
...simSingleTypeParser_Fahrzeugklassendefinition.h | 4 +-
...issimSingleTypeParser_Fahrzeugtypdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Fahrzeugtypdefinition.h | 4 +-
.../NIVissimSingleTypeParser_Fensterdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Fensterdefinition.h | 4 +-
...imSingleTypeParser_Gefahrwarnungsdefinition.cpp | 4 +-
...ssimSingleTypeParser_Gefahrwarnungsdefinition.h | 4 +-
...simSingleTypeParser_Gelbverhaltendefinition.cpp | 4 +-
...issimSingleTypeParser_Gelbverhaltendefinition.h | 4 +-
...arser_Geschwindigkeitsverteilungsdefinition.cpp | 4 +-
...eParser_Geschwindigkeitsverteilungsdefinition.h | 4 +-
...ssimSingleTypeParser_Haltestellendefinition.cpp | 4 +-
...VissimSingleTypeParser_Haltestellendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Kantensperrung.cpp | 4 +-
.../NIVissimSingleTypeParser_Kantensperrung.h | 4 +-
.../NIVissimSingleTypeParser_Kennungszeile.cpp | 4 +-
.../NIVissimSingleTypeParser_Kennungszeile.h | 4 +-
.../NIVissimSingleTypeParser_Knotendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Knotendefinition.h | 4 +-
...ssimSingleTypeParser_LSAKopplungsdefinition.cpp | 4 +-
...VissimSingleTypeParser_LSAKopplungsdefinition.h | 4 +-
...ngleTypeParser_Laengenverteilungsdefinition.cpp | 4 +-
...SingleTypeParser_Laengenverteilungsdefinition.h | 4 +-
...ngleTypeParser_Langsamfahrbereichdefinition.cpp | 4 +-
...SingleTypeParser_Langsamfahrbereichdefinition.h | 4 +-
...ngleTypeParser_Lichtsignalanlagendefinition.cpp | 4 +-
...SingleTypeParser_Lichtsignalanlagendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Liniendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Liniendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Linksverkehr.cpp | 4 +-
.../NIVissimSingleTypeParser_Linksverkehr.h | 4 +-
...NIVissimSingleTypeParser_Messungsdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Messungsdefinition.h | 4 +-
...VissimSingleTypeParser_Netzobjektdefinition.cpp | 4 +-
...NIVissimSingleTypeParser_Netzobjektdefinition.h | 4 +-
...IVissimSingleTypeParser_Parkplatzdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Parkplatzdefinition.h | 4 +-
...leTypeParser_Querschnittsmessungsdefinition.cpp | 4 +-
...ngleTypeParser_Querschnittsmessungsdefinition.h | 4 +-
...eTypeParser_Querverkehrsstoerungsdefinition.cpp | 4 +-
...gleTypeParser_Querverkehrsstoerungsdefinition.h | 4 +-
.../NIVissimSingleTypeParser_Rautedefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Rautedefinition.h | 4 +-
...ingleTypeParser_Reisezeitmessungsdefinition.cpp | 4 +-
...mSingleTypeParser_Reisezeitmessungsdefinition.h | 4 +-
...TypeParser_Richtungsentscheidungsdefinition.cpp | 4 +-
...leTypeParser_Richtungsentscheidungsdefinition.h | 4 +-
...imSingleTypeParser_Richtungspfeildefinition.cpp | 4 +-
...ssimSingleTypeParser_Richtungspfeildefinition.h | 4 +-
...gleTypeParser_Routenentscheidungsdefinition.cpp | 4 +-
...ingleTypeParser_Routenentscheidungsdefinition.h | 4 +-
...issimSingleTypeParser_Signalgeberdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Signalgeberdefinition.h | 4 +-
...simSingleTypeParser_Signalgruppendefinition.cpp | 4 +-
...issimSingleTypeParser_Signalgruppendefinition.h | 4 +-
.../NIVissimSingleTypeParser_SimRate.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_SimRate.h | 4 +-
.../NIVissimSingleTypeParser_Simdauer.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_Simdauer.h | 4 +-
.../NIVissimSingleTypeParser_Startuhrzeit.cpp | 4 +-
.../NIVissimSingleTypeParser_Startuhrzeit.h | 4 +-
.../NIVissimSingleTypeParser_Startzufallszahl.cpp | 4 +-
.../NIVissimSingleTypeParser_Startzufallszahl.h | 4 +-
...simSingleTypeParser_Stauparameterdefinition.cpp | 4 +-
...issimSingleTypeParser_Stauparameterdefinition.h | 4 +-
...issimSingleTypeParser_Stauzaehlerdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Stauzaehlerdefinition.h | 4 +-
...VissimSingleTypeParser_Stopschilddefinition.cpp | 4 +-
...NIVissimSingleTypeParser_Stopschilddefinition.h | 4 +-
...NIVissimSingleTypeParser_Streckendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Streckendefinition.h | 4 +-
...issimSingleTypeParser_Streckentypdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Streckentypdefinition.h | 4 +-
.../NIVissimSingleTypeParser_TEAPACDefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_TEAPACDefinition.h | 4 +-
...leTypeParser_VWunschentscheidungsdefinition.cpp | 4 +-
...ngleTypeParser_VWunschentscheidungsdefinition.h | 4 +-
...issimSingleTypeParser_Verbindungsdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Verbindungsdefinition.h | 4 +-
...peParser_Verkehrszusammensetzungsdefinition.cpp | 4 +-
...TypeParser_Verkehrszusammensetzungsdefinition.h | 4 +-
...gleTypeParser_Verlustzeitmessungsdefinition.cpp | 4 +-
...ingleTypeParser_Verlustzeitmessungsdefinition.h | 4 +-
...ingleTypeParser_Zeitenverteilungsdefinition.cpp | 4 +-
...mSingleTypeParser_Zeitenverteilungsdefinition.h | 4 +-
.../NIVissimSingleTypeParser_Zeitschrittfaktor.cpp | 4 +-
.../NIVissimSingleTypeParser_Zeitschrittfaktor.h | 4 +-
.../NIVissimSingleTypeParser_Zuflussdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Zuflussdefinition.h | 4 +-
...SingleTypeParser_Zusammensetzungsdefinition.cpp | 4 +-
...imSingleTypeParser_Zusammensetzungsdefinition.h | 4 +-
.../NIVissimSingleTypeParser__XKurvedefinition.cpp | 4 +-
.../NIVissimSingleTypeParser__XKurvedefinition.h | 4 +-
...simSingleTypeParser__XVerteilungsdefinition.cpp | 4 +-
...issimSingleTypeParser__XVerteilungsdefinition.h | 4 +-
src/netload/NLBuilder.cpp | 14 +-
src/netload/NLBuilder.h | 4 +-
src/netload/NLDetectorBuilder.cpp | 4 +-
src/netload/NLDetectorBuilder.h | 4 +-
src/netload/NLDiscreteEventBuilder.cpp | 4 +-
src/netload/NLDiscreteEventBuilder.h | 4 +-
src/netload/NLEdgeControlBuilder.cpp | 15 +-
src/netload/NLEdgeControlBuilder.h | 9 +-
src/netload/NLHandler.cpp | 175 +-
src/netload/NLHandler.h | 30 +-
src/netload/NLJunctionControlBuilder.cpp | 64 +-
src/netload/NLJunctionControlBuilder.h | 5 +-
src/netload/NLTriggerBuilder.cpp | 48 +-
src/netload/NLTriggerBuilder.h | 32 +-
src/netwrite/NWFrame.cpp | 13 +-
src/netwrite/NWFrame.h | 4 +-
src/netwrite/NWWriter_Amitran.cpp | 7 +-
src/netwrite/NWWriter_Amitran.h | 4 +-
src/netwrite/NWWriter_DlrNavteq.cpp | 24 +-
src/netwrite/NWWriter_DlrNavteq.h | 5 +-
src/netwrite/NWWriter_MATSim.cpp | 4 +-
src/netwrite/NWWriter_MATSim.h | 4 +-
src/netwrite/NWWriter_OpenDrive.cpp | 4 +-
src/netwrite/NWWriter_OpenDrive.h | 4 +-
src/netwrite/NWWriter_SUMO.cpp | 62 +-
src/netwrite/NWWriter_SUMO.h | 13 +-
src/netwrite/NWWriter_XML.cpp | 20 +-
src/netwrite/NWWriter_XML.h | 4 +-
src/od/Makefile.am | 7 +
src/od/Makefile.in | 625 +++++
src/od/ODAmitranHandler.cpp | 75 +
src/od/ODAmitranHandler.h | 108 +
src/od/ODCell.h | 83 +
src/od/ODDistrict.cpp | 95 +
src/od/ODDistrict.h | 155 ++
src/od/ODDistrictCont.cpp | 113 +
src/od/ODDistrictCont.h | 112 +
src/od/ODDistrictHandler.cpp | 162 ++
src/od/ODDistrictHandler.h | 187 ++
src/od/ODMatrix.cpp | 551 ++++
src/od/ODMatrix.h | 406 +++
src/od2trips/Makefile.am | 32 -
src/od2trips/Makefile.in | 699 -----
src/od2trips/ODAmitranHandler.cpp | 75 -
src/od2trips/ODAmitranHandler.h | 108 -
src/od2trips/ODCell.h | 83 -
src/od2trips/ODDistrict.cpp | 95 -
src/od2trips/ODDistrict.h | 155 --
src/od2trips/ODDistrictCont.cpp | 95 -
src/od2trips/ODDistrictCont.h | 109 -
src/od2trips/ODDistrictHandler.cpp | 162 --
src/od2trips/ODDistrictHandler.h | 187 --
src/od2trips/ODMatrix.cpp | 551 ----
src/od2trips/ODMatrix.h | 406 ---
src/od2trips/od2trips_main.cpp | 324 ---
src/od2trips_main.cpp | 324 +++
src/polyconvert/PCLoaderArcView.cpp | 4 +-
src/polyconvert/PCLoaderArcView.h | 4 +-
src/polyconvert/PCLoaderDlrNavteq.cpp | 4 +-
src/polyconvert/PCLoaderDlrNavteq.h | 4 +-
src/polyconvert/PCLoaderOSM.cpp | 4 +-
src/polyconvert/PCLoaderOSM.h | 4 +-
src/polyconvert/PCLoaderVisum.cpp | 4 +-
src/polyconvert/PCLoaderVisum.h | 4 +-
src/polyconvert/PCLoaderXML.cpp | 4 +-
src/polyconvert/PCLoaderXML.h | 4 +-
src/polyconvert/PCNetProjectionLoader.cpp | 4 +-
src/polyconvert/PCNetProjectionLoader.h | 4 +-
src/polyconvert/PCPolyContainer.cpp | 66 +-
src/polyconvert/PCPolyContainer.h | 7 +-
src/polyconvert/PCTypeDefHandler.cpp | 4 +-
src/polyconvert/PCTypeDefHandler.h | 4 +-
src/polyconvert/PCTypeMap.cpp | 4 +-
src/polyconvert/PCTypeMap.h | 4 +-
src/polyconvert/polyconvert_main.cpp | 11 +-
src/router/ROAbstractEdgeBuilder.h | 4 +-
src/router/ROEdge.cpp | 46 +-
src/router/ROEdge.h | 40 +-
src/router/ROFrame.cpp | 7 +-
src/router/ROFrame.h | 4 +-
src/router/ROHelper.cpp | 8 +-
src/router/ROHelper.h | 6 +-
src/router/ROLane.h | 6 +-
src/router/ROLoader.cpp | 4 +-
src/router/ROLoader.h | 4 +-
src/router/RONet.cpp | 111 +-
src/router/RONet.h | 88 +-
src/router/RONetHandler.cpp | 61 +-
src/router/RONetHandler.h | 11 +-
src/router/RONode.cpp | 4 +-
src/router/RONode.h | 14 +-
src/router/RORoute.cpp | 20 +-
src/router/RORoute.h | 11 +-
src/router/RORouteAggregator.h | 11 +-
src/router/RORouteDef.cpp | 33 +-
src/router/RORouteDef.h | 4 +-
src/router/RORouteHandler.cpp | 181 +-
src/router/RORouteHandler.h | 17 +-
src/router/ROVehicle.cpp | 36 +-
src/router/ROVehicle.h | 29 +-
src/router/ROVehicleCont.cpp | 4 +-
src/router/ROVehicleCont.h | 4 +-
src/sumo_main.cpp | 4 +-
src/tools/Makefile.am | 2 +-
src/tools/Makefile.in | 2 +-
src/tools/TrajectoriesHandler.cpp | 4 +-
src/tools/TrajectoriesHandler.h | 4 +-
src/tools/emissionsDrivingCycle_main.cpp | 4 +-
src/tools/emissionsMap_main.cpp | 2 +-
src/traci-server/Makefile.am | 1 +
src/traci-server/Makefile.in | 5 +-
src/traci-server/TraCIConstants.h | 55 +-
src/traci-server/TraCIException.h | 4 +-
src/traci-server/TraCIServer.cpp | 52 +-
src/traci-server/TraCIServer.h | 10 +-
src/traci-server/TraCIServerAPI_ArealDetector.cpp | 2 +-
src/traci-server/TraCIServerAPI_ArealDetector.h | 4 +-
src/traci-server/TraCIServerAPI_Edge.cpp | 34 +-
src/traci-server/TraCIServerAPI_Edge.h | 4 +-
src/traci-server/TraCIServerAPI_InductionLoop.cpp | 4 +-
src/traci-server/TraCIServerAPI_InductionLoop.h | 4 +-
src/traci-server/TraCIServerAPI_Junction.cpp | 4 +-
src/traci-server/TraCIServerAPI_Junction.h | 4 +-
src/traci-server/TraCIServerAPI_Lane.cpp | 34 +-
src/traci-server/TraCIServerAPI_Lane.h | 4 +-
src/traci-server/TraCIServerAPI_MeMeDetector.cpp | 4 +-
src/traci-server/TraCIServerAPI_MeMeDetector.h | 4 +-
src/traci-server/TraCIServerAPI_POI.cpp | 35 +-
src/traci-server/TraCIServerAPI_POI.h | 4 +-
src/traci-server/TraCIServerAPI_Person.cpp | 234 ++
src/traci-server/TraCIServerAPI_Person.h | 98 +
src/traci-server/TraCIServerAPI_Polygon.cpp | 34 +-
src/traci-server/TraCIServerAPI_Polygon.h | 4 +-
src/traci-server/TraCIServerAPI_Route.cpp | 43 +-
src/traci-server/TraCIServerAPI_Route.h | 4 +-
src/traci-server/TraCIServerAPI_Simulation.cpp | 10 +-
src/traci-server/TraCIServerAPI_Simulation.h | 4 +-
src/traci-server/TraCIServerAPI_TLS.cpp | 96 +-
src/traci-server/TraCIServerAPI_TLS.h | 4 +-
src/traci-server/TraCIServerAPI_Vehicle.cpp | 436 ++--
src/traci-server/TraCIServerAPI_Vehicle.h | 29 +-
src/traci-server/TraCIServerAPI_VehicleType.cpp | 41 +-
src/traci-server/TraCIServerAPI_VehicleType.h | 4 +-
src/traci_testclient/TraCITestClient.cpp | 4 +-
src/traci_testclient/TraCITestClient.h | 4 +-
src/traci_testclient/tracitestclient_main.cpp | 4 +-
src/utils/common/AbstractMutex.h | 4 +-
src/utils/common/Command.h | 4 +-
src/utils/common/FileHelpers.cpp | 14 +-
src/utils/common/FileHelpers.h | 12 +-
src/utils/common/IDSupplier.cpp | 4 +-
src/utils/common/IDSupplier.h | 4 +-
src/utils/common/MsgHandler.cpp | 4 +-
src/utils/common/MsgHandler.h | 4 +-
src/utils/common/MsgRetrievingFunction.h | 4 +-
src/utils/common/Named.h | 4 +-
src/utils/common/NamedObjectCont.h | 4 +-
src/utils/common/NamedRTree.h | 4 +-
src/utils/common/Parameterised.cpp | 6 +-
src/utils/common/Parameterised.h | 6 +-
src/utils/common/RGBColor.cpp | 11 +-
src/utils/common/RGBColor.h | 5 +-
src/utils/common/RandHelper.cpp | 4 +-
src/utils/common/RandHelper.h | 13 +-
src/utils/common/RandomDistributor.h | 4 +-
src/utils/common/SUMOTime.cpp | 4 +-
src/utils/common/SUMOTime.h | 4 +-
src/utils/common/SUMOVehicleClass.cpp | 15 +-
src/utils/common/SUMOVehicleClass.h | 26 +-
src/utils/common/StaticCommand.h | 2 +-
src/utils/common/StdDefs.cpp | 4 +-
src/utils/common/StdDefs.h | 4 +-
src/utils/common/StringBijection.h | 4 +-
src/utils/common/StringTokenizer.cpp | 4 +-
src/utils/common/StringTokenizer.h | 4 +-
src/utils/common/StringUtils.cpp | 20 +-
src/utils/common/StringUtils.h | 10 +-
src/utils/common/SysUtils.cpp | 4 +-
src/utils/common/SysUtils.h | 4 +-
src/utils/common/SystemFrame.cpp | 7 +-
src/utils/common/SystemFrame.h | 4 +-
src/utils/common/ToString.h | 14 +-
src/utils/common/TplConvert.h | 4 +-
src/utils/common/UtilExceptions.h | 32 +-
src/utils/common/ValueRetriever.h | 4 +-
src/utils/common/ValueSource.h | 4 +-
src/utils/common/ValueTimeLine.h | 4 +-
src/utils/common/VectorHelper.h | 13 +-
src/utils/common/WrappingCommand.h | 4 +-
src/utils/distribution/Distribution.h | 4 +-
src/utils/distribution/DistributionCont.cpp | 4 +-
src/utils/distribution/DistributionCont.h | 4 +-
src/utils/distribution/Distribution_MeanDev.cpp | 4 +-
src/utils/distribution/Distribution_MeanDev.h | 4 +-
src/utils/distribution/Distribution_Points.cpp | 4 +-
src/utils/distribution/Distribution_Points.h | 4 +-
src/utils/emissions/HelpersHBEFA.cpp | 4 +-
src/utils/emissions/HelpersHBEFA.h | 4 +-
src/utils/emissions/HelpersHBEFA3.cpp | 4 +-
src/utils/emissions/HelpersHBEFA3.h | 4 +-
src/utils/emissions/HelpersHarmonoise.cpp | 4 +-
src/utils/emissions/HelpersHarmonoise.h | 4 +-
src/utils/emissions/HelpersPHEMlight.cpp | 31 +-
src/utils/emissions/HelpersPHEMlight.h | 2 +-
src/utils/emissions/PHEMCEP.cpp | 223 +-
src/utils/emissions/PHEMCEP.h | 70 +-
src/utils/emissions/PHEMCEPHandler.cpp | 192 +-
src/utils/emissions/PHEMCEPHandler.h | 43 +-
src/utils/emissions/PHEMConstants.h | 13 +-
src/utils/emissions/PollutantsInterface.cpp | 4 +-
src/utils/emissions/PollutantsInterface.h | 4 +-
src/utils/foxtools/FXBaseObject.cpp | 4 +-
src/utils/foxtools/FXBaseObject.h | 4 +-
src/utils/foxtools/FXLCDLabel.cpp | 4 +-
src/utils/foxtools/FXLCDLabel.h | 4 +-
src/utils/foxtools/FXLinkLabel.cpp | 4 +-
src/utils/foxtools/FXLinkLabel.h | 4 +-
src/utils/foxtools/FXRealSpinDial.cpp | 27 +-
src/utils/foxtools/FXRealSpinDial.h | 4 +-
src/utils/foxtools/FXSevenSegment.cpp | 4 +-
src/utils/foxtools/FXSevenSegment.h | 4 +-
src/utils/foxtools/FXSingleEventThread.cpp | 4 +-
src/utils/foxtools/FXSingleEventThread.h | 4 +-
src/utils/foxtools/FXThreadEvent.cpp | 4 +-
src/utils/foxtools/FXThreadEvent.h | 8 +-
src/utils/foxtools/FXThreadMessageRetriever.h | 4 +-
src/utils/foxtools/FXWorkerThread.h | 4 +-
src/utils/foxtools/MFXAddEditTypedTable.cpp | 4 +-
src/utils/foxtools/MFXAddEditTypedTable.h | 4 +-
src/utils/foxtools/MFXCheckableButton.cpp | 4 +-
src/utils/foxtools/MFXCheckableButton.h | 4 +-
src/utils/foxtools/MFXEditableTable.cpp | 4 +-
src/utils/foxtools/MFXEditableTable.h | 4 +-
src/utils/foxtools/MFXEventQue.cpp | 4 +-
src/utils/foxtools/MFXEventQue.h | 4 +-
src/utils/foxtools/MFXImageHelper.cpp | 4 +-
src/utils/foxtools/MFXImageHelper.h | 4 +-
src/utils/foxtools/MFXInterThreadEventClient.h | 4 +-
src/utils/foxtools/MFXMenuHeader.cpp | 4 +-
src/utils/foxtools/MFXMenuHeader.h | 4 +-
src/utils/foxtools/MFXMutex.cpp | 4 +-
src/utils/foxtools/MFXMutex.h | 8 +-
src/utils/foxtools/MFXUtils.cpp | 4 +-
src/utils/foxtools/MFXUtils.h | 4 +-
src/utils/foxtools/fxexdefs.h | 28 +-
src/utils/geom/AbstractPoly.h | 4 +-
src/utils/geom/Boundary.cpp | 4 +-
src/utils/geom/Boundary.h | 4 +-
src/utils/geom/Bresenham.cpp | 4 +-
src/utils/geom/Bresenham.h | 4 +-
src/utils/geom/GeoConvHelper.cpp | 31 +-
src/utils/geom/GeoConvHelper.h | 8 +-
src/utils/geom/GeomConvHelper.cpp | 4 +-
src/utils/geom/GeomConvHelper.h | 4 +-
src/utils/geom/GeomHelper.cpp | 19 +-
src/utils/geom/GeomHelper.h | 10 +-
src/utils/geom/Helper_ConvexHull.cpp | 4 +-
src/utils/geom/Helper_ConvexHull.h | 4 +-
src/utils/geom/Line.cpp | 21 +-
src/utils/geom/Line.h | 8 +-
src/utils/geom/Position.cpp | 4 +-
src/utils/geom/Position.h | 4 +-
src/utils/geom/PositionVector.cpp | 141 +-
src/utils/geom/PositionVector.h | 27 +-
src/utils/geom/bezier.cpp | 4 +-
src/utils/geom/bezier.h | 4 +-
src/utils/gui/div/GLHelper.cpp | 139 +-
src/utils/gui/div/GLHelper.h | 47 +-
src/utils/gui/div/GLObjectValuePassConnector.h | 5 +-
src/utils/gui/div/GUIDialog_GLChosenEditor.cpp | 4 +-
src/utils/gui/div/GUIDialog_GLChosenEditor.h | 4 +-
src/utils/gui/div/GUIGlobalSelection.cpp | 4 +-
src/utils/gui/div/GUIGlobalSelection.h | 4 +-
src/utils/gui/div/GUIIOGlobals.cpp | 4 +-
src/utils/gui/div/GUIIOGlobals.h | 4 +-
src/utils/gui/div/GUIMessageWindow.cpp | 4 +-
src/utils/gui/div/GUIMessageWindow.h | 4 +-
src/utils/gui/div/GUIParam_PopupMenu.cpp | 4 +-
src/utils/gui/div/GUIParam_PopupMenu.h | 4 +-
src/utils/gui/div/GUIParameterTableItem.h | 4 +-
src/utils/gui/div/GUIParameterTableWindow.cpp | 18 +-
src/utils/gui/div/GUIParameterTableWindow.h | 19 +-
src/utils/gui/div/GUISelectedStorage.cpp | 4 +-
src/utils/gui/div/GUISelectedStorage.h | 4 +-
src/utils/gui/div/GUIUserIO.cpp | 4 +-
src/utils/gui/div/GUIUserIO.h | 4 +-
src/utils/gui/events/GUIEvent.h | 4 +-
src/utils/gui/events/GUIEvent_Message.h | 4 +-
src/utils/gui/events/GUIEvent_SimulationStep.h | 4 +-
src/utils/gui/globjects/GLIncludes.h | 4 +-
src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp | 4 +-
src/utils/gui/globjects/GUIGLObjectPopupMenu.h | 4 +-
src/utils/gui/globjects/GUIGlObject.cpp | 5 +-
src/utils/gui/globjects/GUIGlObject.h | 4 +-
src/utils/gui/globjects/GUIGlObjectStorage.cpp | 4 +-
src/utils/gui/globjects/GUIGlObjectStorage.h | 4 +-
src/utils/gui/globjects/GUIGlObjectTypes.h | 8 +-
.../gui/globjects/GUIGlObject_AbstractAdd.cpp | 4 +-
src/utils/gui/globjects/GUIGlObject_AbstractAdd.h | 4 +-
src/utils/gui/globjects/GUIPointOfInterest.cpp | 4 +-
src/utils/gui/globjects/GUIPointOfInterest.h | 4 +-
src/utils/gui/globjects/GUIPolygon.cpp | 8 +-
src/utils/gui/globjects/GUIPolygon.h | 4 +-
src/utils/gui/globjects/GUIShapeContainer.cpp | 161 ++
src/utils/gui/globjects/GUIShapeContainer.h | 148 ++
src/utils/gui/globjects/Makefile.am | 1 +
src/utils/gui/globjects/Makefile.in | 6 +-
src/utils/gui/images/GUIIconSubSys.cpp | 8 +-
src/utils/gui/images/GUIIconSubSys.h | 4 +-
src/utils/gui/images/GUIIcons.h | 6 +-
src/utils/gui/images/GUITexturesHelper.cpp | 4 +-
src/utils/gui/images/GUITexturesHelper.h | 4 +-
src/utils/gui/images/Makefile.am | 4 +-
src/utils/gui/images/Makefile.in | 4 +-
src/utils/gui/images/flag.cpp | 4 +-
src/utils/gui/images/flag_minus.cpp | 4 +-
src/utils/gui/images/flag_plus.cpp | 4 +-
src/utils/gui/images/locate_person.xpm | 23 +
src/utils/gui/images/manip.cpp | 4 +-
src/utils/gui/images/shapeopen.xpm | 25 +
src/utils/gui/settings/GUIColorScheme.h | 238 --
src/utils/gui/settings/GUIColorer.h | 125 -
.../gui/settings/GUICompleteSchemeStorage.cpp | 5 +-
src/utils/gui/settings/GUICompleteSchemeStorage.h | 4 +-
src/utils/gui/settings/GUIPropertyScheme.h | 241 ++
src/utils/gui/settings/GUIPropertySchemeStorage.h | 130 +
src/utils/gui/settings/GUISettingsHandler.cpp | 12 +-
src/utils/gui/settings/GUISettingsHandler.h | 4 +-
.../gui/settings/GUIVisualizationSettings.cpp | 276 +-
src/utils/gui/settings/GUIVisualizationSettings.h | 36 +-
src/utils/gui/settings/Makefile.am | 4 +-
src/utils/gui/settings/Makefile.in | 4 +-
src/utils/gui/tracker/GUIParameterTracker.cpp | 4 +-
src/utils/gui/tracker/GUIParameterTracker.h | 4 +-
src/utils/gui/tracker/TrackerValueDesc.cpp | 4 +-
src/utils/gui/tracker/TrackerValueDesc.h | 4 +-
src/utils/gui/windows/GUIAppEnum.h | 14 +-
.../gui/windows/GUIDanielPerspectiveChanger.cpp | 4 +-
.../gui/windows/GUIDanielPerspectiveChanger.h | 4 +-
src/utils/gui/windows/GUIDialog_EditViewport.cpp | 77 +-
src/utils/gui/windows/GUIDialog_EditViewport.h | 7 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.cpp | 4 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.h | 4 +-
src/utils/gui/windows/GUIDialog_ViewSettings.cpp | 192 +-
src/utils/gui/windows/GUIDialog_ViewSettings.h | 22 +-
src/utils/gui/windows/GUIGlChildWindow.cpp | 4 +-
src/utils/gui/windows/GUIGlChildWindow.h | 4 +-
src/utils/gui/windows/GUIMainWindow.cpp | 5 +-
src/utils/gui/windows/GUIMainWindow.h | 11 +-
src/utils/gui/windows/GUIPerspectiveChanger.cpp | 4 +-
src/utils/gui/windows/GUIPerspectiveChanger.h | 4 +-
src/utils/gui/windows/GUISUMOAbstractView.cpp | 31 +-
src/utils/gui/windows/GUISUMOAbstractView.h | 11 +-
src/utils/importio/LineHandler.h | 4 +-
src/utils/importio/LineReader.cpp | 4 +-
src/utils/importio/LineReader.h | 4 +-
src/utils/importio/NamedColumnsParser.cpp | 4 +-
src/utils/importio/NamedColumnsParser.h | 4 +-
src/utils/iodevices/BinaryFormatter.cpp | 4 +-
src/utils/iodevices/BinaryFormatter.h | 6 +-
src/utils/iodevices/BinaryInputDevice.cpp | 4 +-
src/utils/iodevices/BinaryInputDevice.h | 4 +-
src/utils/iodevices/OutputDevice.cpp | 19 +-
src/utils/iodevices/OutputDevice.h | 4 +-
src/utils/iodevices/OutputDevice_CERR.cpp | 4 +-
src/utils/iodevices/OutputDevice_CERR.h | 4 +-
src/utils/iodevices/OutputDevice_COUT.cpp | 4 +-
src/utils/iodevices/OutputDevice_COUT.h | 4 +-
src/utils/iodevices/OutputDevice_File.cpp | 4 +-
src/utils/iodevices/OutputDevice_File.h | 4 +-
src/utils/iodevices/OutputDevice_Network.cpp | 27 +-
src/utils/iodevices/OutputDevice_Network.h | 4 +-
src/utils/iodevices/OutputDevice_String.cpp | 4 +-
src/utils/iodevices/OutputDevice_String.h | 4 +-
src/utils/iodevices/OutputFormatter.h | 4 +-
src/utils/iodevices/PlainXMLFormatter.cpp | 4 +-
src/utils/iodevices/PlainXMLFormatter.h | 4 +-
src/utils/options/Option.cpp | 4 +-
src/utils/options/Option.h | 4 +-
src/utils/options/OptionsCont.cpp | 10 +-
src/utils/options/OptionsCont.h | 4 +-
src/utils/options/OptionsIO.cpp | 4 +-
src/utils/options/OptionsIO.h | 4 +-
src/utils/options/OptionsLoader.cpp | 4 +-
src/utils/options/OptionsLoader.h | 4 +-
src/utils/options/OptionsParser.cpp | 4 +-
src/utils/options/OptionsParser.h | 4 +-
src/utils/shapes/Makefile.am | 1 +
src/utils/shapes/Makefile.in | 4 +-
src/utils/shapes/PointOfInterest.h | 4 +-
src/utils/shapes/Polygon.cpp | 37 +-
src/utils/shapes/Polygon.h | 10 +-
src/utils/shapes/Shape.cpp | 4 +-
src/utils/shapes/Shape.h | 4 +-
src/utils/shapes/ShapeContainer.cpp | 4 +-
src/utils/shapes/ShapeContainer.h | 6 +-
src/utils/shapes/ShapeHandler.cpp | 175 ++
src/utils/shapes/ShapeHandler.h | 124 +
src/utils/traci/TraCIAPI.cpp | 4 +-
src/utils/traci/TraCIAPI.h | 4 +-
src/utils/vehicle/AStarRouter.h | 12 +-
src/utils/vehicle/BulkStarRouter.h | 18 +-
src/utils/vehicle/CHRouter.h | 11 +-
src/utils/vehicle/CHRouterWrapper.h | 4 +-
src/utils/vehicle/DijkstraRouterEffort.h | 12 +-
src/utils/vehicle/DijkstraRouterTT.h | 12 +-
src/utils/vehicle/GawronCalculator.h | 4 +-
src/utils/vehicle/LogitCalculator.h | 4 +-
src/utils/vehicle/PedestrianRouter.h | 121 +-
src/utils/vehicle/RouteCostCalculator.h | 4 +-
src/utils/vehicle/SPTree.h | 4 +-
src/utils/vehicle/SUMOAbstractRouter.h | 4 +-
src/utils/vehicle/SUMOVTypeParameter.cpp | 57 +-
src/utils/vehicle/SUMOVTypeParameter.h | 17 +-
src/utils/vehicle/SUMOVehicle.h | 44 +-
src/utils/vehicle/SUMOVehicleParameter.cpp | 34 +-
src/utils/vehicle/SUMOVehicleParameter.h | 27 +-
src/utils/xml/GenericSAXHandler.cpp | 4 +-
src/utils/xml/GenericSAXHandler.h | 4 +-
src/utils/xml/SAXWeightsHandler.cpp | 4 +-
src/utils/xml/SAXWeightsHandler.h | 4 +-
src/utils/xml/SUMORouteHandler.cpp | 48 +-
src/utils/xml/SUMORouteHandler.h | 12 +-
src/utils/xml/SUMORouteLoader.cpp | 4 +-
src/utils/xml/SUMORouteLoader.h | 4 +-
src/utils/xml/SUMORouteLoaderControl.cpp | 4 +-
src/utils/xml/SUMORouteLoaderControl.h | 4 +-
src/utils/xml/SUMOSAXAttributes.cpp | 4 +-
src/utils/xml/SUMOSAXAttributes.h | 4 +-
src/utils/xml/SUMOSAXAttributesImpl_Binary.cpp | 4 +-
src/utils/xml/SUMOSAXAttributesImpl_Binary.h | 4 +-
src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp | 21 +-
src/utils/xml/SUMOSAXAttributesImpl_Xerces.h | 4 +-
src/utils/xml/SUMOSAXHandler.cpp | 4 +-
src/utils/xml/SUMOSAXHandler.h | 4 +-
src/utils/xml/SUMOSAXReader.cpp | 4 +-
src/utils/xml/SUMOSAXReader.h | 4 +-
src/utils/xml/SUMOVehicleParserHelper.cpp | 49 +-
src/utils/xml/SUMOVehicleParserHelper.h | 9 +-
src/utils/xml/SUMOXMLDefinitions.cpp | 37 +-
src/utils/xml/SUMOXMLDefinitions.h | 31 +-
src/utils/xml/XMLSubSys.cpp | 4 +-
src/utils/xml/XMLSubSys.h | 4 +-
src/windows_config.h | 6 +-
tools/assign/Assignment.py | 227 +-
tools/assign/assign.py | 202 +-
tools/assign/cadytsIterate.py | 71 +-
tools/assign/costFunctionChecker.py | 47 +-
tools/assign/costMemory.py | 72 +-
tools/assign/dijkstra.py | 58 +-
tools/assign/duaIterate.py | 297 ++-
tools/assign/duaIterate_analysis.py | 86 +-
tools/assign/elements.py | 193 +-
tools/assign/inputs.py | 25 +-
tools/assign/matrixDailyToHourly.py | 144 +-
tools/assign/network.py | 142 +-
tools/assign/networkStatistics.py | 186 +-
tools/assign/one-shot.py | 41 +-
tools/assign/outputs.py | 129 +-
tools/assign/routeChoices.py | 196 +-
tools/assign/run.py | 79 +-
tools/assign/statisticsElements.py | 138 +-
tools/assign/tables.py | 335 +--
tools/build/apply_astyle.py | 26 +-
tools/build/buildHTMLDocs.py | 199 +-
tools/build/checkAuthors.py | 40 +-
tools/build/checkSvnProps.py | 59 +-
tools/build/configTemplateToWiki.py | 17 +-
tools/build/dailyBuildMSVC.py | 161 +-
tools/build/dailyUpdateMakeGCC.sh | 1 +
tools/build/history.py | 23 +-
tools/build/mirrorWiki.py | 45 +-
tools/build/pythonPropsMSVC.py | 10 +-
tools/build/status.py | 10 +-
tools/build/version.py | 26 +-
tools/build/wix.py | 63 +-
.../+traci/+areal/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+areal/getIDCount.m | 4 +-
.../TraCI4Matlab/+traci/+areal/getIDList.m | 4 +-
.../+traci/+areal/getJamLengthMeters.m | 4 +-
.../+traci/+areal/getJamLengthVehicle.m | 4 +-
.../+traci/+areal/getLastStepMeanSpeed.m | 4 +-
.../+traci/+areal/getLastStepOccupancy.m | 4 +-
.../+traci/+areal/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+areal/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+areal/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/+areal/subscribeContext.m | 4 +-
.../TraCI4Matlab/+traci/+edge/adaptTraveltime.m | 4 +-
.../+traci/+edge/getAdaptedTraveltime.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getCO2Emission.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getCOEmission.m | 4 +-
.../+traci/+edge/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getEffort.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getFuelConsumption.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getHCEmission.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getIDCount.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getIDList.m | 4 +-
.../+traci/+edge/getLastStepHaltingNumber.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getLastStepLength.m | 4 +-
.../+traci/+edge/getLastStepMeanSpeed.m | 4 +-
.../+traci/+edge/getLastStepOccupancy.m | 4 +-
.../+traci/+edge/getLastStepVehicleIDs.m | 4 +-
.../+traci/+edge/getLastStepVehicleNumber.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getNOxEmission.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getNoiseEmission.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getPmxEmission.m | 4 +-
.../+traci/+edge/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getTraveltime.m | 4 +-
.../TraCI4Matlab/+traci/+edge/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+edge/setEffort.m | 4 +-
.../TraCI4Matlab/+traci/+edge/setMaxSpeed.m | 4 +-
.../TraCI4Matlab/+traci/+edge/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/+edge/subscribeContext.m | 4 +-
.../TraCI4Matlab/+traci/+gui/getBoundary.m | 4 +-
.../+traci/+gui/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+gui/getIDList.m | 4 +-
.../TraCI4Matlab/+traci/+gui/getOffset.m | 4 +-
.../TraCI4Matlab/+traci/+gui/getSchema.m | 4 +-
.../+traci/+gui/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+gui/getUniversal.m | 4 +-
.../contributed/TraCI4Matlab/+traci/+gui/getZoom.m | 4 +-
.../TraCI4Matlab/+traci/+gui/screenshot.m | 4 +-
.../TraCI4Matlab/+traci/+gui/setBoundary.m | 4 +-
.../TraCI4Matlab/+traci/+gui/setOffset.m | 4 +-
.../TraCI4Matlab/+traci/+gui/setSchema.m | 4 +-
.../contributed/TraCI4Matlab/+traci/+gui/setZoom.m | 4 +-
.../TraCI4Matlab/+traci/+gui/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/+gui/subscribeContext.m | 4 +-
.../TraCI4Matlab/+traci/+gui/trackVehicle.m | 4 +-
.../+inductionloop/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+inductionloop/getIDList.m | 4 +-
.../TraCI4Matlab/+traci/+inductionloop/getLaneID.m | 4 +-
.../+traci/+inductionloop/getLastStepMeanLength.m | 4 +-
.../+traci/+inductionloop/getLastStepMeanSpeed.m | 4 +-
.../+traci/+inductionloop/getLastStepOccupancy.m | 4 +-
.../+traci/+inductionloop/getLastStepVehicleIDs.m | 4 +-
.../+inductionloop/getLastStepVehicleNumber.m | 4 +-
.../+traci/+inductionloop/getPosition.m | 4 +-
.../+traci/+inductionloop/getSubscriptionResults.m | 4 +-
.../+traci/+inductionloop/getTimeSinceDetection.m | 4 +-
.../+traci/+inductionloop/getUniversal.m | 4 +-
.../+traci/+inductionloop/getVehicleData.m | 4 +-
.../+traci/+inductionloop/readVehicleData.m | 4 +-
.../TraCI4Matlab/+traci/+inductionloop/subscribe.m | 4 +-
.../+traci/+inductionloop/subscribeContext.m | 4 +-
.../+junction/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+junction/getIDList.m | 4 +-
.../TraCI4Matlab/+traci/+junction/getPosition.m | 4 +-
.../+traci/+junction/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+junction/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+junction/subscribe.m | 4 +-
.../+traci/+junction/subscribeContext.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getAllowed.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getCO2Emission.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getCOEmission.m | 4 +-
.../+traci/+lane/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getDisallowed.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getEdgeID.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getFuelConsumption.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getHCEmission.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getIDList.m | 4 +-
.../+traci/+lane/getLastStepHaltingNumber.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getLastStepLength.m | 4 +-
.../+traci/+lane/getLastStepMeanSpeed.m | 4 +-
.../+traci/+lane/getLastStepOccupancy.m | 4 +-
.../+traci/+lane/getLastStepVehicleIDs.m | 4 +-
.../+traci/+lane/getLastStepVehicleNumber.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getLength.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getLinkNumber.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getLinks.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getMaxSpeed.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getNOxEmission.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getNoiseEmission.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getPMxEmission.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getShape.m | 4 +-
.../+traci/+lane/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getTraveltime.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+lane/getWidth.m | 4 +-
.../TraCI4Matlab/+traci/+lane/readLinks.m | 4 +-
.../TraCI4Matlab/+traci/+lane/setAllowed.m | 4 +-
.../TraCI4Matlab/+traci/+lane/setDisallowed.m | 4 +-
.../TraCI4Matlab/+traci/+lane/setLength.m | 4 +-
.../TraCI4Matlab/+traci/+lane/setMaxSpeed.m | 4 +-
.../TraCI4Matlab/+traci/+lane/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/+lane/subscribeContext.m | 4 +-
.../getContextSubscriptionResults.m | 4 +-
.../+traci/+multientryexit/getIDList.m | 4 +-
.../+multientryexit/getLastStepHaltingNumber.m | 4 +-
.../+traci/+multientryexit/getLastStepMeanSpeed.m | 4 +-
.../+traci/+multientryexit/getLastStepVehicleIDs.m | 4 +-
.../+multientryexit/getLastStepVehicleNumber.m | 4 +-
.../+multientryexit/getSubscriptionResults.m | 4 +-
.../+traci/+multientryexit/getUniversal.m | 4 +-
.../+traci/+multientryexit/subscribe.m | 4 +-
.../+traci/+multientryexit/subscribeContext.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/+poi/add.m | 4 +-
.../TraCI4Matlab/+traci/+poi/getColor.m | 4 +-
.../+traci/+poi/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+poi/getIDList.m | 4 +-
.../TraCI4Matlab/+traci/+poi/getPosition.m | 4 +-
.../+traci/+poi/getSubscriptionResults.m | 4 +-
.../contributed/TraCI4Matlab/+traci/+poi/getType.m | 4 +-
.../TraCI4Matlab/+traci/+poi/getUniversal.m | 4 +-
.../contributed/TraCI4Matlab/+traci/+poi/remove.m | 4 +-
.../TraCI4Matlab/+traci/+poi/setColor.m | 4 +-
.../TraCI4Matlab/+traci/+poi/setPosition.m | 4 +-
.../contributed/TraCI4Matlab/+traci/+poi/setType.m | 4 +-
.../TraCI4Matlab/+traci/+poi/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/+poi/subscribeContext.m | 4 +-
.../contributed/TraCI4Matlab/+traci/+polygon/add.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/getColor.m | 4 +-
.../+polygon/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/getIDList.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/getShape.m | 4 +-
.../+traci/+polygon/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/getType.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/remove.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/setColor.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/setShape.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/setType.m | 4 +-
.../TraCI4Matlab/+traci/+polygon/subscribe.m | 4 +-
.../+traci/+polygon/subscribeContext.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/+route/add.m | 4 +-
.../+traci/+route/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+route/getEdges.m | 4 +-
.../TraCI4Matlab/+traci/+route/getIDList.m | 4 +-
.../+traci/+route/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+route/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+route/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/+route/subscribeContext.m | 4 +-
.../TraCI4Matlab/+traci/+simulation/convert2D.m | 4 +-
.../TraCI4Matlab/+traci/+simulation/convertGeo.m | 4 +-
.../TraCI4Matlab/+traci/+simulation/convertRoad.m | 4 +-
.../+traci/+simulation/getArrivedIDList.m | 4 +-
.../+traci/+simulation/getArrivedNumber.m | 4 +-
.../+traci/+simulation/getCurrentTime.m | 4 +-
.../TraCI4Matlab/+traci/+simulation/getDeltaT.m | 4 +-
.../+traci/+simulation/getDepartedIDList.m | 4 +-
.../+traci/+simulation/getDepartedNumber.m | 4 +-
.../+traci/+simulation/getDistance2D.m | 4 +-
.../+traci/+simulation/getDistanceRoad.m | 4 +-
.../+traci/+simulation/getEndingTeleportIDList.m | 4 +-
.../+traci/+simulation/getEndingTeleportNumber.m | 4 +-
.../+traci/+simulation/getLoadedIDList.m | 4 +-
.../+traci/+simulation/getLoadedNumber.m | 4 +-
.../+traci/+simulation/getMinExpectedNumber.m | 4 +-
.../+traci/+simulation/getNetBoundary.m | 4 +-
.../+traci/+simulation/getStartingTeleportIDList.m | 4 +-
.../+traci/+simulation/getStartingTeleportNumber.m | 4 +-
.../+traci/+simulation/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+simulation/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+simulation/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/+trafficlights/Logic.m | 4 +-
.../TraCI4Matlab/+traci/+trafficlights/Phase.m | 4 +-
.../getCompleteRedYellowGreenDefinition.m | 4 +-
.../+trafficlights/getContextSubscriptionResults.m | 4 +-
.../+traci/+trafficlights/getControlledLanes.m | 4 +-
.../+traci/+trafficlights/getControlledLinks.m | 4 +-
.../TraCI4Matlab/+traci/+trafficlights/getIDList.m | 4 +-
.../+traci/+trafficlights/getNextSwitch.m | 4 +-
.../TraCI4Matlab/+traci/+trafficlights/getPhase.m | 4 +-
.../+traci/+trafficlights/getProgram.m | 4 +-
.../+traci/+trafficlights/getRedYellowGreenState.m | 4 +-
.../+traci/+trafficlights/getSubscriptionResults.m | 4 +-
.../+traci/+trafficlights/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+trafficlights/readLinks.m | 4 +-
.../+traci/+trafficlights/readLogics.m | 4 +-
.../setCompleteRedYellowGreenDefinition.m | 4 +-
.../TraCI4Matlab/+traci/+trafficlights/setPhase.m | 4 +-
.../+traci/+trafficlights/setPhaseDuration.m | 4 +-
.../+traci/+trafficlights/setProgram.m | 4 +-
.../+traci/+trafficlights/setRedYellowGreenState.m | 4 +-
.../TraCI4Matlab/+traci/+trafficlights/subscribe.m | 4 +-
.../+traci/+trafficlights/subscribeContext.m | 4 +-
.../contributed/TraCI4Matlab/+traci/+vehicle/add.m | 8 +-
.../TraCI4Matlab/+traci/+vehicle/changeLane.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/changeTarget.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getAccel.m | 4 +-
.../+traci/+vehicle/getAdaptedTraveltime.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getAngle.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getBestLanes.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getCO2Emission.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getCOEmission.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getColor.m | 4 +-
.../+vehicle/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getDecel.m | 4 +-
.../+traci/+vehicle/getDrivingDistance.m | 4 +-
.../+traci/+vehicle/getDrivingDistance2D.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getEffort.m | 4 +-
.../+traci/+vehicle/getEmissionClass.m | 4 +-
.../+traci/+vehicle/getFuelConsumption.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getHCEmission.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getIDList.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getImperfection.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getLaneID.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getLaneIndex.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getLanePosition.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getLeader.m | 30 +
.../TraCI4Matlab/+traci/+vehicle/getLength.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getMaxSpeed.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getMinGap.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getNOxEmission.m | 4 +-
.../+traci/+vehicle/getNoiseEmission.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getPMxEmission.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getPosition.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getRoadID.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getRoute.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getRouteID.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getShapeClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getSignals.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getSpeed.m | 4 +-
.../+traci/+vehicle/getSpeedDeviation.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getSpeedFactor.m | 4 +-
.../+traci/+vehicle/getSpeedWithoutTraCI.m | 4 +-
.../+traci/+vehicle/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getTau.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getTypeID.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getUniversal.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getVehicleClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/getWidth.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/isRouteValid.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/moveTo.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/moveToVTD.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/readBestLanes.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/remove.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/rerouteEffort.m | 4 +-
.../+traci/+vehicle/rerouteTraveltime.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setAccel.m | 4 +-
.../+traci/+vehicle/setAdaptedTraveltime.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setColor.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setDecel.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setEffort.m | 4 +-
.../+traci/+vehicle/setEmissionClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setImperfection.m | 4 +-
.../+traci/+vehicle/setLaneChangeMode.m | 18 +
.../TraCI4Matlab/+traci/+vehicle/setLength.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setMaxSpeed.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setMinGap.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setRoute.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setRouteID.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setShapeClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setSignals.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setSpeed.m | 4 +-
.../+traci/+vehicle/setSpeedDeviation.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setSpeedFactor.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setSpeedMode.m | 19 +
.../TraCI4Matlab/+traci/+vehicle/setStop.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setTau.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setVehicleClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/setWidth.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/slowDown.m | 4 +-
.../TraCI4Matlab/+traci/+vehicle/subscribe.m | 4 +-
.../+traci/+vehicle/subscribeContext.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getAccel.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getColor.m | 4 +-
.../+vehicletype/getContextSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getDecel.m | 4 +-
.../+traci/+vehicletype/getEmissionClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getIDList.m | 4 +-
.../+traci/+vehicletype/getImperfection.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getLength.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getMaxSpeed.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getMinGap.m | 4 +-
.../+traci/+vehicletype/getShapeClass.m | 4 +-
.../+traci/+vehicletype/getSpeedDeviation.m | 4 +-
.../+traci/+vehicletype/getSpeedFactor.m | 4 +-
.../+traci/+vehicletype/getSubscriptionResults.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getTau.m | 4 +-
.../+traci/+vehicletype/getUniversal.m | 4 +-
.../+traci/+vehicletype/getVehicleClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/getWidth.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setAccel.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setColor.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setDecel.m | 4 +-
.../+traci/+vehicletype/setEmissionClass.m | 4 +-
.../+traci/+vehicletype/setImperfection.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setLength.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setMaxSpeed.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setMinGap.m | 4 +-
.../+traci/+vehicletype/setShapeClass.m | 4 +-
.../+traci/+vehicletype/setSpeedDeviation.m | 4 +-
.../+traci/+vehicletype/setSpeedFactor.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setTau.m | 4 +-
.../+traci/+vehicletype/setVehicleClass.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/setWidth.m | 4 +-
.../TraCI4Matlab/+traci/+vehicletype/subscribe.m | 4 +-
.../+traci/+vehicletype/subscribeContext.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/Message.m | 4 +-
.../TraCI4Matlab/+traci/RETURN_VALUE_FUNC.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/Socket.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/Storage.m | 6 +-
.../TraCI4Matlab/+traci/SubscriptionResults.m | 4 +-
.../contributed/TraCI4Matlab/+traci/beginMessage.m | 4 +-
.../contributed/TraCI4Matlab/+traci/checkResult.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/close.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/constants.m | 5 +-
tools/contributed/TraCI4Matlab/+traci/getVersion.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/init.m | 10 +-
.../TraCI4Matlab/+traci/readSubscription.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/recvExact.m | 4 +-
.../contributed/TraCI4Matlab/+traci/sendByteCmd.m | 4 +-
.../TraCI4Matlab/+traci/sendDoubleCmd.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/sendExact.m | 6 +-
tools/contributed/TraCI4Matlab/+traci/sendIntCmd.m | 4 +-
.../TraCI4Matlab/+traci/sendReadOneStringCmd.m | 4 +-
.../TraCI4Matlab/+traci/sendStringCmd.m | 4 +-
.../TraCI4Matlab/+traci/simulationStep.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/subscribe.m | 4 +-
.../TraCI4Matlab/+traci/subscribeContext.m | 4 +-
.../TraCI4Matlab/+traci/switchConnection.m | 4 +-
tools/contributed/TraCI4Matlab/+traci/time2steps.m | 4 +-
.../TraCI4Matlab/examples/traci_test2.m | 44 +-
tools/contributed/TraCI4Matlab/license.txt | 2 +-
.../gaunal/traci4matlab/utils/DataReader.java | 58 +
.../sumoplayer/convert_sumoplayer_op_2_lonlat.py | 40 +-
.../src/de/tudresden/sumo/cmd/ArealDetector.java | 13 +-
.../traas/src/de/tudresden/sumo/cmd/Edge.java | 12 +-
.../traas/src/de/tudresden/sumo/cmd/Gui.java | 11 +-
.../src/de/tudresden/sumo/cmd/Inductionloop.java | 4 +-
.../traas/src/de/tudresden/sumo/cmd/Junction.java | 6 +-
.../traas/src/de/tudresden/sumo/cmd/Lane.java | 10 +-
.../src/de/tudresden/sumo/cmd/Multientryexit.java | 3 +-
.../traas/src/de/tudresden/sumo/cmd/Person.java | 237 ++
.../traas/src/de/tudresden/sumo/cmd/Poi.java | 9 +-
.../traas/src/de/tudresden/sumo/cmd/Polygon.java | 16 +-
.../traas/src/de/tudresden/sumo/cmd/Route.java | 4 +-
.../src/de/tudresden/sumo/cmd/Simulation.java | 75 +-
.../src/de/tudresden/sumo/cmd/Trafficlights.java | 16 +-
.../traas/src/de/tudresden/sumo/cmd/Vehicle.java | 292 ++-
.../src/de/tudresden/sumo/cmd/Vehicletype.java | 102 +-
.../src/de/tudresden/sumo/config/Constants.java | 49 +-
.../de/tudresden/sumo/util/CommandProcessor.java | 2 +-
.../src/de/tudresden/sumo/util/ConvertHelper.java | 2 +-
.../traas/src/de/tudresden/sumo/util/Sumo.java | 2 +-
.../src/de/tudresden/sumo/util/SumoCommand.java | 14 +-
.../traas/src/de/tudresden/ws/Service.java | 2 +-
.../traas/src/de/tudresden/ws/Service_Impl.java | 2 +-
.../traas/src/de/tudresden/ws/ShutdownHook.java | 2 +-
.../traas/src/de/tudresden/ws/Traci.java | 83 +-
.../traas/src/de/tudresden/ws/WebService.java | 2 +-
.../traas/src/de/tudresden/ws/conf/Config.java | 2 +-
.../de/tudresden/ws/container/SumoBoundingBox.java | 2 +-
.../src/de/tudresden/ws/container/SumoColor.java | 2 +-
.../de/tudresden/ws/container/SumoGeometry.java | 2 +-
.../src/de/tudresden/ws/container/SumoLink.java | 2 +-
.../de/tudresden/ws/container/SumoLinkList.java | 2 +-
.../de/tudresden/ws/container/SumoPosition2D.java | 2 +-
.../de/tudresden/ws/container/SumoPosition3D.java | 2 +-
.../de/tudresden/ws/container/SumoStringList.java | 2 +-
.../de/tudresden/ws/container/SumoTLSLogic.java | 2 +-
.../de/tudresden/ws/container/SumoTLSPhase.java | 2 +-
.../tudresden/ws/container/SumoVehicleSignal.java | 18 +
.../ws/container/SumoVehicleSignalState.java | 18 +
.../traas/src/de/tudresden/ws/log/Log.java | 14 +-
.../traas/src/de/tudresden/ws/log/Log_txt.java | 6 +-
.../polito/appeal/traci/SumoTraciConnection.java | 6 +-
.../it/polito/appeal/traci/protocol/Command.java | 7 +-
.../appeal/traci/protocol/RequestMessage.java | 20 +-
.../appeal/traci/protocol/ResponseContainer.java | 10 +-
.../appeal/traci/protocol/ResponseMessage.java | 5 +-
.../.externalToolBuilders/TraCI4J [Builder].launch | 24 +
tools/contributed/traci4j/.gitignore | 5 +
tools/contributed/traci4j/.project | 10 +
tools/contributed/traci4j/build.xml | 13 +-
tools/contributed/traci4j/src/java-gen/.gitignore | 5 +
.../src/java-gen/it/polito/appeal/traci/Edge.java | 357 ---
.../it/polito/appeal/traci/InductionLoop.java | 248 --
.../src/java-gen/it/polito/appeal/traci/Lane.java | 530 ----
.../it/polito/appeal/traci/MeMeDetector.java | 186 --
.../src/java-gen/it/polito/appeal/traci/POI.java | 279 --
.../src/java-gen/it/polito/appeal/traci/Route.java | 112 -
.../it/polito/appeal/traci/TrafficLight.java | 410 ---
.../java-gen/it/polito/appeal/traci/Vehicle.java | 829 ------
.../it/polito/appeal/traci/VehicleType.java | 334 ---
.../src/java/de/uniluebeck/itm/tcpip/Socket.java | 14 +-
.../it/polito/appeal/traci/AddVehicleQuery.java | 6 +-
.../it/polito/appeal/traci/ChangeAccelQuery.java | 43 -
.../it/polito/appeal/traci/ChangeColorQuery.java | 2 +-
.../appeal/traci/ChangeCompleteProgramQuery.java | 2 +-
.../polito/appeal/traci/ChangeObjectVarQuery.java | 8 +-
.../it/polito/appeal/traci/protocol/Constants.java | 5 +-
.../traci4j/src/xml/traciObjects/Vehicle.xml | 9 +-
.../traci4j/src/xml/traciObjects/VehicleType.xml | 8 +-
.../contributed/traci4j/src/xslt/traciObject.xslt | 6 +-
.../it/polito/appeal/traci/test/TraCITest.java | 31 +-
tools/detector/aggregateFlows.py | 26 +-
tools/detector/deleteUnusedDetectors.py | 32 +-
tools/detector/detector.py | 17 +-
tools/detector/flowFromRoutes.py | 15 +-
tools/detector/flowrouter.py | 71 +-
tools/detector/validate.py | 49 +-
tools/district/countConnectionsInDistricts.py | 21 +-
tools/district/districtMapper.py | 25 +-
tools/district/edgesInDistricts.py | 57 +-
tools/game/{bs3d.sumocfg => bs3Dosm.sumocfg} | 0
tools/game/bs3d.sumocfg | 2 +-
tools/game/bs3d/bs.net.xml | 1483 ++++-------
tools/game/bs3d/bs3d.settings.xml | 90 +
tools/game/bs3d/bsplain.tll.xml | 16 +-
tools/game/patchTrafficLights.py | 12 +-
tools/game/runner.py | 165 +-
tools/game/setup.py | 60 +-
tools/game/square/square.net.xml | 30 +-
tools/import/osm/index.html | 12 +-
tools/import/osm/osmBuild.py | 88 +-
tools/import/osm/osmGet.py | 40 +-
tools/import/osm/osmPopulationExtractor.py | 139 +-
tools/import/osm/script.js | 63 +-
tools/import/osm/server.py | 300 ++-
tools/import/osm/style.css | 6 +-
tools/import/transportationTestProblems.py | 46 +
tools/import/vissim/vissim_parseBusStops.py | 63 +-
tools/import/vissim/vissim_parseRoutes.py | 109 +-
tools/import/visum/visum_convertEdgeTypes.py | 16 +-
tools/import/visum/visum_convertRoutes.py | 99 +-
tools/import/visum/visum_convertTurnPercentages.py | 31 +-
tools/import/visum/visum_parseZaehlstelle.py | 62 +-
tools/launcher.py | 222 ++
tools/lib/rmsd.py | 9 +-
tools/lib/testUtil.py | 8 +-
tools/net/0103to0110.py | 128 +-
tools/net/0123to0130.py | 158 +-
tools/net/OrderedMultiSet.py | 17 +-
tools/net/batch0103to0110.py | 14 +-
tools/net/createRoundaboutConnections.py | 21 +-
tools/net/netcheck.py | 19 +-
tools/net/netdiff.py | 159 +-
tools/net/netduplicate.py | 38 +-
tools/net/netextract.py | 21 +-
tools/net/netextract_subPart.py | 24 +-
tools/net/netmatch.py | 43 +-
tools/net/netshiftadaptor.py | 31 +-
tools/net/netstats.py | 16 +-
tools/net/network_statistics.py | 43 +-
tools/net/odConnectionsCheck.py | 130 +-
tools/net/patchNetFiles.py | 38 +-
tools/net/prepareVISUM.py | 32 +-
tools/net/reprojectpolys.py | 126 +-
tools/net/visum_mapDistricts.py | 661 ++---
tools/net/xmlconnections_mapEdges.py | 26 +-
tools/net/xmledges_applyOffset.py | 29 +-
tools/net/xmlnodes_applyOffset.py | 27 +-
tools/output/accelerations.py | 11 +-
tools/output/analyze_teleports.py | 24 +-
tools/output/countLaneChanges.py | 58 +
tools/output/generateITetrisIntersectionMetrics.py | 64 +-
tools/output/generateITetrisNetworkMetrics.py | 295 ++-
tools/output/generateMeanDataDefinitions.py | 19 +-
tools/output/generateTLSE1Detectors.py | 81 +-
tools/output/generateTLSE2Detectors.py | 81 +-
tools/output/generateTLSE3Detectors.py | 69 +-
tools/output/netdumpdiff.py | 37 +-
tools/output/netdumpmean.py | 37 +-
tools/output/timingStats.py | 14 +-
tools/output/vehLanes.py | 15 +-
tools/output/vehroute2amitranOD.py | 23 +-
tools/output/vehrouteDiff.py | 22 +-
.../projects/TLS-Evaluationsszenarien/changeNet.py | 66 +-
.../projects/TLS-Evaluationsszenarien/evaluator.py | 151 +-
.../projects/TLS-Evaluationsszenarien/genRoutes.py | 76 +-
tools/projects/TLS-Evaluationsszenarien/main.py | 117 +-
tools/projects/TLS-Evaluationsszenarien/plotter.py | 298 ++-
tools/projects/TLS-Evaluationsszenarien/test.py | 41 +-
.../TaxiFCD_Krieg/src/analysis/CompareVelocitys.py | 149 +-
.../TaxiFCD_Krieg/src/analysis/FetchData.py | 295 ++-
tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py | 79 +-
.../TaxiFCD_Krieg/src/analysis/Traveltime.py | 346 +--
.../TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py | 453 ++--
.../TaxiFCD_Krieg/src/analysis/Traveltime_DK.py | 548 ++--
.../TaxiFCD_Krieg/src/analysis/VelocityCurve.py | 232 +-
.../src/analysis/VelocityOverRoute.py | 217 +-
.../TaxiFCD_Krieg/src/analysis/VelocityOverTime.py | 267 +-
.../TaxiFCD_Krieg/src/analysis/__init__.py | 6 +-
.../projects/TaxiFCD_Krieg/src/backup/__init__.py | 6 +-
.../TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py | 180 +-
.../src/fcdQuality/ParamEffectsOLD.py | 243 +-
.../src/fcdQuality/ParamEffectsProcessedFCD.py | 495 ++--
.../TaxiFCD_Krieg/src/fcdQuality/__init__.py | 6 +-
.../TaxiFCD_Krieg/src/fcdQuality/readPlot.py | 208 +-
.../TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py | 78 +-
.../src/fcdToRoutes/FCDvsCompleteRoute.py | 191 +-
.../src/fcdToRoutes/GenerateTaxiRoutes.py | 303 ++-
.../src/fcdToRoutes/GenerateTaxiRoutesMain.py | 11 +-
.../src/fcdToRoutes/My_mpl_dump_onNet.py | 282 +-
.../TaxiFCD_Krieg/src/fcdToRoutes/__init__.py | 6 +-
.../src/fcdToRoutes/differentDepartRoutes.py | 68 +-
.../TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py | 65 +-
.../src/taxiQuantity/QuantityOverDay.py | 83 +-
.../src/taxiQuantity/SeparateVLSArea.py | 41 +-
.../TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py | 36 +-
.../TaxiFCD_Krieg/src/util/BinarySearch.py | 81 +-
tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py | 27 +-
tools/projects/TaxiFCD_Krieg/src/util/Path.py | 95 +-
.../projects/TaxiFCD_Krieg/src/util/ProgressBar.py | 31 +-
tools/projects/TaxiFCD_Krieg/src/util/Reader.py | 123 +-
tools/projects/TaxiFCD_Krieg/src/util/__init__.py | 6 +-
tools/projects/vehicles2d/commons.py | 235 ++
tools/projects/vehicles2d/dijkstra_base.py | 280 ++
tools/projects/vehicles2d/main.py | 2735 ++++++++++++++++++++
tools/projects/vehicles2d/test.py | 104 +
tools/projects/vehicles2d/unittest_ada_star.py | 772 ++++++
.../unittest_ada_star_bugs_on_the_way.py | 1254 +++++++++
tools/projects/vehicles2d/unittest_constants.py | 43 +
tools/projects/vehicles2d/unittest_dijkstra.py | 534 ++++
tools/projects/vehicles2d/unittest_flaeche.py | 388 +++
tools/projects/vehicles2d/unittest_utils.py | 52 +
tools/projects/vehicles2d/unittest_vessel.py | 2136 +++++++++++++++
tools/purgatory/10to11.py | 9 +-
tools/purgatory/findUTurns.py | 8 +-
tools/purgatory/generate-ns2.py | 110 +-
tools/purgatory/kShortest.py | 33 +-
tools/purgatory/removeSVN.py | 23 +-
tools/purgatory/routes2OD.py | 43 +-
tools/route/cutRoutes.py | 161 +-
tools/route/extractRouteEdges.py | 13 +-
tools/route/route2alts.py | 53 +-
tools/route/route2poly.py | 31 +-
tools/route/routeStats.py | 110 +
tools/route/route_1htoDay.py | 10 +-
tools/route/route_departOffset.py | 16 +-
tools/route/routecheck.py | 33 +-
tools/route/routecompare.py | 45 +-
tools/route/routes_Join.py | 46 +-
tools/route/sort_routes.py | 84 +-
tools/route/tracegenerator.py | 15 +-
tools/route/tracemapper.py | 8 +-
tools/route/vehicle2flow.py | 27 +-
tools/shapes/CSV2polyconvertXML.py | 12 +-
tools/shapes/circlePolygon.py | 11 +-
tools/shapes/poi_alongRoads.py | 203 +-
tools/shapes/poi_atTLS.py | 19 +-
tools/shapes/pois2inductionLoops.py | 14 +-
tools/sumolib/__init__.py | 121 +-
tools/sumolib/color.py | 10 +-
tools/sumolib/files/__init__.py | 9 +-
tools/sumolib/files/additional.py | 9 +-
tools/sumolib/files/selection.py | 13 +-
tools/sumolib/geomhelper.py | 87 +-
tools/sumolib/miscutils.py | 49 +-
tools/sumolib/net/__init__.py | 185 +-
tools/sumolib/net/connection.py | 42 +-
tools/sumolib/net/edge.py | 33 +-
tools/sumolib/net/lane.py | 83 +-
tools/sumolib/net/node.py | 19 +-
tools/sumolib/net/roundabout.py | 7 +-
tools/sumolib/options.py | 47 +-
tools/sumolib/output/__init__.py | 173 +-
tools/sumolib/output/convert/__init__.py | 4 +-
tools/sumolib/output/convert/gpsdat.py | 20 +-
tools/sumolib/output/convert/gpx.py | 4 +-
tools/sumolib/output/convert/ns2.py | 159 +-
tools/sumolib/output/convert/omnet.py | 72 +-
tools/sumolib/output/convert/phem.py | 189 +-
tools/sumolib/output/convert/poi.py | 13 +-
tools/sumolib/output/convert/shawn.py | 33 +-
tools/sumolib/output/dump.py | 16 +-
tools/sumolib/output/inductionloop.py | 13 +-
tools/sumolib/route.py | 6 +-
tools/sumolib/sensors/__init__.py | 4 +-
tools/sumolib/sensors/inductive_loop.py | 14 +-
tools/sumolib/shapes/__init__.py | 7 +-
tools/sumolib/shapes/poi.py | 31 +-
tools/sumolib/shapes/polygon.py | 20 +-
tools/sumolib/visualization/__init__.py | 20 +
tools/sumolib/visualization/helpers.py | 327 +++
tools/tls/tls_check.py | 11 +-
tools/tls/tls_csv2SUMO.py | 87 +-
tools/traceExporter.py | 360 +--
tools/traci/__init__.py | 185 +-
tools/traci/areal.py | 54 +-
tools/traci/constants.py | 57 +-
tools/traci/edge.py | 117 +-
tools/traci/gui.py | 80 +-
tools/traci/inductionloop.py | 81 +-
tools/traci/junction.py | 47 +-
tools/traci/lane.py | 162 +-
tools/traci/multientryexit.py | 45 +-
tools/traci/person.py | 202 ++
tools/traci/poi.py | 81 +-
tools/traci/polygon.py | 84 +-
tools/traci/rebuildConstants.py | 24 +-
tools/traci/route.py | 45 +-
tools/traci/simulation.py | 159 +-
tools/traci/traciToHex.py | 9 +-
tools/traci/trafficlights.py | 134 +-
tools/traci/vehicle.py | 445 ++--
tools/traci/vehicletype.py | 166 +-
tools/trigger/csv2vss.py | 33 +-
tools/trip/generateTripsXml.py | 165 +-
tools/trip/randomTrips.py | 195 +-
tools/trip/route2trips.py | 49 +-
tools/turn-defs/collectinghandler.py | 9 +-
tools/turn-defs/connections.py | 480 ++--
tools/turn-defs/generateTurnDefs.py | 23 +-
tools/turn-defs/turndefinitions.py | 83 +-
tools/visualization/helpers.py | 271 --
tools/visualization/mpl_dump_onNet.py | 282 +-
tools/visualization/mpl_dump_timeline.py | 55 +-
tools/visualization/mpl_dump_twoAgainst.py | 76 +-
tools/visualization/mpl_tripinfos_twoAgainst.py | 65 +-
tools/visualization/plot_csv_bars.py | 175 +-
tools/visualization/plot_csv_pie.py | 117 +-
tools/visualization/plot_csv_timeline.py | 118 +-
tools/visualization/plot_net_dump.py | 274 +-
tools/visualization/plot_net_selection.py | 100 +-
tools/visualization/plot_net_speeds.py | 127 +-
tools/visualization/plot_net_trafficLights.py | 127 +-
tools/visualization/plot_summary.py | 99 +-
tools/visualization/plot_tripinfo_distributions.py | 144 +-
tools/xml/addSchema.py | 18 +-
tools/xml/binary2plain.py | 63 +-
tools/xml/csv2xml.py | 53 +-
tools/xml/protobuf2xml.py | 26 +-
tools/xml/rebuildSchemata.py | 14 +-
tools/xml/schemaCheck.py | 55 +-
tools/xml/xml2csv.py | 55 +-
tools/xml/xml2protobuf.py | 40 +-
tools/xml/xsd.py | 27 +-
tools_filelist | 58 +-
unittest/src/Makefile.am | 2 +
unittest/src/Makefile.in | 4 +
unittest/src/microsim/MSCFModelTest.cpp | 4 +-
unittest/src/microsim/MSEventControlTest.cpp | 4 +-
unittest/src/netbuild/NBHeightMapperTest.cpp | 4 +-
unittest/src/netbuild/NBTrafficLightLogicTest.cpp | 4 +-
unittest/src/unittest_main.cpp | 4 +-
unittest/src/utils/common/CommandMock.h | 4 +-
unittest/src/utils/common/RGBColorTest.cpp | 4 +-
unittest/src/utils/common/StringTokenizerTest.cpp | 4 +-
unittest/src/utils/common/StringUtilsTest.cpp | 4 +-
unittest/src/utils/common/TplConvertTest.cpp | 4 +-
unittest/src/utils/common/ValueTimeLineTest.cpp | 4 +-
unittest/src/utils/foxtools/FXWorkerThreadTest.cpp | 4 +-
unittest/src/utils/geom/BoundaryTest.cpp | 4 +-
unittest/src/utils/geom/GeoConvHelperTest.cpp | 4 +-
unittest/src/utils/geom/GeomHelperTest.cpp | 12 +-
unittest/src/utils/geom/LineTest.cpp | 4 +-
unittest/src/utils/geom/PositionVectorTest.cpp | 244 +-
unittest/src/utils/iodevices/OutputDeviceMock.h | 4 +-
1908 files changed, 54547 insertions(+), 33928 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git
More information about the debian-science-commits
mailing list