[sumo] 09/10: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Sun May 15 08:14:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit 68f9a7e00204b9f92e00edc4a70b9e5669854f27
Merge: a3f3e74 98423f7
Author: Anton Gladky <gladk at debian.org>
Date: Sun May 15 08:29:22 2016 +0200
Merge.
AUTHORS | 1 +
Makefile.am | 1 +
Makefile.in | 2 +
README | 5 +-
aclocal.m4 | 12 +-
bin/Makefile.am | 65 +-
bin/Makefile.in | 66 +-
configure | 231 +-
configure.ac | 97 +-
data/emissions/PHEMlight/PC_D_EU4.PHEMLight.veh | 134 +
data/emissions/PHEMlight/PC_D_EU4.csv | 35 +
data/emissions/PHEMlight/PC_D_EU4_FC.csv | 17 +
data/emissions/PHEMlight/PC_G_EU4.PHEMLight.veh | 133 +
data/emissions/PHEMlight/PC_G_EU4.csv | 35 +
data/emissions/PHEMlight/PC_G_EU4_FC.csv | 17 +
data/emissions/PHEMlight/PKW_D_EU4.PHEMLight.veh | 2 +-
data/emissions/PHEMlight/PKW_D_EU4.csv | 2 +-
data/emissions/PHEMlight/PKW_D_EU4.dec.csv | 2 +-
data/emissions/PHEMlight/PKW_D_EU4_FC.csv | 2 +-
data/emissions/PHEMlight/PKW_G_EU4.PHEMLight.veh | 2 +-
data/emissions/PHEMlight/PKW_G_EU4.csv | 2 +-
data/emissions/PHEMlight/PKW_G_EU4.dec.csv | 2 +-
data/emissions/PHEMlight/PKW_G_EU4_FC.csv | 2 +-
data/xsd/additional_file.xsd | 24 +-
data/xsd/amitran/linkdata.xsd | 70 +-
data/xsd/baseTypes.xsd | 1 +
data/xsd/emission_file.xsd | 1 +
data/xsd/full_file.xsd | 2 +
data/xsd/marouterConfiguration.xsd | 2 +
data/xsd/meandataTypes.xsd | 3 +
data/xsd/net_file.xsd | 3 +-
data/xsd/netstate_file.xsd | 4 +
data/xsd/routeTypes.xsd | 25 +-
data/xsd/sumoConfiguration.xsd | 4 +-
data/xsd/tllogic_file.xsd | 2 +-
.../sumo/visualization/parade/input_routes.rou.xml | 83 -
.../examples/sumo/visualization/parade/net.net.xml | 208 -
.../sumo/visualization/parade/parade.sumocfg | 1 -
docs/tutorial/city_mobil/agentManager.py | 5 +-
docs/tutorial/city_mobil/constants.py | 5 +-
docs/tutorial/city_mobil/createNet.py | 254 +-
docs/tutorial/city_mobil/runner.py | 8 +-
docs/tutorial/city_mobil/simpleManager.py | 5 +-
docs/tutorial/city_mobil/statistics.py | 24 +-
docs/tutorial/city_mobil/vehicleControl.py | 14 +-
docs/tutorial/hello/runner.py | 12 +-
docs/tutorial/output_parsing/runner.py | 12 +-
docs/tutorial/quickstart/runner.py | 12 +-
docs/tutorial/san_pablo_dam/data/analyzeData.py | 16 +-
docs/tutorial/san_pablo_dam/data/spd-road.sumocfg | 2 +-
docs/tutorial/san_pablo_dam/runner.py | 39 +-
docs/tutorial/san_pablo_dam/validate.py | 8 +-
docs/tutorial/traci_pedestrian_crossing/runner.py | 8 +-
docs/tutorial/traci_tls/embedded.py | 5 +-
docs/tutorial/traci_tls/runner.py | 33 +-
src/Makefile.am | 17 +-
src/Makefile.in | 52 +-
src/activitygen/AGActivityGen.cpp | 4 +-
src/activitygen/AGActivityGen.h | 4 +-
src/activitygen/AGActivityGenHandler.cpp | 10 +-
src/activitygen/AGActivityGenHandler.h | 4 +-
src/activitygen/AGActivityTripWriter.cpp | 4 +-
src/activitygen/AGActivityTripWriter.h | 4 +-
src/activitygen/AGFrame.cpp | 4 +-
src/activitygen/AGFrame.h | 4 +-
src/activitygen/Makefile.am | 1 +
src/activitygen/Makefile.in | 7 +-
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 | 18 +-
src/activitygen/activities/AGFreeTime.h | 4 +-
src/activitygen/activities/AGTrip.cpp | 8 +-
src/activitygen/activities/AGTrip.h | 4 +-
src/activitygen/activities/AGWorkAndSchool.cpp | 4 +-
src/activitygen/activities/AGWorkAndSchool.h | 4 +-
src/activitygen/activities/Makefile.in | 1 +
src/activitygen/activitygen_main.cpp | 6 +-
src/activitygen/city/AGAdult.cpp | 6 +-
src/activitygen/city/AGAdult.h | 4 +-
src/activitygen/city/AGBus.cpp | 4 +-
src/activitygen/city/AGBus.h | 4 +-
src/activitygen/city/AGBusLine.cpp | 4 +-
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 | 8 +-
src/activitygen/city/AGCity.h | 4 +-
src/activitygen/city/AGDataAndStatistics.cpp | 4 +-
src/activitygen/city/AGDataAndStatistics.h | 4 +-
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 | 4 +-
src/activitygen/city/AGPosition.h | 4 +-
src/activitygen/city/AGSchool.cpp | 4 +-
src/activitygen/city/AGSchool.h | 4 +-
src/activitygen/city/AGStreet.cpp | 4 +-
src/activitygen/city/AGStreet.h | 4 +-
src/activitygen/city/AGTime.cpp | 4 +-
src/activitygen/city/AGTime.h | 4 +-
src/activitygen/city/AGWorkPosition.cpp | 6 +-
src/activitygen/city/AGWorkPosition.h | 4 +-
src/activitygen/city/Makefile.in | 1 +
src/config.h | 22 +-
src/config.h.in | 16 +-
src/dfrouter/Makefile.am | 1 +
src/dfrouter/Makefile.in | 7 +-
src/dfrouter/RODFDetFlowLoader.cpp | 4 +-
src/dfrouter/RODFDetFlowLoader.h | 4 +-
src/dfrouter/RODFDetector.cpp | 4 +-
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 | 5 +-
src/dfrouter/RODFNet.h | 11 +-
src/dfrouter/RODFRouteCont.cpp | 4 +-
src/dfrouter/RODFRouteCont.h | 4 +-
src/dfrouter/RODFRouteDesc.h | 4 +-
src/dfrouter/dfrouter_main.cpp | 6 +-
src/duarouter/Makefile.am | 1 +
src/duarouter/Makefile.in | 7 +-
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 | 36 +-
src/foreign/Makefile.am | 5 +-
src/foreign/Makefile.in | 7 +-
src/foreign/PHEMlight/Makefile.am | 1 +
src/foreign/PHEMlight/Makefile.in | 629 +
src/foreign/PHEMlight/cpp/CEP.cpp | 417 +
src/foreign/PHEMlight/cpp/CEP.h | 144 +
src/foreign/PHEMlight/cpp/CEPHandler.cpp | 359 +
src/foreign/PHEMlight/cpp/CEPHandler.h | 71 +
src/foreign/PHEMlight/cpp/Constants.cpp | 42 +
src/foreign/PHEMlight/cpp/Constants.h | 61 +
src/foreign/PHEMlight/cpp/Helpers.cpp | 248 +
src/foreign/PHEMlight/cpp/Helpers.h | 75 +
src/foreign/PHEMlight/cpp/Makefile.am | 5 +
src/foreign/PHEMlight/cpp/Makefile.in | 622 +
src/foreign/additional.txt | 43 -
src/foreign/eulerspiral/Makefile.in | 1 +
src/foreign/mersenne/Makefile.in | 1 +
src/foreign/nvwa/Makefile.in | 1 +
src/foreign/polyfonts/Makefile.in | 1 +
src/foreign/rtree/LayeredRTree.h | 4 +-
src/foreign/rtree/Makefile.in | 1 +
src/foreign/rtree/SUMORTree.h | 4 +-
src/foreign/tcpip/Makefile.in | 1 +
src/gui/GUIApplicationWindow.cpp | 27 +-
src/gui/GUIApplicationWindow.h | 4 +-
src/gui/GUIEvent_Screenshot.h | 8 +-
src/gui/GUIEvent_SimulationEnded.h | 4 +-
src/gui/GUIEvent_SimulationLoaded.h | 8 +-
src/gui/GUIGlobals.cpp | 4 +-
src/gui/GUIGlobals.h | 4 +-
src/gui/GUILoadThread.cpp | 13 +-
src/gui/GUILoadThread.h | 4 +-
src/gui/GUIManipulator.cpp | 4 +-
src/gui/GUIManipulator.h | 4 +-
src/gui/GUIRunThread.cpp | 4 +-
src/gui/GUIRunThread.h | 4 +-
src/gui/GUISUMOViewParent.cpp | 29 +-
src/gui/GUISUMOViewParent.h | 4 +-
src/gui/GUITLLogicPhasesTrackerWindow.cpp | 14 +-
src/gui/GUITLLogicPhasesTrackerWindow.h | 4 +-
src/gui/GUIViewTraffic.cpp | 55 +-
src/gui/GUIViewTraffic.h | 21 +-
src/gui/Makefile.in | 1 +
src/gui/TraCIServerAPI_GUI.cpp | 11 +-
src/gui/TraCIServerAPI_GUI.h | 4 +-
src/gui/dialogs/GUIDialog_AboutSUMO.cpp | 9 +-
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/gui/dialogs/Makefile.in | 1 +
src/guinetload/GUIDetectorBuilder.cpp | 10 +-
src/guinetload/GUIDetectorBuilder.h | 6 +-
src/guinetload/GUIEdgeControlBuilder.cpp | 9 +-
src/guinetload/GUIEdgeControlBuilder.h | 8 +-
src/guinetload/GUITriggerBuilder.cpp | 55 +-
src/guinetload/GUITriggerBuilder.h | 57 +-
src/guinetload/Makefile.in | 1 +
src/guisim/GUIBaseVehicle.cpp | 14 +-
src/guisim/GUIBaseVehicle.h | 12 +-
src/guisim/GUIBusStop.cpp | 16 +-
src/guisim/GUIBusStop.h | 9 +-
src/guisim/GUICalibrator.cpp | 4 +-
src/guisim/GUICalibrator.h | 4 +-
src/guisim/GUIChargingStation.cpp | 10 +-
src/guisim/GUIChargingStation.h | 6 +-
src/guisim/GUIContainer.cpp | 20 +-
src/guisim/GUIContainer.h | 6 +-
src/guisim/GUIContainerControl.cpp | 4 +-
src/guisim/GUIContainerControl.h | 4 +-
src/guisim/GUIContainerStop.cpp | 4 +-
src/guisim/GUIContainerStop.h | 4 +-
src/guisim/GUIDetectorWrapper.cpp | 4 +-
src/guisim/GUIDetectorWrapper.h | 4 +-
src/guisim/GUIE3Collector.cpp | 4 +-
src/guisim/GUIE3Collector.h | 4 +-
src/guisim/GUIEdge.cpp | 73 +-
src/guisim/GUIEdge.h | 18 +-
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 | 8 +-
src/guisim/GUIJunctionWrapper.h | 4 +-
src/guisim/GUILane.cpp | 26 +-
src/guisim/GUILane.h | 7 +-
src/guisim/GUILaneSpeedTrigger.cpp | 4 +-
src/guisim/GUILaneSpeedTrigger.h | 4 +-
src/guisim/GUINet.cpp | 8 +-
src/guisim/GUINet.h | 8 +-
src/guisim/GUIPerson.cpp | 27 +-
src/guisim/GUIPerson.h | 5 +-
src/guisim/GUIPersonControl.cpp | 4 +-
src/guisim/GUIPersonControl.h | 4 +-
src/guisim/GUITrafficLightLogicWrapper.cpp | 8 +-
src/guisim/GUITrafficLightLogicWrapper.h | 4 +-
src/guisim/GUITriggeredRerouter.cpp | 4 +-
src/guisim/GUITriggeredRerouter.h | 4 +-
src/guisim/GUIVehicle.cpp | 90 +-
src/guisim/GUIVehicle.h | 12 +-
src/guisim/GUIVehicleControl.cpp | 4 +-
src/guisim/GUIVehicleControl.h | 4 +-
src/guisim/GUI_E2_ZS_Collector.cpp | 32 +-
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.in | 1 +
src/guisim_main.cpp | 6 +-
src/jtrrouter/Makefile.am | 1 +
src/jtrrouter/Makefile.in | 7 +-
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 | 14 +-
src/jtrrouter/ROJTRRouter.h | 9 +-
src/jtrrouter/ROJTRTurnDefLoader.cpp | 4 +-
src/jtrrouter/ROJTRTurnDefLoader.h | 4 +-
src/jtrrouter/jtrrouter_main.cpp | 27 +-
src/marouter/Makefile.am | 1 +
src/marouter/Makefile.in | 7 +-
src/marouter/ROMAAssignments.cpp | 151 +-
src/marouter/ROMAAssignments.h | 27 +-
src/marouter/ROMAEdge.cpp | 4 +-
src/marouter/ROMAEdge.h | 4 +-
src/marouter/ROMAEdgeBuilder.cpp | 4 +-
src/marouter/ROMAEdgeBuilder.h | 4 +-
src/marouter/ROMAFrame.cpp | 10 +-
src/marouter/ROMAFrame.h | 4 +-
src/marouter/ROMARouteHandler.cpp | 7 +-
src/marouter/ROMARouteHandler.h | 94 -
src/marouter/marouter_main.cpp | 90 +-
src/mesogui/GUIMEInductLoop.cpp | 188 +
src/mesogui/GUIMEInductLoop.h | 149 +
src/mesogui/GUIMEVehicle.cpp | 277 +
src/mesogui/GUIMEVehicle.h | 158 +
src/mesogui/GUIMEVehicleControl.cpp | 116 +
src/mesogui/GUIMEVehicleControl.h | 132 +
src/mesogui/Makefile.am | 5 +
src/mesogui/Makefile.in | 621 +
src/mesosim/MEInductLoop.cpp | 79 +
src/mesosim/MEInductLoop.h | 121 +
src/mesosim/MELoop.cpp | 301 +
src/mesosim/MELoop.h | 167 +
src/mesosim/MESegment.cpp | 653 +
src/mesosim/MESegment.h | 505 +
src/mesosim/METriggeredCalibrator.cpp | 261 +
src/mesosim/METriggeredCalibrator.h | 98 +
src/mesosim/MEVehicle.cpp | 371 +
src/mesosim/MEVehicle.h | 338 +
src/mesosim/MEVehicleControl.cpp | 74 +
src/mesosim/MEVehicleControl.h | 95 +
src/mesosim/Makefile.am | 8 +
src/mesosim/Makefile.in | 628 +
src/microsim/MSBaseVehicle.cpp | 24 +-
src/microsim/MSBaseVehicle.h | 19 +-
src/microsim/MSBitSetLogic.h | 4 +-
src/microsim/MSCModel_NonInteracting.cpp | 4 +-
src/microsim/MSCModel_NonInteracting.h | 4 +-
src/microsim/MSContainer.cpp | 7 +-
src/microsim/MSContainer.h | 4 +-
src/microsim/MSContainerControl.cpp | 4 +-
src/microsim/MSContainerControl.h | 4 +-
src/microsim/MSEdge.cpp | 70 +-
src/microsim/MSEdge.h | 60 +-
src/microsim/MSEdgeControl.cpp | 4 +-
src/microsim/MSEdgeControl.h | 4 +-
src/microsim/MSEdgeWeightsStorage.cpp | 4 +-
src/microsim/MSEdgeWeightsStorage.h | 4 +-
src/microsim/MSEventControl.cpp | 4 +-
src/microsim/MSEventControl.h | 4 +-
src/microsim/MSFrame.cpp | 47 +-
src/microsim/MSFrame.h | 4 +-
src/microsim/MSGlobals.cpp | 11 +-
src/microsim/MSGlobals.h | 16 +-
src/microsim/MSInsertionControl.cpp | 12 +-
src/microsim/MSInsertionControl.h | 4 +-
src/microsim/MSInternalJunction.cpp | 4 +-
src/microsim/MSInternalJunction.h | 4 +-
src/microsim/MSJunction.cpp | 8 +-
src/microsim/MSJunction.h | 7 +-
src/microsim/MSJunctionControl.cpp | 4 +-
src/microsim/MSJunctionControl.h | 4 +-
src/microsim/MSJunctionLogic.cpp | 4 +-
src/microsim/MSJunctionLogic.h | 4 +-
src/microsim/MSLane.cpp | 177 +-
src/microsim/MSLane.h | 44 +-
src/microsim/MSLaneChanger.cpp | 12 +-
src/microsim/MSLaneChanger.h | 4 +-
src/microsim/MSLink.cpp | 51 +-
src/microsim/MSLink.h | 41 +-
src/microsim/MSLinkCont.cpp | 4 +-
src/microsim/MSLinkCont.h | 4 +-
src/microsim/MSLogicJunction.cpp | 4 +-
src/microsim/MSLogicJunction.h | 4 +-
src/microsim/MSMoveReminder.cpp | 6 +-
src/microsim/MSMoveReminder.h | 10 +-
src/microsim/MSNet.cpp | 38 +-
src/microsim/MSNet.h | 6 +-
src/microsim/MSNoLogicJunction.cpp | 4 +-
src/microsim/MSNoLogicJunction.h | 4 +-
src/microsim/MSPersonControl.cpp | 8 +-
src/microsim/MSPersonControl.h | 4 +-
src/microsim/MSRightOfWayJunction.cpp | 8 +-
src/microsim/MSRightOfWayJunction.h | 4 +-
src/microsim/MSRoute.cpp | 57 +-
src/microsim/MSRoute.h | 12 +-
src/microsim/MSRouteHandler.cpp | 620 +-
src/microsim/MSRouteHandler.h | 7 +-
src/microsim/MSStateHandler.cpp | 40 +-
src/microsim/MSStateHandler.h | 8 +-
src/microsim/MSStoppingPlace.cpp | 16 +-
src/microsim/MSStoppingPlace.h | 14 +-
src/microsim/MSTransportable.cpp | 13 +-
src/microsim/MSTransportable.h | 4 +-
src/microsim/MSVehicle.cpp | 347 +-
src/microsim/MSVehicle.h | 146 +-
src/microsim/MSVehicleContainer.cpp | 4 +-
src/microsim/MSVehicleContainer.h | 4 +-
src/microsim/MSVehicleControl.cpp | 17 +-
src/microsim/MSVehicleControl.h | 13 +-
src/microsim/MSVehicleTransfer.cpp | 4 +-
src/microsim/MSVehicleTransfer.h | 4 +-
src/microsim/MSVehicleType.cpp | 10 +-
src/microsim/MSVehicleType.h | 6 +-
src/microsim/Makefile.in | 1 +
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/actions/Makefile.in | 1 +
src/microsim/cfmodels/MSCFModel.cpp | 7 +-
src/microsim/cfmodels/MSCFModel.h | 6 +-
src/microsim/cfmodels/MSCFModel_Daniel1.cpp | 6 +-
src/microsim/cfmodels/MSCFModel_Daniel1.h | 4 +-
src/microsim/cfmodels/MSCFModel_IDM.cpp | 8 +-
src/microsim/cfmodels/MSCFModel_IDM.h | 4 +-
src/microsim/cfmodels/MSCFModel_Kerner.cpp | 6 +-
src/microsim/cfmodels/MSCFModel_Kerner.h | 4 +-
src/microsim/cfmodels/MSCFModel_Krauss.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_Krauss.h | 4 +-
.../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 | 4 +-
src/microsim/cfmodels/MSCFModel_KraussPS.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_KraussPS.h | 4 +-
src/microsim/cfmodels/MSCFModel_PWag2009.cpp | 8 +-
src/microsim/cfmodels/MSCFModel_PWag2009.h | 8 +-
src/microsim/cfmodels/MSCFModel_SmartSK.cpp | 6 +-
src/microsim/cfmodels/MSCFModel_SmartSK.h | 4 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.h | 4 +-
src/microsim/cfmodels/Makefile.am | 1 -
src/microsim/cfmodels/Makefile.in | 4 +-
src/microsim/devices/MSDevice.cpp | 6 +-
src/microsim/devices/MSDevice.h | 4 +-
src/microsim/devices/MSDevice_BTreceiver.cpp | 4 +-
src/microsim/devices/MSDevice_BTreceiver.h | 18 +-
src/microsim/devices/MSDevice_BTsender.cpp | 12 +-
src/microsim/devices/MSDevice_BTsender.h | 11 +-
src/microsim/devices/MSDevice_Battery.cpp | 26 +-
src/microsim/devices/MSDevice_Battery.h | 6 +-
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 | 139 -
src/microsim/devices/MSDevice_Person.h | 173 -
src/microsim/devices/MSDevice_Routing.cpp | 56 +-
src/microsim/devices/MSDevice_Routing.h | 15 +-
src/microsim/devices/MSDevice_Transportable.cpp | 149 +
src/microsim/devices/MSDevice_Transportable.h | 169 +
src/microsim/devices/MSDevice_Tripinfo.cpp | 21 +-
src/microsim/devices/MSDevice_Tripinfo.h | 17 +-
src/microsim/devices/MSDevice_Vehroutes.cpp | 7 +-
src/microsim/devices/MSDevice_Vehroutes.h | 4 +-
src/microsim/devices/Makefile.am | 4 +-
src/microsim/devices/Makefile.in | 15 +-
.../lcmodels/MSAbstractLaneChangeModel.cpp | 9 +-
src/microsim/lcmodels/MSAbstractLaneChangeModel.h | 4 +-
src/microsim/lcmodels/MSLCM_DK2008.cpp | 4 +-
src/microsim/lcmodels/MSLCM_DK2008.h | 4 +-
src/microsim/lcmodels/MSLCM_JE2013.cpp | 46 +-
src/microsim/lcmodels/MSLCM_JE2013.h | 4 +-
src/microsim/lcmodels/MSLCM_LC2013.cpp | 8 +-
src/microsim/lcmodels/MSLCM_LC2013.h | 4 +-
src/microsim/lcmodels/Makefile.in | 1 +
src/microsim/logging/CastingFunctionBinding.h | 4 +-
src/microsim/logging/FuncBinding_IntParam.h | 4 +-
src/microsim/logging/FuncBinding_StringParam.h | 4 +-
src/microsim/logging/FunctionBinding.h | 4 +-
src/microsim/logging/Makefile.in | 1 +
src/microsim/output/MSAmitranTrajectories.cpp | 4 +-
src/microsim/output/MSAmitranTrajectories.h | 4 +-
src/microsim/output/MSBatteryExport.cpp | 6 +-
src/microsim/output/MSBatteryExport.h | 6 +-
src/microsim/output/MSCrossSection.h | 4 +-
src/microsim/output/MSDetectorControl.cpp | 8 +-
src/microsim/output/MSDetectorControl.h | 8 +-
src/microsim/output/MSDetectorFileOutput.h | 4 +-
src/microsim/output/MSE2Collector.cpp | 127 +-
src/microsim/output/MSE2Collector.h | 33 +-
src/microsim/output/MSE3Collector.cpp | 4 +-
src/microsim/output/MSE3Collector.h | 4 +-
src/microsim/output/MSEmissionExport.cpp | 10 +-
src/microsim/output/MSEmissionExport.h | 6 +-
src/microsim/output/MSFCDExport.cpp | 79 +-
src/microsim/output/MSFCDExport.h | 9 +-
src/microsim/output/MSFullExport.cpp | 9 +-
src/microsim/output/MSFullExport.h | 4 +-
src/microsim/output/MSInductLoop.cpp | 24 +-
src/microsim/output/MSInductLoop.h | 17 +-
src/microsim/output/MSInstantInductLoop.cpp | 4 +-
src/microsim/output/MSInstantInductLoop.h | 6 +-
src/microsim/output/MSMeanData.cpp | 32 +-
src/microsim/output/MSMeanData.h | 9 +-
src/microsim/output/MSMeanData_Amitran.cpp | 12 +-
src/microsim/output/MSMeanData_Amitran.h | 4 +-
src/microsim/output/MSMeanData_Emissions.cpp | 14 +-
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 | 12 +-
src/microsim/output/MSMeanData_Net.h | 4 +-
src/microsim/output/MSQueueExport.cpp | 4 +-
src/microsim/output/MSQueueExport.h | 4 +-
src/microsim/output/MSRouteProbe.cpp | 8 +-
src/microsim/output/MSRouteProbe.h | 4 +-
src/microsim/output/MSVTKExport.cpp | 4 +-
src/microsim/output/MSVTKExport.h | 4 +-
src/microsim/output/MSVTypeProbe.cpp | 4 +-
src/microsim/output/MSVTypeProbe.h | 4 +-
src/microsim/output/MSXMLRawOut.cpp | 51 +-
src/microsim/output/MSXMLRawOut.h | 6 +-
.../output/MS_E2_ZS_CollectorOverLanes.cpp | 4 +-
src/microsim/output/MS_E2_ZS_CollectorOverLanes.h | 4 +-
src/microsim/output/Makefile.in | 1 +
src/microsim/pedestrians/MSPModel.cpp | 22 +-
src/microsim/pedestrians/MSPModel.h | 7 +-
.../pedestrians/MSPModel_NonInteracting.cpp | 6 +-
src/microsim/pedestrians/MSPModel_NonInteracting.h | 4 +-
src/microsim/pedestrians/MSPModel_Striping.cpp | 111 +-
src/microsim/pedestrians/MSPModel_Striping.h | 26 +-
src/microsim/pedestrians/MSPerson.cpp | 33 +-
src/microsim/pedestrians/MSPerson.h | 7 +-
src/microsim/pedestrians/Makefile.in | 1 +
.../traffic_lights/MSActuatedTrafficLightLogic.cpp | 4 +-
.../traffic_lights/MSActuatedTrafficLightLogic.h | 4 +-
.../MSDeterministicHiLevelTrafficLightLogic.cpp | 182 +
.../MSDeterministicHiLevelTrafficLightLogic.h | 130 +
.../traffic_lights/MSOffTrafficLightLogic.cpp | 10 +-
.../traffic_lights/MSOffTrafficLightLogic.h | 10 +-
src/microsim/traffic_lights/MSPhaseDefinition.h | 213 +-
.../traffic_lights/MSPhasedTrafficLightLogic.cpp | 223 +
.../traffic_lights/MSPhasedTrafficLightLogic.h | 208 +
src/microsim/traffic_lights/MSPushButton.cpp | 199 +
src/microsim/traffic_lights/MSPushButton.h | 107 +
src/microsim/traffic_lights/MSRailCrossing.cpp | 176 +
src/microsim/traffic_lights/MSRailCrossing.h | 182 +
src/microsim/traffic_lights/MSRailSignal.cpp | 10 +-
src/microsim/traffic_lights/MSRailSignal.h | 10 +-
.../traffic_lights/MSSOTLCongestionPolicy.cpp | 68 +
.../traffic_lights/MSSOTLCongestionPolicy.h | 61 +
src/microsim/traffic_lights/MSSOTLDefinitions.h | 83 +
src/microsim/traffic_lights/MSSOTLE2Sensors.cpp | 564 +
src/microsim/traffic_lights/MSSOTLE2Sensors.h | 155 +
.../MSSOTLHiLevelTrafficLightLogic.cpp | 58 +
.../MSSOTLHiLevelTrafficLightLogic.h | 126 +
.../traffic_lights/MSSOTLMarchingPolicy.cpp | 56 +
src/microsim/traffic_lights/MSSOTLMarchingPolicy.h | 60 +
src/microsim/traffic_lights/MSSOTLPhasePolicy.cpp | 71 +
src/microsim/traffic_lights/MSSOTLPhasePolicy.h | 58 +
.../MSSOTLPhaseTrafficLightLogic.cpp | 49 +
.../traffic_lights/MSSOTLPhaseTrafficLightLogic.h | 72 +
.../traffic_lights/MSSOTLPlatoonPolicy.cpp | 72 +
src/microsim/traffic_lights/MSSOTLPlatoonPolicy.h | 60 +
.../MSSOTLPlatoonTrafficLightLogic.cpp | 55 +
.../MSSOTLPlatoonTrafficLightLogic.h | 73 +
src/microsim/traffic_lights/MSSOTLPolicy.cpp | 172 +
src/microsim/traffic_lights/MSSOTLPolicy.h | 139 +
.../traffic_lights/MSSOTLPolicy3DStimulus.cpp | 30 +
.../traffic_lights/MSSOTLPolicy3DStimulus.h | 55 +
.../MSSOTLPolicy5DFamilyStimulus.cpp | 174 +
.../traffic_lights/MSSOTLPolicy5DFamilyStimulus.h | 85 +
.../traffic_lights/MSSOTLPolicy5DStimulus.cpp | 96 +
.../traffic_lights/MSSOTLPolicy5DStimulus.h | 172 +
.../MSSOTLPolicyBasedTrafficLightLogic.cpp | 69 +
.../MSSOTLPolicyBasedTrafficLightLogic.h | 115 +
.../traffic_lights/MSSOTLPolicyDesirability.cpp | 30 +
.../traffic_lights/MSSOTLPolicyDesirability.h | 80 +
.../traffic_lights/MSSOTLRequestPolicy.cpp | 49 +
src/microsim/traffic_lights/MSSOTLRequestPolicy.h | 59 +
.../MSSOTLRequestTrafficLightLogic.cpp | 52 +
.../MSSOTLRequestTrafficLightLogic.h | 78 +
src/microsim/traffic_lights/MSSOTLSensors.cpp | 31 +
src/microsim/traffic_lights/MSSOTLSensors.h | 141 +
.../traffic_lights/MSSOTLTrafficLightLogic.cpp | 522 +
.../traffic_lights/MSSOTLTrafficLightLogic.h | 299 +
.../traffic_lights/MSSOTLWaveTrafficLightLogic.cpp | 96 +
.../traffic_lights/MSSOTLWaveTrafficLightLogic.h | 90 +
.../traffic_lights/MSSimpleTrafficLightLogic.cpp | 18 +-
.../traffic_lights/MSSimpleTrafficLightLogic.h | 16 +-
.../traffic_lights/MSSwarmTrafficLightLogic.cpp | 1158 +
.../traffic_lights/MSSwarmTrafficLightLogic.h | 461 +
src/microsim/traffic_lights/MSTLLogicControl.cpp | 6 +-
src/microsim/traffic_lights/MSTLLogicControl.h | 6 +-
.../traffic_lights/MSTrafficLightLogic.cpp | 63 +-
src/microsim/traffic_lights/MSTrafficLightLogic.h | 18 +-
src/microsim/traffic_lights/Makefile.am | 30 +-
src/microsim/traffic_lights/Makefile.in | 76 +-
src/microsim/trigger/MSCalibrator.cpp | 13 +-
src/microsim/trigger/MSCalibrator.h | 4 +-
src/microsim/trigger/MSChargingStation.cpp | 10 +-
src/microsim/trigger/MSChargingStation.h | 6 +-
src/microsim/trigger/MSContainerTerminal.cpp | 4 +-
src/microsim/trigger/MSContainerTerminal.h | 4 +-
src/microsim/trigger/MSLaneSpeedTrigger.cpp | 21 +-
src/microsim/trigger/MSLaneSpeedTrigger.h | 4 +-
src/microsim/trigger/MSTrigger.cpp | 4 +-
src/microsim/trigger/MSTrigger.h | 4 +-
src/microsim/trigger/MSTriggeredRerouter.cpp | 67 +-
src/microsim/trigger/MSTriggeredRerouter.h | 27 +-
src/microsim/trigger/Makefile.in | 1 +
src/netbuild/Makefile.in | 1 +
src/netbuild/NBAlgorithms.cpp | 4 +-
src/netbuild/NBAlgorithms.h | 4 +-
src/netbuild/NBAlgorithms_Ramps.cpp | 54 +-
src/netbuild/NBAlgorithms_Ramps.h | 8 +-
src/netbuild/NBCapacity2Lanes.h | 4 +-
src/netbuild/NBConnection.cpp | 55 +-
src/netbuild/NBConnection.h | 7 +-
src/netbuild/NBConnectionDefs.h | 4 +-
src/netbuild/NBCont.h | 4 +-
src/netbuild/NBContHelper.cpp | 6 +-
src/netbuild/NBContHelper.h | 4 +-
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 | 157 +-
src/netbuild/NBEdge.h | 12 +-
src/netbuild/NBEdgeCont.cpp | 28 +-
src/netbuild/NBEdgeCont.h | 8 +-
src/netbuild/NBFrame.cpp | 6 +-
src/netbuild/NBFrame.h | 4 +-
src/netbuild/NBHeightMapper.cpp | 8 +-
src/netbuild/NBHeightMapper.h | 4 +-
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 | 112 +-
src/netbuild/NBLoadedSUMOTLDef.h | 27 +-
src/netbuild/NBLoadedTLDef.cpp | 135 +-
src/netbuild/NBLoadedTLDef.h | 28 +-
src/netbuild/NBNetBuilder.cpp | 116 +-
src/netbuild/NBNetBuilder.h | 4 +-
src/netbuild/NBNode.cpp | 80 +-
src/netbuild/NBNode.h | 12 +-
src/netbuild/NBNodeCont.cpp | 8 +-
src/netbuild/NBNodeCont.h | 4 +-
src/netbuild/NBNodeShapeComputer.cpp | 6 +-
src/netbuild/NBNodeShapeComputer.h | 4 +-
src/netbuild/NBOwnTLDef.cpp | 209 +-
src/netbuild/NBOwnTLDef.h | 16 +-
src/netbuild/NBRequest.cpp | 4 +-
src/netbuild/NBRequest.h | 4 +-
src/netbuild/NBSign.cpp | 8 +-
src/netbuild/NBSign.h | 4 +-
src/netbuild/NBTrafficLightDefinition.cpp | 86 +-
src/netbuild/NBTrafficLightDefinition.h | 23 +-
src/netbuild/NBTrafficLightLogic.cpp | 20 +-
src/netbuild/NBTrafficLightLogic.h | 4 +-
src/netbuild/NBTrafficLightLogicCont.cpp | 18 +-
src/netbuild/NBTrafficLightLogicCont.h | 10 +-
src/netbuild/NBTypeCont.cpp | 4 +-
src/netbuild/NBTypeCont.h | 12 +-
src/netconvert_main.cpp | 10 +-
src/netedit/GNEApplicationWindow.cpp | 6 +-
src/netedit/GNEApplicationWindow.h | 4 +-
src/netedit/GNEAttributeCarrier.cpp | 16 +-
src/netedit/GNEAttributeCarrier.h | 40 +-
src/netedit/GNEChange.cpp | 4 +-
src/netedit/GNEChange.h | 4 +-
src/netedit/GNEChange_Attribute.cpp | 4 +-
src/netedit/GNEChange_Attribute.h | 4 +-
src/netedit/GNEChange_Connection.cpp | 4 +-
src/netedit/GNEChange_Connection.h | 4 +-
src/netedit/GNEChange_Edge.cpp | 4 +-
src/netedit/GNEChange_Edge.h | 4 +-
src/netedit/GNEChange_Junction.cpp | 4 +-
src/netedit/GNEChange_Junction.h | 4 +-
src/netedit/GNEChange_Lane.cpp | 4 +-
src/netedit/GNEChange_Lane.h | 4 +-
src/netedit/GNEChange_Selection.cpp | 4 +-
src/netedit/GNEChange_Selection.h | 4 +-
src/netedit/GNEChange_TLS.cpp | 4 +-
src/netedit/GNEChange_TLS.h | 4 +-
src/netedit/GNEConnector.cpp | 4 +-
src/netedit/GNEConnector.h | 4 +-
src/netedit/GNECrossing.cpp | 4 +-
src/netedit/GNECrossing.h | 4 +-
src/netedit/GNEDialog_About.cpp | 9 +-
src/netedit/GNEDialog_About.h | 4 +-
src/netedit/GNEDialog_Wizard.cpp | 4 +-
src/netedit/GNEDialog_Wizard.h | 4 +-
src/netedit/GNEEdge.cpp | 10 +-
src/netedit/GNEEdge.h | 4 +-
src/netedit/GNEEvent_NetworkLoaded.h | 4 +-
src/netedit/GNEInspector.cpp | 4 +-
src/netedit/GNEInspector.h | 4 +-
src/netedit/GNEInternalLane.cpp | 4 +-
src/netedit/GNEInternalLane.h | 4 +-
src/netedit/GNEJunction.cpp | 27 +-
src/netedit/GNEJunction.h | 8 +-
src/netedit/GNELane.cpp | 17 +-
src/netedit/GNELane.h | 8 +-
src/netedit/GNELoadThread.cpp | 4 +-
src/netedit/GNELoadThread.h | 4 +-
src/netedit/GNENet.cpp | 12 +-
src/netedit/GNENet.h | 4 +-
src/netedit/GNEPOI.cpp | 8 +-
src/netedit/GNEPOI.h | 4 +-
src/netedit/GNEPoly.cpp | 8 +-
src/netedit/GNEPoly.h | 4 +-
src/netedit/GNEReferenceCounter.h | 4 +-
src/netedit/GNESelector.cpp | 4 +-
src/netedit/GNESelector.h | 4 +-
src/netedit/GNETLSEditor.cpp | 16 +-
src/netedit/GNETLSEditor.h | 4 +-
src/netedit/GNEUndoList.cpp | 4 +-
src/netedit/GNEUndoList.h | 4 +-
src/netedit/GNEViewNet.cpp | 26 +-
src/netedit/GNEViewNet.h | 10 +-
src/netedit/GNEViewParent.cpp | 4 +-
src/netedit/GNEViewParent.h | 4 +-
src/netedit/Makefile.am | 2 +-
src/netedit/Makefile.in | 5 +-
src/netedit/netedit_main.cpp | 6 +-
src/netedit/tlslogo.cpp | 4 +-
src/netgen/Makefile.in | 1 +
src/netgen/NGEdge.cpp | 4 +-
src/netgen/NGEdge.h | 4 +-
src/netgen/NGFrame.cpp | 6 +-
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 | 6 +-
src/netimport/Makefile.in | 1 +
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 | 8 +-
src/netimport/NIImporter_DlrNavteq.h | 4 +-
src/netimport/NIImporter_ITSUMO.cpp | 12 +-
src/netimport/NIImporter_ITSUMO.h | 4 +-
src/netimport/NIImporter_MATSim.cpp | 10 +-
src/netimport/NIImporter_MATSim.h | 4 +-
src/netimport/NIImporter_OpenDrive.cpp | 16 +-
src/netimport/NIImporter_OpenDrive.h | 4 +-
src/netimport/NIImporter_OpenStreetMap.cpp | 26 +-
src/netimport/NIImporter_OpenStreetMap.h | 4 +-
src/netimport/NIImporter_RobocupRescue.cpp | 4 +-
src/netimport/NIImporter_RobocupRescue.h | 4 +-
src/netimport/NIImporter_SUMO.cpp | 11 +-
src/netimport/NIImporter_SUMO.h | 4 +-
src/netimport/NIImporter_VISUM.cpp | 8 +-
src/netimport/NIImporter_VISUM.h | 4 +-
src/netimport/NILoader.cpp | 4 +-
src/netimport/NILoader.h | 4 +-
src/netimport/NINavTeqHelper.cpp | 4 +-
src/netimport/NINavTeqHelper.h | 4 +-
src/netimport/NIVisumTL.cpp | 13 +-
src/netimport/NIVisumTL.h | 7 +-
src/netimport/NIXMLConnectionsHandler.cpp | 24 +-
src/netimport/NIXMLConnectionsHandler.h | 4 +-
src/netimport/NIXMLEdgesHandler.cpp | 13 +-
src/netimport/NIXMLEdgesHandler.h | 4 +-
src/netimport/NIXMLNodesHandler.cpp | 8 +-
src/netimport/NIXMLNodesHandler.h | 4 +-
src/netimport/NIXMLTrafficLightsHandler.cpp | 8 +-
src/netimport/NIXMLTrafficLightsHandler.h | 4 +-
src/netimport/NIXMLTypesHandler.cpp | 4 +-
src/netimport/NIXMLTypesHandler.h | 4 +-
src/netimport/vissim/Makefile.in | 1 +
src/netimport/vissim/NIImporter_Vissim.cpp | 26 +-
src/netimport/vissim/NIImporter_Vissim.h | 4 +-
src/netimport/vissim/NIVissimElements.h | 4 +-
src/netimport/vissim/tempstructs/Makefile.in | 1 +
.../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/NIVissimConflictArea.cpp | 8 +-
.../vissim/tempstructs/NIVissimConflictArea.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 | 6 +-
src/netimport/vissim/tempstructs/NIVissimEdge.cpp | 4 +-
src/netimport/vissim/tempstructs/NIVissimEdge.h | 6 +-
.../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 | 6 +-
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 +-
src/netimport/vissim/typeloader/Makefile.in | 1 +
...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 | 8 +-
.../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/Makefile.in | 1 +
src/netload/NLBuilder.cpp | 10 +-
src/netload/NLBuilder.h | 4 +-
src/netload/NLDetectorBuilder.cpp | 16 +-
src/netload/NLDetectorBuilder.h | 18 +-
src/netload/NLDiscreteEventBuilder.cpp | 4 +-
src/netload/NLDiscreteEventBuilder.h | 4 +-
src/netload/NLEdgeControlBuilder.cpp | 12 +-
src/netload/NLEdgeControlBuilder.h | 12 +-
src/netload/NLHandler.cpp | 109 +-
src/netload/NLHandler.h | 4 +-
src/netload/NLJunctionControlBuilder.cpp | 76 +-
src/netload/NLJunctionControlBuilder.h | 30 +-
src/netload/NLTriggerBuilder.cpp | 74 +-
src/netload/NLTriggerBuilder.h | 71 +-
src/netwrite/Makefile.in | 1 +
src/netwrite/NWFrame.cpp | 14 +-
src/netwrite/NWFrame.h | 4 +-
src/netwrite/NWWriter_Amitran.cpp | 7 +-
src/netwrite/NWWriter_Amitran.h | 4 +-
src/netwrite/NWWriter_DlrNavteq.cpp | 4 +-
src/netwrite/NWWriter_DlrNavteq.h | 4 +-
src/netwrite/NWWriter_MATSim.cpp | 4 +-
src/netwrite/NWWriter_MATSim.h | 4 +-
src/netwrite/NWWriter_OpenDrive.cpp | 43 +-
src/netwrite/NWWriter_OpenDrive.h | 8 +-
src/netwrite/NWWriter_SUMO.cpp | 16 +-
src/netwrite/NWWriter_SUMO.h | 4 +-
src/netwrite/NWWriter_XML.cpp | 6 +-
src/netwrite/NWWriter_XML.h | 4 +-
src/od/Makefile.in | 1 +
src/od/ODAmitranHandler.cpp | 4 +-
src/od/ODAmitranHandler.h | 4 +-
src/od/ODCell.h | 4 +-
src/od/ODDistrict.cpp | 4 +-
src/od/ODDistrict.h | 4 +-
src/od/ODDistrictCont.cpp | 4 +-
src/od/ODDistrictCont.h | 4 +-
src/od/ODDistrictHandler.cpp | 4 +-
src/od/ODDistrictHandler.h | 4 +-
src/od/ODMatrix.cpp | 33 +-
src/od/ODMatrix.h | 18 +-
src/od2trips_main.cpp | 6 +-
src/osgview/GUIOSGBoundingBoxCalculator.h | 99 +
src/osgview/GUIOSGBuilder.cpp | 410 +
src/osgview/GUIOSGBuilder.h | 95 +
src/osgview/GUIOSGView.cpp | 690 +
src/osgview/GUIOSGView.h | 279 +
src/osgview/Makefile.am | 5 +
src/osgview/Makefile.in | 619 +
src/polyconvert/Makefile.am | 5 +
src/polyconvert/Makefile.in | 17 +-
src/polyconvert/PCLoaderArcView.cpp | 4 +-
src/polyconvert/PCLoaderArcView.h | 4 +-
src/polyconvert/PCLoaderDlrNavteq.cpp | 4 +-
src/polyconvert/PCLoaderDlrNavteq.h | 4 +-
src/polyconvert/PCLoaderOSM.cpp | 34 +-
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 | 8 +-
src/polyconvert/PCNetProjectionLoader.h | 4 +-
src/polyconvert/PCPolyContainer.cpp | 4 +-
src/polyconvert/PCPolyContainer.h | 4 +-
src/polyconvert/PCTypeDefHandler.cpp | 4 +-
src/polyconvert/PCTypeDefHandler.h | 4 +-
src/polyconvert/PCTypeMap.cpp | 4 +-
src/polyconvert/PCTypeMap.h | 4 +-
src/polyconvert/pc_typemap.h | 63 +
src/polyconvert/polyconvert_main.cpp | 45 +-
src/router/Makefile.am | 4 +-
src/router/Makefile.in | 13 +-
src/router/ROAbstractEdgeBuilder.h | 4 +-
src/router/ROEdge.cpp | 26 +-
src/router/ROEdge.h | 23 +-
src/router/ROFrame.cpp | 4 +-
src/router/ROFrame.h | 4 +-
src/router/ROHelper.cpp | 4 +-
src/router/ROHelper.h | 4 +-
src/router/ROLane.h | 15 +-
src/router/ROLoader.cpp | 14 +-
src/router/ROLoader.h | 8 +-
src/router/RONet.cpp | 290 +-
src/router/RONet.h | 150 +-
src/router/RONetHandler.cpp | 67 +-
src/router/RONetHandler.h | 24 +-
src/router/RONode.cpp | 4 +-
src/router/RONode.h | 4 +-
src/router/ROPerson.cpp | 254 +
src/router/ROPerson.h | 331 +
src/router/RORoutable.h | 186 +
src/router/RORoute.cpp | 7 +-
src/router/RORoute.h | 21 +-
src/router/RORouteDef.cpp | 106 +-
src/router/RORouteDef.h | 14 +-
src/router/RORouteHandler.cpp | 172 +-
src/router/RORouteHandler.h | 18 +-
src/router/ROVehicle.cpp | 100 +-
src/router/ROVehicle.h | 91 +-
src/router/ROVehicleCont.cpp | 107 -
src/router/ROVehicleCont.h | 143 -
src/sumo_main.cpp | 12 +-
src/tools/Makefile.am | 1 +
src/tools/Makefile.in | 12 +-
src/tools/TrajectoriesHandler.cpp | 70 +-
src/tools/TrajectoriesHandler.h | 21 +-
src/tools/emissionsDrivingCycle_main.cpp | 60 +-
src/tools/emissionsMap_main.cpp | 5 +-
src/traci-server/Makefile.in | 1 +
src/traci-server/TraCIConstants.h | 9 +-
src/traci-server/TraCIException.h | 4 +-
src/traci-server/TraCIServer.cpp | 8 +-
src/traci-server/TraCIServer.h | 19 +-
src/traci-server/TraCIServerAPI_ArealDetector.cpp | 7 +-
src/traci-server/TraCIServerAPI_ArealDetector.h | 12 +-
src/traci-server/TraCIServerAPI_Edge.cpp | 8 +-
src/traci-server/TraCIServerAPI_Edge.h | 4 +-
src/traci-server/TraCIServerAPI_InductionLoop.cpp | 6 +-
src/traci-server/TraCIServerAPI_InductionLoop.h | 4 +-
src/traci-server/TraCIServerAPI_Junction.cpp | 6 +-
src/traci-server/TraCIServerAPI_Junction.h | 4 +-
src/traci-server/TraCIServerAPI_Lane.cpp | 9 +-
src/traci-server/TraCIServerAPI_Lane.h | 4 +-
src/traci-server/TraCIServerAPI_MeMeDetector.cpp | 6 +-
src/traci-server/TraCIServerAPI_MeMeDetector.h | 4 +-
src/traci-server/TraCIServerAPI_POI.cpp | 8 +-
src/traci-server/TraCIServerAPI_POI.h | 4 +-
src/traci-server/TraCIServerAPI_Person.cpp | 8 +-
src/traci-server/TraCIServerAPI_Person.h | 4 +-
src/traci-server/TraCIServerAPI_Polygon.cpp | 8 +-
src/traci-server/TraCIServerAPI_Polygon.h | 4 +-
src/traci-server/TraCIServerAPI_Route.cpp | 8 +-
src/traci-server/TraCIServerAPI_Route.h | 4 +-
src/traci-server/TraCIServerAPI_Simulation.cpp | 21 +-
src/traci-server/TraCIServerAPI_Simulation.h | 4 +-
src/traci-server/TraCIServerAPI_TLS.cpp | 22 +-
src/traci-server/TraCIServerAPI_TLS.h | 4 +-
src/traci-server/TraCIServerAPI_Vehicle.cpp | 110 +-
src/traci-server/TraCIServerAPI_Vehicle.h | 6 +-
src/traci-server/TraCIServerAPI_VehicleType.cpp | 8 +-
src/traci-server/TraCIServerAPI_VehicleType.h | 4 +-
src/traci_testclient/Makefile.in | 1 +
src/traci_testclient/TraCITestClient.cpp | 26 +-
src/traci_testclient/TraCITestClient.h | 4 +-
src/traci_testclient/tracitestclient_main.cpp | 4 +-
src/utils/Makefile.in | 1 +
src/utils/common/AbstractMutex.h | 4 +-
src/utils/common/Command.h | 4 +-
src/utils/common/FileHelpers.cpp | 4 +-
src/utils/common/FileHelpers.h | 8 +-
src/utils/common/IDSupplier.cpp | 4 +-
src/utils/common/IDSupplier.h | 4 +-
src/utils/common/Makefile.am | 2 +-
src/utils/common/Makefile.in | 3 +-
src/utils/common/MsgHandler.cpp | 4 +-
src/utils/common/MsgHandler.h | 5 +-
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 | 8 +-
src/utils/common/Parameterised.h | 4 +-
src/utils/common/RGBColor.cpp | 4 +-
src/utils/common/RGBColor.h | 4 +-
src/utils/common/RandHelper.cpp | 4 +-
src/utils/common/RandHelper.h | 4 +-
src/utils/common/RandomDistributor.h | 8 +-
src/utils/common/SUMOTime.cpp | 6 +-
src/utils/common/SUMOTime.h | 30 +-
src/utils/common/SUMOVehicleClass.cpp | 4 +-
src/utils/common/SUMOVehicleClass.h | 4 +-
src/utils/common/StaticCommand.h | 2 +-
src/utils/common/StdDefs.cpp | 15 +-
src/utils/common/StdDefs.h | 6 +-
src/utils/common/StringBijection.h | 4 +-
src/utils/common/StringTokenizer.cpp | 4 +-
src/utils/common/StringTokenizer.h | 4 +-
src/utils/common/StringUtils.cpp | 4 +-
src/utils/common/StringUtils.h | 4 +-
src/utils/common/SwarmDebug.h | 33 +
src/utils/common/SysUtils.cpp | 4 +-
src/utils/common/SysUtils.h | 4 +-
src/utils/common/SystemFrame.cpp | 5 +-
src/utils/common/SystemFrame.h | 4 +-
src/utils/common/ToString.h | 7 +-
src/utils/common/TplConvert.h | 4 +-
src/utils/common/UtilExceptions.h | 4 +-
src/utils/common/ValueRetriever.h | 4 +-
src/utils/common/ValueSource.h | 4 +-
src/utils/common/ValueTimeLine.h | 4 +-
src/utils/common/VectorHelper.h | 4 +-
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/distribution/Makefile.in | 1 +
src/utils/emissions/HelpersHBEFA.cpp | 4 +-
src/utils/emissions/HelpersHBEFA.h | 8 +-
src/utils/emissions/HelpersHBEFA3.cpp | 4 +-
src/utils/emissions/HelpersHBEFA3.h | 8 +-
src/utils/emissions/HelpersHarmonoise.cpp | 8 +-
src/utils/emissions/HelpersHarmonoise.h | 4 +-
src/utils/emissions/HelpersPHEMlight.cpp | 122 +-
src/utils/emissions/HelpersPHEMlight.h | 35 +-
src/utils/emissions/Makefile.in | 1 +
src/utils/emissions/PHEMCEP.cpp | 4 +-
src/utils/emissions/PHEMCEP.h | 8 +-
src/utils/emissions/PHEMCEPHandler.cpp | 2 +-
src/utils/emissions/PHEMCEPHandler.h | 2 +-
src/utils/emissions/PHEMConstants.h | 2 +-
src/utils/emissions/PollutantsInterface.cpp | 13 +-
src/utils/emissions/PollutantsInterface.h | 48 +-
src/utils/foxtools/FXBaseObject.cpp | 4 +-
src/utils/foxtools/FXBaseObject.h | 6 +-
src/utils/foxtools/FXLCDLabel.cpp | 4 +-
src/utils/foxtools/FXLCDLabel.h | 6 +-
src/utils/foxtools/FXLinkLabel.cpp | 4 +-
src/utils/foxtools/FXLinkLabel.h | 4 +-
src/utils/foxtools/FXRealSpinDial.cpp | 32 +-
src/utils/foxtools/FXRealSpinDial.h | 4 +-
src/utils/foxtools/FXSevenSegment.cpp | 4 +-
src/utils/foxtools/FXSevenSegment.h | 6 +-
src/utils/foxtools/FXSingleEventThread.cpp | 4 +-
src/utils/foxtools/FXSingleEventThread.h | 4 +-
src/utils/foxtools/FXThreadEvent.cpp | 4 +-
src/utils/foxtools/FXThreadEvent.h | 4 +-
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 | 6 +-
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 | 4 +-
src/utils/foxtools/MFXUtils.cpp | 4 +-
src/utils/foxtools/MFXUtils.h | 4 +-
src/utils/foxtools/Makefile.in | 1 +
src/utils/foxtools/fxexdefs.h | 4 +-
src/utils/geom/AbstractPoly.h | 4 +-
src/utils/geom/Boundary.cpp | 4 +-
src/utils/geom/Boundary.h | 6 +-
src/utils/geom/Bresenham.cpp | 4 +-
src/utils/geom/Bresenham.h | 4 +-
src/utils/geom/GeoConvHelper.cpp | 4 +-
src/utils/geom/GeoConvHelper.h | 4 +-
src/utils/geom/GeomConvHelper.cpp | 4 +-
src/utils/geom/GeomConvHelper.h | 4 +-
src/utils/geom/GeomHelper.cpp | 4 +-
src/utils/geom/GeomHelper.h | 4 +-
src/utils/geom/Helper_ConvexHull.cpp | 4 +-
src/utils/geom/Helper_ConvexHull.h | 4 +-
src/utils/geom/Makefile.in | 1 +
src/utils/geom/Position.cpp | 4 +-
src/utils/geom/Position.h | 4 +-
src/utils/geom/PositionVector.cpp | 32 +-
src/utils/geom/PositionVector.h | 4 +-
src/utils/geom/bezier.cpp | 4 +-
src/utils/geom/bezier.h | 4 +-
src/utils/gui/Makefile.in | 1 +
src/utils/gui/div/GLHelper.cpp | 4 +-
src/utils/gui/div/GLHelper.h | 4 +-
src/utils/gui/div/GLObjectValuePassConnector.h | 4 +-
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 | 11 +-
src/utils/gui/div/GUIParameterTableWindow.h | 4 +-
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/div/GUIVideoEncoder.h | 227 +
src/utils/gui/div/Makefile.am | 7 +-
src/utils/gui/div/Makefile.in | 7 +-
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/events/Makefile.in | 1 +
src/utils/gui/globjects/GLIncludes.h | 4 +-
src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp | 15 +-
src/utils/gui/globjects/GUIGLObjectPopupMenu.h | 7 +-
src/utils/gui/globjects/GUIGlObject.cpp | 13 +-
src/utils/gui/globjects/GUIGlObject.h | 24 +-
src/utils/gui/globjects/GUIGlObjectStorage.cpp | 4 +-
src/utils/gui/globjects/GUIGlObjectStorage.h | 4 +-
src/utils/gui/globjects/GUIGlObjectTypes.h | 4 +-
.../gui/globjects/GUIGlObject_AbstractAdd.cpp | 4 +-
src/utils/gui/globjects/GUIGlObject_AbstractAdd.h | 4 +-
src/utils/gui/globjects/GUIPointOfInterest.cpp | 18 +-
src/utils/gui/globjects/GUIPointOfInterest.h | 4 +-
src/utils/gui/globjects/GUIPolygon.cpp | 6 +-
src/utils/gui/globjects/GUIPolygon.h | 4 +-
src/utils/gui/globjects/GUIShapeContainer.cpp | 4 +-
src/utils/gui/globjects/GUIShapeContainer.h | 4 +-
src/utils/gui/globjects/Makefile.in | 1 +
src/utils/gui/images/GUIIconSubSys.cpp | 4 +-
src/utils/gui/images/GUIIconSubSys.h | 4 +-
src/utils/gui/images/GUIIcons.h | 4 +-
src/utils/gui/images/GUITexturesHelper.cpp | 4 +-
src/utils/gui/images/GUITexturesHelper.h | 4 +-
src/utils/gui/images/Makefile.in | 1 +
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/manip.cpp | 4 +-
src/utils/gui/images/recenter_view.xpm | 4 +-
.../gui/settings/GUICompleteSchemeStorage.cpp | 4 +-
src/utils/gui/settings/GUICompleteSchemeStorage.h | 4 +-
src/utils/gui/settings/GUIPropertyScheme.h | 4 +-
src/utils/gui/settings/GUIPropertySchemeStorage.h | 4 +-
src/utils/gui/settings/GUISettingsHandler.cpp | 10 +-
src/utils/gui/settings/GUISettingsHandler.h | 4 +-
.../gui/settings/GUIVisualizationSettings.cpp | 47 +-
src/utils/gui/settings/GUIVisualizationSettings.h | 6 +-
src/utils/gui/settings/Makefile.in | 1 +
src/utils/gui/tracker/GUIParameterTracker.cpp | 4 +-
src/utils/gui/tracker/GUIParameterTracker.h | 4 +-
src/utils/gui/tracker/Makefile.in | 1 +
src/utils/gui/tracker/TrackerValueDesc.cpp | 4 +-
src/utils/gui/tracker/TrackerValueDesc.h | 4 +-
src/utils/gui/windows/GUIAppEnum.h | 6 +-
.../gui/windows/GUIDanielPerspectiveChanger.cpp | 8 +-
.../gui/windows/GUIDanielPerspectiveChanger.h | 4 +-
src/utils/gui/windows/GUIDialog_EditViewport.cpp | 4 +-
src/utils/gui/windows/GUIDialog_EditViewport.h | 4 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.cpp | 4 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.h | 4 +-
src/utils/gui/windows/GUIDialog_ViewSettings.cpp | 16 +-
src/utils/gui/windows/GUIDialog_ViewSettings.h | 4 +-
src/utils/gui/windows/GUIGlChildWindow.cpp | 17 +-
src/utils/gui/windows/GUIGlChildWindow.h | 4 +-
src/utils/gui/windows/GUIMainWindow.cpp | 4 +-
src/utils/gui/windows/GUIMainWindow.h | 4 +-
src/utils/gui/windows/GUIPerspectiveChanger.cpp | 4 +-
src/utils/gui/windows/GUIPerspectiveChanger.h | 4 +-
src/utils/gui/windows/GUISUMOAbstractView.cpp | 56 +-
src/utils/gui/windows/GUISUMOAbstractView.h | 25 +-
src/utils/gui/windows/Makefile.in | 1 +
src/utils/importio/LineHandler.h | 4 +-
src/utils/importio/LineReader.cpp | 4 +-
src/utils/importio/LineReader.h | 4 +-
src/utils/importio/Makefile.in | 1 +
src/utils/importio/NamedColumnsParser.cpp | 4 +-
src/utils/importio/NamedColumnsParser.h | 4 +-
src/utils/iodevices/BinaryFormatter.cpp | 4 +-
src/utils/iodevices/BinaryFormatter.h | 10 +-
src/utils/iodevices/BinaryInputDevice.cpp | 4 +-
src/utils/iodevices/BinaryInputDevice.h | 4 +-
src/utils/iodevices/Makefile.in | 1 +
src/utils/iodevices/OutputDevice.cpp | 4 +-
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 | 4 +-
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/Makefile.in | 1 +
src/utils/options/Option.cpp | 10 +-
src/utils/options/Option.h | 22 +-
src/utils/options/OptionsCont.cpp | 40 +-
src/utils/options/OptionsCont.h | 50 +-
src/utils/options/OptionsIO.cpp | 35 +-
src/utils/options/OptionsIO.h | 14 +-
src/utils/options/OptionsLoader.cpp | 24 +-
src/utils/options/OptionsLoader.h | 14 +-
src/utils/options/OptionsParser.cpp | 9 +-
src/utils/options/OptionsParser.h | 4 +-
src/utils/shapes/Makefile.in | 1 +
src/utils/shapes/PointOfInterest.h | 8 +-
src/utils/shapes/Polygon.cpp | 8 +-
src/utils/shapes/Polygon.h | 4 +-
src/utils/shapes/Shape.cpp | 8 +-
src/utils/shapes/Shape.h | 4 +-
src/utils/shapes/ShapeContainer.cpp | 4 +-
src/utils/shapes/ShapeContainer.h | 4 +-
src/utils/shapes/ShapeHandler.cpp | 4 +-
src/utils/shapes/ShapeHandler.h | 4 +-
src/utils/traci/Makefile.in | 1 +
src/utils/traci/TraCIAPI.cpp | 248 +-
src/utils/traci/TraCIAPI.h | 89 +-
src/utils/vehicle/AStarRouter.h | 91 +-
src/utils/vehicle/CHRouter.h | 49 +-
src/utils/vehicle/CHRouterWrapper.h | 26 +-
src/utils/vehicle/CarEdge.h | 208 +
src/utils/vehicle/DijkstraRouterEffort.h | 59 +-
src/utils/vehicle/DijkstraRouterTT.h | 58 +-
src/utils/vehicle/GawronCalculator.h | 4 +-
src/utils/vehicle/IntermodalEdge.h | 275 +
src/utils/vehicle/IntermodalNetwork.h | 298 +
src/utils/vehicle/IntermodalRouter.h | 441 +
src/utils/vehicle/LogitCalculator.h | 4 +-
src/utils/vehicle/Makefile.am | 2 +
src/utils/vehicle/Makefile.in | 3 +
src/utils/vehicle/PedestrianRouter.h | 495 +-
src/utils/vehicle/RouteCostCalculator.h | 8 +-
src/utils/vehicle/SPTree.h | 8 +-
src/utils/vehicle/SUMOAbstractRouter.h | 12 +-
src/utils/vehicle/SUMOVTypeParameter.cpp | 4 +-
src/utils/vehicle/SUMOVTypeParameter.h | 4 +-
src/utils/vehicle/SUMOVehicle.h | 9 +-
src/utils/vehicle/SUMOVehicleParameter.cpp | 110 +-
src/utils/vehicle/SUMOVehicleParameter.h | 37 +-
src/utils/xml/GenericSAXHandler.cpp | 4 +-
src/utils/xml/GenericSAXHandler.h | 4 +-
src/utils/xml/Makefile.in | 1 +
src/utils/xml/SAXWeightsHandler.cpp | 4 +-
src/utils/xml/SAXWeightsHandler.h | 4 +-
src/utils/xml/SUMORouteHandler.cpp | 8 +-
src/utils/xml/SUMORouteHandler.h | 4 +-
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 | 12 +-
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 | 4 +-
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 | 27 +-
src/utils/xml/SUMOVehicleParserHelper.h | 4 +-
src/utils/xml/SUMOXMLDefinitions.cpp | 23 +-
src/utils/xml/SUMOXMLDefinitions.h | 26 +-
src/utils/xml/XMLSubSys.cpp | 4 +-
src/utils/xml/XMLSubSys.h | 4 +-
src/version.h | 2 +-
src/windows_config.h | 12 +-
tools/assign/Assignment.py | 64 +-
tools/assign/assign.py | 37 +-
tools/assign/cadytsIterate.py | 118 +-
tools/assign/costFunctionChecker.py | 87 +-
tools/assign/costMemory.py | 37 +-
tools/assign/dijkstra.py | 12 +-
tools/assign/duaIterate.py | 276 +-
tools/assign/duaIterate_analysis.py | 20 +-
tools/assign/elements.py | 14 +-
tools/assign/inputs.py | 25 +-
tools/assign/matrixDailyToHourly.py | 54 +-
tools/assign/network.py | 18 +-
tools/assign/networkStatistics.py | 35 +-
tools/assign/one-shot.py | 5 +-
tools/assign/outputs.py | 26 +-
tools/assign/routeChoices.py | 89 +-
tools/assign/run.py | 12 +-
tools/assign/statisticsElements.py | 11 +-
tools/assign/tables.py | 2 +-
tools/build/apply_astyle.py | 5 +-
tools/build/buildHTMLDocs.py | 14 +-
tools/build/checkAuthors.py | 35 +-
tools/build/checkSvnProps.py | 24 +-
tools/build/configTemplateToWiki.py | 30 +-
tools/build/dailyBuildMSVC.py | 223 +-
tools/build/dailyBuildMSVC8.bat | 1 -
tools/build/dailyUpdateMakeGCC.sh | 5 +-
tools/build/history.py | 5 +-
tools/build/mirrorWiki.py | 13 +-
tools/build/pythonPropsMSVC.py | 80 +-
tools/build/status.py | 34 +-
tools/build/typemap.py | 39 +-
tools/build/version.py | 12 +-
tools/build/wix.py | 14 +-
.../sumolib4matlab/+sumolib/+demand/BusStop.m | 84 +-
.../sumolib4matlab/+sumolib/+demand/Flow.m | 216 +-
.../sumolib4matlab/+sumolib/+demand/Stop.m | 136 +-
.../+sumolib/+demand/TurnProbability.m | 86 +-
.../sumolib4matlab/+sumolib/+demand/VehicleType.m | 206 +-
.../+sumolib/+demand/generateDemand.m | 516 +-
.../inter_palmas/generateDemand_inter_palmas.m | 134 +-
.../inter_palmas/inter_palmas_notls.net.xml | 652 +-
.../edu/unalmed/gaunal/sumolib/net/Connection.java | 80 +-
.../co/edu/unalmed/gaunal/sumolib/net/Edge.java | 278 +-
.../co/edu/unalmed/gaunal/sumolib/net/Lane.java | 122 +-
.../src/co/edu/unalmed/gaunal/sumolib/net/Net.java | 450 +-
.../edu/unalmed/gaunal/sumolib/net/NetReader.java | 494 +-
.../co/edu/unalmed/gaunal/sumolib/net/Node.java | 168 +-
.../edu/unalmed/gaunal/sumolib/net/Roundabout.java | 50 +-
.../src/co/edu/unalmed/gaunal/sumolib/net/TLS.java | 108 +-
.../edu/unalmed/gaunal/sumolib/net/TLSProgram.java | 80 +-
.../unalmed/gaunal/sumolib/net/NetReaderTest.java | 600 +-
.../co/edu/unalmed/gaunal/sumolib/net/NetTest.java | 1006 +-
tools/contributed/traas/.classpath | 12 +-
tools/contributed/traas/.project | 34 +-
.../traas/.settings/org.eclipse.jdt.core.prefs | 22 +-
.../traas/examples/java_library/Main.java | 108 +-
.../traas/examples/java_wsclient/Main.java | 108 +-
.../java_wsclient/de/tudresden/ws/AddOption.java | 174 +-
.../de/tudresden/ws/AddOptionResponse.java | 64 +-
.../de/tudresden/ws/ArealDetectorGetIDCount.java | 64 +-
.../ws/ArealDetectorGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/ArealDetectorGetIDList.java | 64 +-
.../ws/ArealDetectorGetIDListResponse.java | 138 +-
.../ws/ArealDetectorGetJamLengthMeters.java | 120 +-
.../ArealDetectorGetJamLengthMetersResponse.java | 108 +-
.../ws/ArealDetectorGetJamLengthVehicle.java | 120 +-
.../ArealDetectorGetJamLengthVehicleResponse.java | 108 +-
.../java_wsclient/de/tudresden/ws/DoTimestep.java | 64 +-
.../de/tudresden/ws/DoTimestepResponse.java | 64 +-
.../de/tudresden/ws/EdgeAdaptTraveltime.java | 158 +-
.../tudresden/ws/EdgeAdaptTraveltimeResponse.java | 64 +-
.../de/tudresden/ws/EdgeGetAdaptedTraveltime.java | 158 +-
.../ws/EdgeGetAdaptedTraveltimeResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetCO2Emission.java | 120 +-
.../tudresden/ws/EdgeGetCO2EmissionResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetCOEmission.java | 120 +-
.../de/tudresden/ws/EdgeGetCOEmissionResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetEffort.java | 158 +-
.../de/tudresden/ws/EdgeGetEffortResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetFuelConsumption.java | 120 +-
.../ws/EdgeGetFuelConsumptionResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetHCEmission.java | 120 +-
.../de/tudresden/ws/EdgeGetHCEmissionResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetIDCount.java | 64 +-
.../de/tudresden/ws/EdgeGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetIDList.java | 64 +-
.../de/tudresden/ws/EdgeGetIDListResponse.java | 138 +-
.../tudresden/ws/EdgeGetLastStepHaltingNumber.java | 120 +-
.../ws/EdgeGetLastStepHaltingNumberResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetLastStepLength.java | 120 +-
.../ws/EdgeGetLastStepLengthResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetLastStepMeanSpeed.java | 120 +-
.../ws/EdgeGetLastStepMeanSpeedResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetLastStepOccupancy.java | 120 +-
.../ws/EdgeGetLastStepOccupancyResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetLastStepVehicleIDs.java | 120 +-
.../ws/EdgeGetLastStepVehicleIDsResponse.java | 138 +-
.../tudresden/ws/EdgeGetLastStepVehicleNumber.java | 120 +-
.../ws/EdgeGetLastStepVehicleNumberResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetNOxEmission.java | 120 +-
.../tudresden/ws/EdgeGetNOxEmissionResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetNoiseEmission.java | 120 +-
.../tudresden/ws/EdgeGetNoiseEmissionResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetPMxEmission.java | 120 +-
.../tudresden/ws/EdgeGetPMxEmissionResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetTraveltime.java | 120 +-
.../de/tudresden/ws/EdgeGetTraveltimeResponse.java | 108 +-
.../de/tudresden/ws/EdgeGetWaitingTime.java | 120 +-
.../tudresden/ws/EdgeGetWaitingTimeResponse.java | 108 +-
.../de/tudresden/ws/EdgeSetEffort.java | 158 +-
.../de/tudresden/ws/EdgeSetEffortResponse.java | 64 +-
.../de/tudresden/ws/EdgeSetMaxSpeed.java | 158 +-
.../de/tudresden/ws/EdgeSetMaxSpeedResponse.java | 64 +-
.../de/tudresden/ws/GUIGetBoundary.java | 120 +-
.../de/tudresden/ws/GUIGetBoundaryResponse.java | 124 +-
.../de/tudresden/ws/GUIGetIDList.java | 64 +-
.../de/tudresden/ws/GUIGetIDListResponse.java | 138 +-
.../de/tudresden/ws/GUIGetOffset.java | 120 +-
.../de/tudresden/ws/GUIGetOffsetResponse.java | 124 +-
.../de/tudresden/ws/GUIGetSchema.java | 120 +-
.../de/tudresden/ws/GUIGetSchemaResponse.java | 124 +-
.../java_wsclient/de/tudresden/ws/GUIGetZoom.java | 120 +-
.../de/tudresden/ws/GUIGetZoomResponse.java | 108 +-
.../de/tudresden/ws/GUIScreenshot.java | 174 +-
.../de/tudresden/ws/GUIScreenshotResponse.java | 64 +-
.../de/tudresden/ws/GUISetBoundary.java | 272 +-
.../de/tudresden/ws/GUISetBoundaryResponse.java | 64 +-
.../de/tudresden/ws/GUISetOffset.java | 196 +-
.../de/tudresden/ws/GUISetOffsetResponse.java | 64 +-
.../de/tudresden/ws/GUISetSchema.java | 174 +-
.../de/tudresden/ws/GUISetSchemaResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/GUISetZoom.java | 158 +-
.../de/tudresden/ws/GUISetZoomResponse.java | 64 +-
.../de/tudresden/ws/GUITrackVehicle.java | 174 +-
.../de/tudresden/ws/GUITrackVehicleResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/GetStatus.java | 120 +-
.../de/tudresden/ws/GetStatusResponse.java | 124 +-
.../de/tudresden/ws/InductionloopGetIDCount.java | 64 +-
.../ws/InductionloopGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/InductionloopGetIDList.java | 64 +-
.../ws/InductionloopGetIDListResponse.java | 138 +-
.../de/tudresden/ws/InductionloopGetLaneID.java | 120 +-
.../ws/InductionloopGetLaneIDResponse.java | 124 +-
.../ws/InductionloopGetLastStepMeanLength.java | 120 +-
...InductionloopGetLastStepMeanLengthResponse.java | 108 +-
.../ws/InductionloopGetLastStepMeanSpeed.java | 120 +-
.../InductionloopGetLastStepMeanSpeedResponse.java | 108 +-
.../ws/InductionloopGetLastStepOccupancy.java | 120 +-
.../InductionloopGetLastStepOccupancyResponse.java | 108 +-
.../ws/InductionloopGetLastStepVehicleIDs.java | 120 +-
...InductionloopGetLastStepVehicleIDsResponse.java | 138 +-
.../ws/InductionloopGetLastStepVehicleNumber.java | 120 +-
...uctionloopGetLastStepVehicleNumberResponse.java | 108 +-
.../de/tudresden/ws/InductionloopGetPosition.java | 120 +-
.../ws/InductionloopGetPositionResponse.java | 108 +-
.../ws/InductionloopGetTimeSinceDetection.java | 120 +-
...InductionloopGetTimeSinceDetectionResponse.java | 108 +-
.../tudresden/ws/InductionloopGetVehicleData.java | 134 +-
.../ws/InductionloopGetVehicleDataResponse.java | 108 +-
.../de/tudresden/ws/JunctionGetIDCount.java | 64 +-
.../tudresden/ws/JunctionGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/JunctionGetIDList.java | 64 +-
.../de/tudresden/ws/JunctionGetIDListResponse.java | 138 +-
.../de/tudresden/ws/JunctionGetPosition.java | 120 +-
.../tudresden/ws/JunctionGetPositionResponse.java | 124 +-
.../de/tudresden/ws/JunctionGetShape.java | 120 +-
.../de/tudresden/ws/JunctionGetShapeResponse.java | 124 +-
.../de/tudresden/ws/LaneGetAllowed.java | 120 +-
.../de/tudresden/ws/LaneGetAllowedResponse.java | 138 +-
.../de/tudresden/ws/LaneGetCO2Emission.java | 120 +-
.../tudresden/ws/LaneGetCO2EmissionResponse.java | 108 +-
.../de/tudresden/ws/LaneGetCOEmission.java | 120 +-
.../de/tudresden/ws/LaneGetCOEmissionResponse.java | 108 +-
.../de/tudresden/ws/LaneGetDisallowed.java | 120 +-
.../de/tudresden/ws/LaneGetDisallowedResponse.java | 138 +-
.../de/tudresden/ws/LaneGetEdgeID.java | 120 +-
.../de/tudresden/ws/LaneGetEdgeIDResponse.java | 124 +-
.../de/tudresden/ws/LaneGetFuelConsumption.java | 120 +-
.../ws/LaneGetFuelConsumptionResponse.java | 108 +-
.../de/tudresden/ws/LaneGetHCEmission.java | 120 +-
.../de/tudresden/ws/LaneGetHCEmissionResponse.java | 108 +-
.../de/tudresden/ws/LaneGetIDCount.java | 64 +-
.../de/tudresden/ws/LaneGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/LaneGetIDList.java | 64 +-
.../de/tudresden/ws/LaneGetIDListResponse.java | 138 +-
.../tudresden/ws/LaneGetLastStepHaltingNumber.java | 120 +-
.../ws/LaneGetLastStepHaltingNumberResponse.java | 108 +-
.../de/tudresden/ws/LaneGetLastStepLength.java | 120 +-
.../ws/LaneGetLastStepLengthResponse.java | 108 +-
.../de/tudresden/ws/LaneGetLastStepMeanSpeed.java | 120 +-
.../ws/LaneGetLastStepMeanSpeedResponse.java | 108 +-
.../de/tudresden/ws/LaneGetLastStepOccupancy.java | 120 +-
.../ws/LaneGetLastStepOccupancyResponse.java | 108 +-
.../de/tudresden/ws/LaneGetLastStepVehicleIDs.java | 120 +-
.../ws/LaneGetLastStepVehicleIDsResponse.java | 138 +-
.../tudresden/ws/LaneGetLastStepVehicleNumber.java | 120 +-
.../ws/LaneGetLastStepVehicleNumberResponse.java | 108 +-
.../de/tudresden/ws/LaneGetLength.java | 120 +-
.../de/tudresden/ws/LaneGetLengthResponse.java | 108 +-
.../de/tudresden/ws/LaneGetLinkNumber.java | 120 +-
.../de/tudresden/ws/LaneGetLinkNumberResponse.java | 108 +-
.../de/tudresden/ws/LaneGetLinks.java | 120 +-
.../de/tudresden/ws/LaneGetLinksResponse.java | 138 +-
.../de/tudresden/ws/LaneGetMaxSpeed.java | 120 +-
.../de/tudresden/ws/LaneGetMaxSpeedResponse.java | 108 +-
.../de/tudresden/ws/LaneGetNOxEmission.java | 120 +-
.../tudresden/ws/LaneGetNOxEmissionResponse.java | 108 +-
.../de/tudresden/ws/LaneGetNoiseEmission.java | 120 +-
.../tudresden/ws/LaneGetNoiseEmissionResponse.java | 108 +-
.../de/tudresden/ws/LaneGetPMxEmission.java | 120 +-
.../tudresden/ws/LaneGetPMxEmissionResponse.java | 108 +-
.../de/tudresden/ws/LaneGetShape.java | 120 +-
.../de/tudresden/ws/LaneGetShapeResponse.java | 124 +-
.../de/tudresden/ws/LaneGetTraveltime.java | 120 +-
.../de/tudresden/ws/LaneGetTraveltimeResponse.java | 108 +-
.../de/tudresden/ws/LaneGetWaitingTime.java | 120 +-
.../tudresden/ws/LaneGetWaitingTimeResponse.java | 108 +-
.../de/tudresden/ws/LaneGetWidth.java | 120 +-
.../de/tudresden/ws/LaneGetWidthResponse.java | 108 +-
.../de/tudresden/ws/LaneSetAllowed.java | 188 +-
.../de/tudresden/ws/LaneSetAllowedResponse.java | 64 +-
.../de/tudresden/ws/LaneSetDisallowed.java | 188 +-
.../de/tudresden/ws/LaneSetDisallowedResponse.java | 64 +-
.../de/tudresden/ws/LaneSetLength.java | 158 +-
.../de/tudresden/ws/LaneSetLengthResponse.java | 64 +-
.../de/tudresden/ws/LaneSetMaxSpeed.java | 158 +-
.../de/tudresden/ws/LaneSetMaxSpeedResponse.java | 64 +-
.../de/tudresden/ws/LastActionTime.java | 64 +-
.../de/tudresden/ws/LastActionTimeResponse.java | 124 +-
.../de/tudresden/ws/MultientryexitGetIDCount.java | 64 +-
.../ws/MultientryexitGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/MultientryexitGetIDList.java | 64 +-
.../ws/MultientryexitGetIDListResponse.java | 138 +-
.../ws/MultientryexitGetLastStepHaltingNumber.java | 120 +-
...ientryexitGetLastStepHaltingNumberResponse.java | 108 +-
.../ws/MultientryexitGetLastStepMeanSpeed.java | 120 +-
...MultientryexitGetLastStepMeanSpeedResponse.java | 108 +-
.../ws/MultientryexitGetLastStepVehicleIDs.java | 120 +-
...ultientryexitGetLastStepVehicleIDsResponse.java | 138 +-
.../ws/MultientryexitGetLastStepVehicleNumber.java | 120 +-
...ientryexitGetLastStepVehicleNumberResponse.java | 108 +-
.../de/tudresden/ws/ObjectFactory.java | 19750 +-
.../java_wsclient/de/tudresden/ws/PoiAdd.java | 342 +-
.../de/tudresden/ws/PoiAddResponse.java | 108 +-
.../java_wsclient/de/tudresden/ws/PoiGetColor.java | 120 +-
.../de/tudresden/ws/PoiGetColorResponse.java | 124 +-
.../de/tudresden/ws/PoiGetIDCount.java | 64 +-
.../de/tudresden/ws/PoiGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/PoiGetIDList.java | 64 +-
.../de/tudresden/ws/PoiGetIDListResponse.java | 138 +-
.../de/tudresden/ws/PoiGetPosition.java | 120 +-
.../de/tudresden/ws/PoiGetPositionResponse.java | 124 +-
.../java_wsclient/de/tudresden/ws/PoiGetType.java | 120 +-
.../de/tudresden/ws/PoiGetTypeResponse.java | 124 +-
.../java_wsclient/de/tudresden/ws/PoiRemove.java | 158 +-
.../de/tudresden/ws/PoiRemoveResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/PoiSetColor.java | 174 +-
.../de/tudresden/ws/PoiSetColorResponse.java | 64 +-
.../de/tudresden/ws/PoiSetPosition.java | 196 +-
.../de/tudresden/ws/PoiSetPositionResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/PoiSetType.java | 174 +-
.../de/tudresden/ws/PoiSetTypeResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/PolygonAdd.java | 358 +-
.../de/tudresden/ws/PolygonAddResponse.java | 64 +-
.../de/tudresden/ws/PolygonGetColor.java | 120 +-
.../de/tudresden/ws/PolygonGetColorResponse.java | 124 +-
.../de/tudresden/ws/PolygonGetIDCount.java | 64 +-
.../de/tudresden/ws/PolygonGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/PolygonGetIDList.java | 64 +-
.../de/tudresden/ws/PolygonGetIDListResponse.java | 138 +-
.../de/tudresden/ws/PolygonGetShape.java | 120 +-
.../de/tudresden/ws/PolygonGetShapeResponse.java | 124 +-
.../de/tudresden/ws/PolygonGetType.java | 120 +-
.../de/tudresden/ws/PolygonGetTypeResponse.java | 124 +-
.../de/tudresden/ws/PolygonRemove.java | 158 +-
.../de/tudresden/ws/PolygonRemoveResponse.java | 64 +-
.../de/tudresden/ws/PolygonSetColor.java | 174 +-
.../de/tudresden/ws/PolygonSetColorResponse.java | 64 +-
.../de/tudresden/ws/PolygonSetShape.java | 188 +-
.../de/tudresden/ws/PolygonSetShapeResponse.java | 64 +-
.../de/tudresden/ws/PolygonSetType.java | 174 +-
.../de/tudresden/ws/PolygonSetTypeResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/RouteAdd.java | 188 +-
.../de/tudresden/ws/RouteAddResponse.java | 64 +-
.../de/tudresden/ws/RouteGetEdges.java | 120 +-
.../de/tudresden/ws/RouteGetEdgesResponse.java | 138 +-
.../de/tudresden/ws/RouteGetIDCount.java | 64 +-
.../de/tudresden/ws/RouteGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/RouteGetIDList.java | 64 +-
.../de/tudresden/ws/RouteGetIDListResponse.java | 138 +-
.../java_wsclient/de/tudresden/ws/ServiceImpl.java | 8270 +-
.../java_wsclient/de/tudresden/ws/SetConfig.java | 120 +-
.../de/tudresden/ws/SetConfigResponse.java | 64 +-
.../de/tudresden/ws/SetSumoBinary.java | 120 +-
.../de/tudresden/ws/SetSumoBinaryResponse.java | 64 +-
.../de/tudresden/ws/SimulationConvert2D.java | 250 +-
.../tudresden/ws/SimulationConvert2DResponse.java | 138 +-
.../de/tudresden/ws/SimulationConvertGeo.java | 196 +-
.../tudresden/ws/SimulationConvertGeoResponse.java | 138 +-
.../de/tudresden/ws/SimulationConvertRoad.java | 196 +-
.../ws/SimulationConvertRoadResponse.java | 124 +-
.../tudresden/ws/SimulationGetArrivedIDList.java | 64 +-
.../ws/SimulationGetArrivedIDListResponse.java | 138 +-
.../tudresden/ws/SimulationGetArrivedNumber.java | 64 +-
.../ws/SimulationGetArrivedNumberResponse.java | 108 +-
.../tudresden/ws/SimulationGetBusStopWaiting.java | 64 +-
.../ws/SimulationGetBusStopWaitingResponse.java | 108 +-
.../de/tudresden/ws/SimulationGetCurrentTime.java | 64 +-
.../ws/SimulationGetCurrentTimeResponse.java | 108 +-
.../de/tudresden/ws/SimulationGetDeltaT.java | 64 +-
.../tudresden/ws/SimulationGetDeltaTResponse.java | 108 +-
.../tudresden/ws/SimulationGetDepartedIDList.java | 64 +-
.../ws/SimulationGetDepartedIDListResponse.java | 138 +-
.../tudresden/ws/SimulationGetDepartedNumber.java | 64 +-
.../ws/SimulationGetDepartedNumberResponse.java | 108 +-
.../de/tudresden/ws/SimulationGetDistance2D.java | 326 +-
.../ws/SimulationGetDistance2DResponse.java | 108 +-
.../de/tudresden/ws/SimulationGetDistanceRoad.java | 304 +-
.../ws/SimulationGetDistanceRoadResponse.java | 108 +-
.../ws/SimulationGetEndingTeleportIDList.java | 64 +-
.../SimulationGetEndingTeleportIDListResponse.java | 138 +-
.../ws/SimulationGetEndingTeleportNumber.java | 64 +-
.../SimulationGetEndingTeleportNumberResponse.java | 108 +-
.../de/tudresden/ws/SimulationGetLoadedIDList.java | 64 +-
.../ws/SimulationGetLoadedIDListResponse.java | 138 +-
.../de/tudresden/ws/SimulationGetLoadedNumber.java | 64 +-
.../ws/SimulationGetLoadedNumberResponse.java | 108 +-
.../ws/SimulationGetMinExpectedNumber.java | 64 +-
.../ws/SimulationGetMinExpectedNumberResponse.java | 108 +-
.../de/tudresden/ws/SimulationGetNetBoundary.java | 64 +-
.../ws/SimulationGetNetBoundaryResponse.java | 138 +-
.../SimulationGetParkingEndingVehiclesIDList.java | 64 +-
...tionGetParkingEndingVehiclesIDListResponse.java | 138 +-
.../SimulationGetParkingEndingVehiclesNumber.java | 64 +-
...tionGetParkingEndingVehiclesNumberResponse.java | 108 +-
...SimulationGetParkingStartingVehiclesIDList.java | 64 +-
...onGetParkingStartingVehiclesIDListResponse.java | 138 +-
...SimulationGetParkingStartingVehiclesNumber.java | 64 +-
...onGetParkingStartingVehiclesNumberResponse.java | 108 +-
.../ws/SimulationGetStartingTeleportIDList.java | 64 +-
...imulationGetStartingTeleportIDListResponse.java | 138 +-
.../ws/SimulationGetStartingTeleportNumber.java | 64 +-
...imulationGetStartingTeleportNumberResponse.java | 108 +-
.../ws/SimulationGetStopEndingVehiclesIDList.java | 64 +-
...ulationGetStopEndingVehiclesIDListResponse.java | 138 +-
.../ws/SimulationGetStopEndingVehiclesNumber.java | 64 +-
...ulationGetStopEndingVehiclesNumberResponse.java | 108 +-
.../SimulationGetStopStartingVehiclesIDList.java | 64 +-
...ationGetStopStartingVehiclesIDListResponse.java | 138 +-
.../SimulationGetStopStartingVehiclesNumber.java | 64 +-
...ationGetStopStartingVehiclesNumberResponse.java | 108 +-
.../java_wsclient/de/tudresden/ws/Start.java | 120 +-
.../de/tudresden/ws/StartResponse.java | 124 +-
.../java_wsclient/de/tudresden/ws/Stop.java | 120 +-
.../de/tudresden/ws/StopResponse.java | 124 +-
.../de/tudresden/ws/SumoBoundingBox.java | 228 +-
.../java_wsclient/de/tudresden/ws/SumoColor.java | 218 +-
.../de/tudresden/ws/SumoGeometry.java | 138 +-
.../de/tudresden/ws/SumoPosition2D.java | 142 +-
.../de/tudresden/ws/SumoTLSLogic.java | 306 +-
.../de/tudresden/ws/SumoTLSPhase.java | 234 +-
.../de/tudresden/ws/SumoWebservice.java | 188 +-
.../java_wsclient/de/tudresden/ws/TXTOutput.java | 104 +-
.../de/tudresden/ws/TXTOutputResponse.java | 124 +-
...clightsGetCompleteRedYellowGreenDefinition.java | 120 +-
...etCompleteRedYellowGreenDefinitionResponse.java | 124 +-
.../ws/TrafficlightsGetControlledLanes.java | 120 +-
.../TrafficlightsGetControlledLanesResponse.java | 138 +-
.../ws/TrafficlightsGetControlledLinks.java | 120 +-
.../TrafficlightsGetControlledLinksResponse.java | 138 +-
.../de/tudresden/ws/TrafficlightsGetIDCount.java | 64 +-
.../ws/TrafficlightsGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/TrafficlightsGetIDList.java | 64 +-
.../ws/TrafficlightsGetIDListResponse.java | 138 +-
.../tudresden/ws/TrafficlightsGetNextSwitch.java | 120 +-
.../ws/TrafficlightsGetNextSwitchResponse.java | 108 +-
.../de/tudresden/ws/TrafficlightsGetPhase.java | 120 +-
.../ws/TrafficlightsGetPhaseDuration.java | 120 +-
.../ws/TrafficlightsGetPhaseDurationResponse.java | 108 +-
.../ws/TrafficlightsGetPhaseResponse.java | 108 +-
.../de/tudresden/ws/TrafficlightsGetProgram.java | 120 +-
.../ws/TrafficlightsGetProgramResponse.java | 124 +-
.../ws/TrafficlightsGetRedYellowGreenState.java | 120 +-
...rafficlightsGetRedYellowGreenStateResponse.java | 124 +-
...clightsSetCompleteRedYellowGreenDefinition.java | 174 +-
...etCompleteRedYellowGreenDefinitionResponse.java | 64 +-
.../de/tudresden/ws/TrafficlightsSetPhase.java | 158 +-
.../ws/TrafficlightsSetPhaseDuration.java | 158 +-
.../ws/TrafficlightsSetPhaseDurationResponse.java | 64 +-
.../ws/TrafficlightsSetPhaseResponse.java | 64 +-
.../de/tudresden/ws/TrafficlightsSetProgram.java | 174 +-
.../ws/TrafficlightsSetProgramResponse.java | 64 +-
.../ws/TrafficlightsSetRedYellowGreenState.java | 174 +-
...rafficlightsSetRedYellowGreenStateResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/VehicleAdd.java | 380 +-
.../de/tudresden/ws/VehicleAddResponse.java | 64 +-
.../de/tudresden/ws/VehicleChangeLane.java | 196 +-
.../de/tudresden/ws/VehicleChangeLaneResponse.java | 64 +-
.../de/tudresden/ws/VehicleChangeTarget.java | 174 +-
.../tudresden/ws/VehicleChangeTargetResponse.java | 64 +-
.../de/tudresden/ws/VehicleGetAccel.java | 120 +-
.../de/tudresden/ws/VehicleGetAccelResponse.java | 108 +-
.../tudresden/ws/VehicleGetAdaptedTraveltime.java | 212 +-
.../ws/VehicleGetAdaptedTraveltimeResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetAllowedSpeed.java | 120 +-
.../ws/VehicleGetAllowedSpeedResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetAngle.java | 120 +-
.../de/tudresden/ws/VehicleGetAngleResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetBestLanes.java | 120 +-
.../tudresden/ws/VehicleGetBestLanesResponse.java | 138 +-
.../de/tudresden/ws/VehicleGetCO2Emission.java | 120 +-
.../ws/VehicleGetCO2EmissionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetCOEmission.java | 120 +-
.../tudresden/ws/VehicleGetCOEmissionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetColor.java | 120 +-
.../de/tudresden/ws/VehicleGetColorResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetDecel.java | 120 +-
.../de/tudresden/ws/VehicleGetDecelResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetDistance.java | 120 +-
.../tudresden/ws/VehicleGetDistanceResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetDrivingDistance.java | 250 +-
.../tudresden/ws/VehicleGetDrivingDistance2D.java | 196 +-
.../ws/VehicleGetDrivingDistance2DResponse.java | 108 +-
.../ws/VehicleGetDrivingDistanceResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetEffort.java | 212 +-
.../de/tudresden/ws/VehicleGetEffortResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetEmissionClass.java | 120 +-
.../ws/VehicleGetEmissionClassResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetFuelConsumption.java | 120 +-
.../ws/VehicleGetFuelConsumptionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetHCEmission.java | 120 +-
.../tudresden/ws/VehicleGetHCEmissionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetIDCount.java | 64 +-
.../de/tudresden/ws/VehicleGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetIDList.java | 64 +-
.../de/tudresden/ws/VehicleGetIDListResponse.java | 138 +-
.../de/tudresden/ws/VehicleGetImperfection.java | 120 +-
.../ws/VehicleGetImperfectionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetLaneID.java | 120 +-
.../de/tudresden/ws/VehicleGetLaneIDResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetLaneIndex.java | 120 +-
.../tudresden/ws/VehicleGetLaneIndexResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetLanePosition.java | 120 +-
.../ws/VehicleGetLanePositionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetLength.java | 120 +-
.../de/tudresden/ws/VehicleGetLengthResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetMaxSpeed.java | 120 +-
.../tudresden/ws/VehicleGetMaxSpeedResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetMinGap.java | 120 +-
.../de/tudresden/ws/VehicleGetMinGapResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetNOxEmission.java | 120 +-
.../ws/VehicleGetNOxEmissionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetNoiseEmission.java | 120 +-
.../ws/VehicleGetNoiseEmissionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetPMxEmission.java | 120 +-
.../ws/VehicleGetPMxEmissionResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetPersonNumber.java | 120 +-
.../ws/VehicleGetPersonNumberResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetPosition.java | 120 +-
.../tudresden/ws/VehicleGetPositionResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetRoadID.java | 120 +-
.../de/tudresden/ws/VehicleGetRoadIDResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetRoute.java | 120 +-
.../de/tudresden/ws/VehicleGetRouteID.java | 120 +-
.../de/tudresden/ws/VehicleGetRouteIDResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetRouteResponse.java | 138 +-
.../de/tudresden/ws/VehicleGetShapeClass.java | 120 +-
.../tudresden/ws/VehicleGetShapeClassResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetSignals.java | 120 +-
.../de/tudresden/ws/VehicleGetSignalsResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetSpeed.java | 120 +-
.../de/tudresden/ws/VehicleGetSpeedDeviation.java | 120 +-
.../ws/VehicleGetSpeedDeviationResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetSpeedFactor.java | 120 +-
.../ws/VehicleGetSpeedFactorResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetSpeedResponse.java | 108 +-
.../tudresden/ws/VehicleGetSpeedWithoutTraCI.java | 120 +-
.../ws/VehicleGetSpeedWithoutTraCIResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetTau.java | 120 +-
.../de/tudresden/ws/VehicleGetTauResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetTypeID.java | 120 +-
.../de/tudresden/ws/VehicleGetTypeIDResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetVehicleClass.java | 120 +-
.../ws/VehicleGetVehicleClassResponse.java | 124 +-
.../de/tudresden/ws/VehicleGetWaitingTime.java | 120 +-
.../ws/VehicleGetWaitingTimeResponse.java | 108 +-
.../de/tudresden/ws/VehicleGetWidth.java | 120 +-
.../de/tudresden/ws/VehicleGetWidthResponse.java | 108 +-
.../de/tudresden/ws/VehicleIsRouteValid.java | 120 +-
.../tudresden/ws/VehicleIsRouteValidResponse.java | 108 +-
.../de/tudresden/ws/VehicleMoveTo.java | 212 +-
.../de/tudresden/ws/VehicleMoveToResponse.java | 64 +-
.../de/tudresden/ws/VehicleMoveToVTD.java | 288 +-
.../de/tudresden/ws/VehicleMoveToVTDResponse.java | 64 +-
.../de/tudresden/ws/VehicleRemove.java | 158 +-
.../de/tudresden/ws/VehicleRemoveResponse.java | 64 +-
.../de/tudresden/ws/VehicleRerouteEffort.java | 120 +-
.../tudresden/ws/VehicleRerouteEffortResponse.java | 64 +-
.../de/tudresden/ws/VehicleRerouteTraveltime.java | 120 +-
.../ws/VehicleRerouteTraveltimeResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetAccel.java | 158 +-
.../de/tudresden/ws/VehicleSetAccelResponse.java | 64 +-
.../tudresden/ws/VehicleSetAdaptedTraveltime.java | 288 +-
.../ws/VehicleSetAdaptedTraveltimeResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetColor.java | 174 +-
.../de/tudresden/ws/VehicleSetColorResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetDecel.java | 158 +-
.../de/tudresden/ws/VehicleSetDecelResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetEffort.java | 288 +-
.../de/tudresden/ws/VehicleSetEffortResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetEmissionClass.java | 174 +-
.../ws/VehicleSetEmissionClassResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetImperfection.java | 158 +-
.../ws/VehicleSetImperfectionResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetLaneChangeMode.java | 158 +-
.../ws/VehicleSetLaneChangeModeResponse.java | 108 +-
.../de/tudresden/ws/VehicleSetLength.java | 158 +-
.../de/tudresden/ws/VehicleSetLengthResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetMaxSpeed.java | 158 +-
.../tudresden/ws/VehicleSetMaxSpeedResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetMinGap.java | 158 +-
.../de/tudresden/ws/VehicleSetMinGapResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetRoute.java | 188 +-
.../de/tudresden/ws/VehicleSetRouteID.java | 174 +-
.../de/tudresden/ws/VehicleSetRouteIDResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetRouteResponse.java | 108 +-
.../de/tudresden/ws/VehicleSetShapeClass.java | 174 +-
.../tudresden/ws/VehicleSetShapeClassResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetSignals.java | 174 +-
.../de/tudresden/ws/VehicleSetSignalsResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetSpeed.java | 158 +-
.../de/tudresden/ws/VehicleSetSpeedDeviation.java | 158 +-
.../ws/VehicleSetSpeedDeviationResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetSpeedFactor.java | 158 +-
.../ws/VehicleSetSpeedFactorResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetSpeedResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetStop.java | 288 +-
.../de/tudresden/ws/VehicleSetStopResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetTau.java | 158 +-
.../de/tudresden/ws/VehicleSetTauResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetType.java | 174 +-
.../de/tudresden/ws/VehicleSetTypeResponse.java | 108 +-
.../de/tudresden/ws/VehicleSetVehicleClass.java | 174 +-
.../ws/VehicleSetVehicleClassResponse.java | 64 +-
.../de/tudresden/ws/VehicleSetWidth.java | 158 +-
.../de/tudresden/ws/VehicleSetWidthResponse.java | 64 +-
.../de/tudresden/ws/VehicleSlowDown.java | 196 +-
.../de/tudresden/ws/VehicleSlowDownResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetAccel.java | 120 +-
.../tudresden/ws/VehicletypeGetAccelResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetColor.java | 120 +-
.../tudresden/ws/VehicletypeGetColorResponse.java | 124 +-
.../de/tudresden/ws/VehicletypeGetDecel.java | 120 +-
.../tudresden/ws/VehicletypeGetDecelResponse.java | 108 +-
.../tudresden/ws/VehicletypeGetEmissionClass.java | 120 +-
.../ws/VehicletypeGetEmissionClassResponse.java | 124 +-
.../de/tudresden/ws/VehicletypeGetIDCount.java | 64 +-
.../ws/VehicletypeGetIDCountResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetIDList.java | 64 +-
.../tudresden/ws/VehicletypeGetIDListResponse.java | 138 +-
.../tudresden/ws/VehicletypeGetImperfection.java | 120 +-
.../ws/VehicletypeGetImperfectionResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetLength.java | 120 +-
.../tudresden/ws/VehicletypeGetLengthResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetMaxSpeed.java | 120 +-
.../ws/VehicletypeGetMaxSpeedResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetMinGap.java | 120 +-
.../tudresden/ws/VehicletypeGetMinGapResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetShapeClass.java | 120 +-
.../ws/VehicletypeGetShapeClassResponse.java | 124 +-
.../tudresden/ws/VehicletypeGetSpeedDeviation.java | 120 +-
.../ws/VehicletypeGetSpeedDeviationResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetSpeedFactor.java | 120 +-
.../ws/VehicletypeGetSpeedFactorResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeGetTau.java | 120 +-
.../de/tudresden/ws/VehicletypeGetTauResponse.java | 108 +-
.../tudresden/ws/VehicletypeGetVehicleClass.java | 120 +-
.../ws/VehicletypeGetVehicleClassResponse.java | 124 +-
.../de/tudresden/ws/VehicletypeGetWidth.java | 120 +-
.../tudresden/ws/VehicletypeGetWidthResponse.java | 108 +-
.../de/tudresden/ws/VehicletypeSetAccel.java | 158 +-
.../tudresden/ws/VehicletypeSetAccelResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetColor.java | 174 +-
.../tudresden/ws/VehicletypeSetColorResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetDecel.java | 158 +-
.../tudresden/ws/VehicletypeSetDecelResponse.java | 64 +-
.../tudresden/ws/VehicletypeSetEmissionClass.java | 174 +-
.../ws/VehicletypeSetEmissionClassResponse.java | 64 +-
.../tudresden/ws/VehicletypeSetImperfection.java | 158 +-
.../ws/VehicletypeSetImperfectionResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetLength.java | 158 +-
.../tudresden/ws/VehicletypeSetLengthResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetMaxSpeed.java | 158 +-
.../ws/VehicletypeSetMaxSpeedResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetMinGap.java | 158 +-
.../tudresden/ws/VehicletypeSetMinGapResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetShapeClass.java | 174 +-
.../ws/VehicletypeSetShapeClassResponse.java | 64 +-
.../tudresden/ws/VehicletypeSetSpeedDeviation.java | 158 +-
.../ws/VehicletypeSetSpeedDeviationResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetSpeedFactor.java | 158 +-
.../ws/VehicletypeSetSpeedFactorResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetTau.java | 158 +-
.../de/tudresden/ws/VehicletypeSetTauResponse.java | 64 +-
.../tudresden/ws/VehicletypeSetVehicleClass.java | 174 +-
.../ws/VehicletypeSetVehicleClassResponse.java | 64 +-
.../de/tudresden/ws/VehicletypeSetWidth.java | 158 +-
.../tudresden/ws/VehicletypeSetWidthResponse.java | 64 +-
.../java_wsclient/de/tudresden/ws/Version.java | 64 +-
.../de/tudresden/ws/VersionResponse.java | 120 +-
.../de/tudresden/ws/package-info.java | 4 +-
tools/contributed/traas/examples/run.bat | 4 +-
.../traas/examples/simulation/config.sumo.cfg | 24 +-
.../traas/examples/simulation/network.net.xml | 28 +-
.../contributed/traas/examples/simulation/poi.xml | 410 +-
.../traas/examples/simulation/routes.xml | 8 +-
.../traas/examples/simulation/settings.xml | 344 +-
.../traas/examples/simulation/vehicles.xml | 8 +-
tools/contributed/traas/license.txt | 1346 +-
.../traas/src/de/tudresden/sumo/cmd/Edge.java | 12 +
.../traas/src/de/tudresden/sumo/cmd/Person.java | 13 +
.../src/de/tudresden/sumo/cmd/Simulation.java | 27 +-
.../traas/src/de/tudresden/sumo/cmd/Vehicle.java | 111 +-
.../src/de/tudresden/sumo/config/Constants.java | 34 +-
.../de/tudresden/sumo/util/CommandProcessor.java | 619 +-
.../src/de/tudresden/sumo/util/ConvertHelper.java | 508 +-
.../traas/src/de/tudresden/sumo/util/Query.java | 290 +-
.../src/de/tudresden/sumo/util/StringList.java | 586 +-
.../traas/src/de/tudresden/sumo/util/Sumo.java | 322 +-
.../src/de/tudresden/sumo/util/SumoCommand.java | 941 +-
.../traas/src/de/tudresden/ws/Service.java | 98 +-
.../traas/src/de/tudresden/ws/Service_Impl.java | 298 +-
.../traas/src/de/tudresden/ws/ShutdownHook.java | 112 +-
.../traas/src/de/tudresden/ws/Traci.java | 9 +-
.../traas/src/de/tudresden/ws/WebService.java | 136 +-
.../traas/src/de/tudresden/ws/conf/Config.java | 260 +-
.../de/tudresden/ws/container/SumoBoundingBox.java | 114 +-
.../src/de/tudresden/ws/container/SumoColor.java | 106 +-
.../de/tudresden/ws/container/SumoGeometry.java | 130 +-
.../src/de/tudresden/ws/container/SumoLink.java | 160 +-
.../de/tudresden/ws/container/SumoLinkList.java | 336 +-
.../de/tudresden/ws/container/SumoPosition2D.java | 92 +-
.../de/tudresden/ws/container/SumoPosition3D.java | 98 +-
.../de/tudresden/ws/container/SumoStopFlags.java | 69 +
.../de/tudresden/ws/container/SumoStringList.java | 322 +-
.../de/tudresden/ws/container/SumoTLSLogic.java | 144 +-
.../de/tudresden/ws/container/SumoTLSPhase.java | 130 +-
.../tudresden/ws/container/SumoVehicleSignal.java | 132 +-
.../ws/container/SumoVehicleSignalState.java | 102 +-
.../traas/src/de/tudresden/ws/log/Log.java | 96 +-
.../traas/src/de/tudresden/ws/log/Log_txt.java | 146 +-
.../src/it/polito/appeal/traci/CloseQuery.java | 30 +-
.../polito/appeal/traci/SumoTraciConnection.java | 180 +-
.../src/it/polito/appeal/traci/TraCIException.java | 68 +-
.../it/polito/appeal/traci/protocol/Command.java | 254 +-
.../appeal/traci/protocol/RequestMessage.java | 220 +-
.../appeal/traci/protocol/ResponseContainer.java | 180 +-
.../appeal/traci/protocol/ResponseMessage.java | 260 +-
.../appeal/traci/protocol/StatusResponse.java | 154 +-
tools/contributed/traci4j/.gitignore | 1 -
.../traci4j/.settings/org.eclipse.jdt.ui.prefs | 8 +-
.../org.eclipse.ltk.core.refactoring.prefs | 6 +-
tools/contributed/traci4j/pom.xml | 55 +-
.../polito/appeal/traci/SumoTraciConnection.java | 21 +-
.../it/polito/appeal/traci/protocol/Constants.java | 1318 +-
tools/contributed/traci4j/src/xml/queries.xml | 194 +-
.../traci4j/src/xml/traciObjects/Edge.xml | 224 +-
.../traciObjects/ExampleTraciObject.xml.template | 182 +-
.../traci4j/src/xml/traciObjects/InductionLoop.xml | 156 +-
.../traci4j/src/xml/traciObjects/Lane.xml | 326 +-
.../traci4j/src/xml/traciObjects/MeMeDetector.xml | 122 +-
.../traci4j/src/xml/traciObjects/POI.xml | 164 +-
.../traci4j/src/xml/traciObjects/Route.xml | 80 +-
.../traci4j/src/xml/traciObjects/Vehicle.xml | 466 +-
.../traci4j/src/xml/traciObjects/VehicleType.xml | 206 +-
.../contributed/traci4j/src/xslt/traciObject.xslt | 470 +-
.../polito/appeal/traci/test/HttpDownloadTest.java | 86 +-
.../appeal/traci/test/PositionConvertionTest.java | 222 +-
.../polito/appeal/traci/test/RemoteTraCITest.java | 233 +-
.../polito/appeal/traci/test/TraCIServerTest.java | 474 +-
.../it/polito/appeal/traci/test/TraCITest.java | 2180 +-
.../appeal/traci/test/TrafficLightsTest.java | 838 +-
.../it/polito/appeal/traci/test/UtilsTest.java | 132 +-
.../appeal/traci/test/protocol/CommandTest.java | 194 +-
.../appeal/traci/test/protocol/MessageTest.java | 172 +-
.../+traci/+areal/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+areal/getIDCount.m | 18 +-
.../traci4matlab/+traci/+areal/getIDList.m | 22 +-
.../+traci/+areal/getJamLengthMeters.m | 24 +-
.../+traci/+areal/getJamLengthVehicle.m | 24 +-
.../+traci/+areal/getLastStepMeanSpeed.m | 22 +-
.../+traci/+areal/getLastStepOccupancy.m | 22 +-
.../+traci/+areal/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+areal/getUniversal.m | 48 +-
.../traci4matlab/+traci/+areal/subscribe.m | 84 +-
.../traci4matlab/+traci/+areal/subscribeContext.m | 100 +-
.../traci4matlab/+traci/+edge/adaptTraveltime.m | 32 +-
.../+traci/+edge/getAdaptedTraveltime.m | 36 +-
.../traci4matlab/+traci/+edge/getCO2Emission.m | 22 +-
.../traci4matlab/+traci/+edge/getCOEmission.m | 22 +-
.../+traci/+edge/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+edge/getEffort.m | 36 +-
.../traci4matlab/+traci/+edge/getFuelConsumption.m | 22 +-
.../traci4matlab/+traci/+edge/getHCEmission.m | 22 +-
.../traci4matlab/+traci/+edge/getIDCount.m | 18 +-
.../traci4matlab/+traci/+edge/getIDList.m | 22 +-
.../+traci/+edge/getLastStepHaltingNumber.m | 24 +-
.../traci4matlab/+traci/+edge/getLastStepLength.m | 22 +-
.../+traci/+edge/getLastStepMeanSpeed.m | 22 +-
.../+traci/+edge/getLastStepOccupancy.m | 22 +-
.../+traci/+edge/getLastStepPersonIDs.m | 22 +-
.../+traci/+edge/getLastStepVehicleIDs.m | 24 +-
.../+traci/+edge/getLastStepVehicleNumber.m | 24 +-
.../traci4matlab/+traci/+edge/getNOxEmission.m | 22 +-
.../traci4matlab/+traci/+edge/getNoiseEmission.m | 22 +-
.../traci4matlab/+traci/+edge/getPmxEmission.m | 22 +-
.../+traci/+edge/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+edge/getTraveltime.m | 22 +-
.../traci4matlab/+traci/+edge/getUniversal.m | 48 +-
.../traci4matlab/+traci/+edge/setEffort.m | 32 +-
.../traci4matlab/+traci/+edge/setMaxSpeed.m | 22 +-
.../traci4matlab/+traci/+edge/subscribe.m | 84 +-
.../traci4matlab/+traci/+edge/subscribeContext.m | 100 +-
.../traci4matlab/+traci/+gui/getBoundary.m | 30 +-
.../+traci/+gui/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+gui/getIDList.m | 22 +-
.../traci4matlab/+traci/+gui/getOffset.m | 30 +-
.../traci4matlab/+traci/+gui/getSchema.m | 30 +-
.../+traci/+gui/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+gui/getUniversal.m | 48 +-
.../contributed/traci4matlab/+traci/+gui/getZoom.m | 30 +-
.../traci4matlab/+traci/+gui/screenshot.m | 26 +-
.../traci4matlab/+traci/+gui/setBoundary.m | 30 +-
.../traci4matlab/+traci/+gui/setOffset.m | 28 +-
.../traci4matlab/+traci/+gui/setSchema.m | 22 +-
.../contributed/traci4matlab/+traci/+gui/setZoom.m | 20 +-
.../traci4matlab/+traci/+gui/subscribe.m | 72 +-
.../traci4matlab/+traci/+gui/subscribeContext.m | 90 +-
.../traci4matlab/+traci/+gui/trackVehicle.m | 22 +-
.../+inductionloop/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+inductionloop/getIDList.m | 24 +-
.../traci4matlab/+traci/+inductionloop/getLaneID.m | 20 +-
.../+traci/+inductionloop/getLastStepMeanLength.m | 22 +-
.../+traci/+inductionloop/getLastStepMeanSpeed.m | 24 +-
.../+traci/+inductionloop/getLastStepOccupancy.m | 22 +-
.../+traci/+inductionloop/getLastStepVehicleIDs.m | 24 +-
.../+inductionloop/getLastStepVehicleNumber.m | 24 +-
.../+traci/+inductionloop/getPosition.m | 22 +-
.../+traci/+inductionloop/getSubscriptionResults.m | 50 +-
.../+traci/+inductionloop/getTimeSinceDetection.m | 22 +-
.../+traci/+inductionloop/getUniversal.m | 48 +-
.../+traci/+inductionloop/getVehicleData.m | 22 +-
.../+traci/+inductionloop/readVehicleData.m | 46 +-
.../traci4matlab/+traci/+inductionloop/subscribe.m | 74 +-
.../+traci/+inductionloop/subscribeContext.m | 90 +-
.../+junction/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+junction/getIDList.m | 22 +-
.../traci4matlab/+traci/+junction/getPosition.m | 22 +-
.../+traci/+junction/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+junction/getUniversal.m | 48 +-
.../traci4matlab/+traci/+junction/subscribe.m | 74 +-
.../+traci/+junction/subscribeContext.m | 90 +-
.../traci4matlab/+traci/+lane/getAllowed.m | 24 +-
.../traci4matlab/+traci/+lane/getCO2Emission.m | 22 +-
.../traci4matlab/+traci/+lane/getCOEmission.m | 22 +-
.../+traci/+lane/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+lane/getDisallowed.m | 22 +-
.../traci4matlab/+traci/+lane/getEdgeID.m | 22 +-
.../traci4matlab/+traci/+lane/getFuelConsumption.m | 22 +-
.../traci4matlab/+traci/+lane/getHCEmission.m | 22 +-
.../traci4matlab/+traci/+lane/getIDList.m | 22 +-
.../+traci/+lane/getLastStepHaltingNumber.m | 24 +-
.../traci4matlab/+traci/+lane/getLastStepLength.m | 22 +-
.../+traci/+lane/getLastStepMeanSpeed.m | 22 +-
.../+traci/+lane/getLastStepOccupancy.m | 22 +-
.../+traci/+lane/getLastStepVehicleIDs.m | 24 +-
.../+traci/+lane/getLastStepVehicleNumber.m | 24 +-
.../traci4matlab/+traci/+lane/getLength.m | 20 +-
.../traci4matlab/+traci/+lane/getLinkNumber.m | 22 +-
.../traci4matlab/+traci/+lane/getLinks.m | 24 +-
.../traci4matlab/+traci/+lane/getMaxSpeed.m | 22 +-
.../traci4matlab/+traci/+lane/getNOxEmission.m | 22 +-
.../traci4matlab/+traci/+lane/getNoiseEmission.m | 22 +-
.../traci4matlab/+traci/+lane/getPMxEmission.m | 22 +-
.../traci4matlab/+traci/+lane/getShape.m | 22 +-
.../+traci/+lane/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+lane/getTraveltime.m | 22 +-
.../traci4matlab/+traci/+lane/getUniversal.m | 48 +-
.../traci4matlab/+traci/+lane/getWidth.m | 20 +-
.../traci4matlab/+traci/+lane/readLinks.m | 58 +-
.../traci4matlab/+traci/+lane/setAllowed.m | 42 +-
.../traci4matlab/+traci/+lane/setDisallowed.m | 40 +-
.../traci4matlab/+traci/+lane/setLength.m | 20 +-
.../traci4matlab/+traci/+lane/setMaxSpeed.m | 22 +-
.../traci4matlab/+traci/+lane/subscribe.m | 74 +-
.../traci4matlab/+traci/+lane/subscribeContext.m | 92 +-
.../getContextSubscriptionResults.m | 52 +-
.../+traci/+multientryexit/getIDList.m | 22 +-
.../+multientryexit/getLastStepHaltingNumber.m | 26 +-
.../+traci/+multientryexit/getLastStepMeanSpeed.m | 24 +-
.../+traci/+multientryexit/getLastStepVehicleIDs.m | 24 +-
.../+multientryexit/getLastStepVehicleNumber.m | 24 +-
.../+multientryexit/getSubscriptionResults.m | 52 +-
.../+traci/+multientryexit/getUniversal.m | 48 +-
.../+traci/+multientryexit/subscribe.m | 76 +-
.../+traci/+multientryexit/subscribeContext.m | 94 +-
.../traci4matlab/+traci/+person/getAngle.m | 22 +-
.../traci4matlab/+traci/+person/getColor.m | 20 +-
.../+traci/+person/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+person/getIDCount.m | 18 +-
.../traci4matlab/+traci/+person/getIDList.m | 22 +-
.../traci4matlab/+traci/+person/getLanePosition.m | 22 +-
.../traci4matlab/+traci/+person/getLength.m | 20 +-
.../traci4matlab/+traci/+person/getMinGap.m | 22 +-
.../traci4matlab/+traci/+person/getNextEdge.m | 24 +-
.../traci4matlab/+traci/+person/getPosition.m | 22 +-
.../traci4matlab/+traci/+person/getPosition3D.m | 22 +-
.../traci4matlab/+traci/+person/getRoadID.m | 22 +-
.../traci4matlab/+traci/+person/getSpeed.m | 22 +-
.../+traci/+person/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+person/getTypeID.m | 22 +-
.../traci4matlab/+traci/+person/getUniversal.m | 48 +-
.../traci4matlab/+traci/+person/getWaitingTime.m | 26 +-
.../traci4matlab/+traci/+person/getWidth.m | 20 +-
.../traci4matlab/+traci/+person/subscribe.m | 74 +-
.../traci4matlab/+traci/+person/subscribeContext.m | 90 +-
tools/contributed/traci4matlab/+traci/+poi/add.m | 70 +-
.../traci4matlab/+traci/+poi/getColor.m | 20 +-
.../+traci/+poi/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+poi/getIDList.m | 22 +-
.../traci4matlab/+traci/+poi/getPosition.m | 22 +-
.../+traci/+poi/getSubscriptionResults.m | 50 +-
.../contributed/traci4matlab/+traci/+poi/getType.m | 20 +-
.../traci4matlab/+traci/+poi/getUniversal.m | 48 +-
.../contributed/traci4matlab/+traci/+poi/remove.m | 34 +-
.../traci4matlab/+traci/+poi/setColor.m | 30 +-
.../traci4matlab/+traci/+poi/setPosition.m | 26 +-
.../contributed/traci4matlab/+traci/+poi/setType.m | 28 +-
.../traci4matlab/+traci/+poi/subscribe.m | 74 +-
.../traci4matlab/+traci/+poi/subscribeContext.m | 90 +-
.../contributed/traci4matlab/+traci/+polygon/add.m | 98 +-
.../traci4matlab/+traci/+polygon/getColor.m | 20 +-
.../+polygon/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+polygon/getIDList.m | 22 +-
.../traci4matlab/+traci/+polygon/getShape.m | 26 +-
.../+traci/+polygon/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+polygon/getType.m | 20 +-
.../traci4matlab/+traci/+polygon/getUniversal.m | 48 +-
.../traci4matlab/+traci/+polygon/remove.m | 34 +-
.../traci4matlab/+traci/+polygon/setColor.m | 30 +-
.../traci4matlab/+traci/+polygon/setShape.m | 38 +-
.../traci4matlab/+traci/+polygon/setType.m | 28 +-
.../traci4matlab/+traci/+polygon/subscribe.m | 74 +-
.../+traci/+polygon/subscribeContext.m | 90 +-
tools/contributed/traci4matlab/+traci/+route/add.m | 42 +-
.../+traci/+route/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+route/getEdges.m | 24 +-
.../traci4matlab/+traci/+route/getIDList.m | 22 +-
.../+traci/+route/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+route/getUniversal.m | 48 +-
.../traci4matlab/+traci/+route/subscribe.m | 74 +-
.../traci4matlab/+traci/+route/subscribeContext.m | 88 +-
.../traci4matlab/+traci/+simulation/convert2D.m | 74 +-
.../traci4matlab/+traci/+simulation/convertGeo.m | 74 +-
.../traci4matlab/+traci/+simulation/convertRoad.m | 74 +-
.../+traci/+simulation/getArrivedIDList.m | 24 +-
.../+traci/+simulation/getArrivedNumber.m | 24 +-
.../+traci/+simulation/getCurrentTime.m | 22 +-
.../traci4matlab/+traci/+simulation/getDeltaT.m | 20 +-
.../+traci/+simulation/getDepartedIDList.m | 24 +-
.../+traci/+simulation/getDepartedNumber.m | 22 +-
.../+traci/+simulation/getDistance2D.m | 90 +-
.../+traci/+simulation/getDistanceRoad.m | 70 +-
.../+traci/+simulation/getEndingTeleportIDList.m | 24 +-
.../+traci/+simulation/getEndingTeleportNumber.m | 22 +-
.../+traci/+simulation/getLoadedIDList.m | 22 +-
.../+traci/+simulation/getLoadedNumber.m | 22 +-
.../+traci/+simulation/getMinExpectedNumber.m | 32 +-
.../+traci/+simulation/getNetBoundary.m | 24 +-
.../+traci/+simulation/getStartingTeleportIDList.m | 24 +-
.../+traci/+simulation/getStartingTeleportNumber.m | 22 +-
.../+traci/+simulation/getSubscriptionResults.m | 36 +-
.../traci4matlab/+traci/+simulation/getUniversal.m | 48 +-
.../traci4matlab/+traci/+simulation/subscribe.m | 70 +-
.../traci4matlab/+traci/+trafficlights/Logic.m | 84 +-
.../traci4matlab/+traci/+trafficlights/Phase.m | 74 +-
.../getCompleteRedYellowGreenDefinition.m | 26 +-
.../+trafficlights/getContextSubscriptionResults.m | 50 +-
.../+traci/+trafficlights/getControlledLanes.m | 24 +-
.../+traci/+trafficlights/getControlledLinks.m | 26 +-
.../traci4matlab/+traci/+trafficlights/getIDList.m | 22 +-
.../+traci/+trafficlights/getNextSwitch.m | 24 +-
.../traci4matlab/+traci/+trafficlights/getPhase.m | 22 +-
.../+traci/+trafficlights/getProgram.m | 20 +-
.../+traci/+trafficlights/getRedYellowGreenState.m | 26 +-
.../+traci/+trafficlights/getSubscriptionResults.m | 52 +-
.../+traci/+trafficlights/getUniversal.m | 48 +-
.../traci4matlab/+traci/+trafficlights/readLinks.m | 42 +-
.../+traci/+trafficlights/readLogics.m | 74 +-
.../setCompleteRedYellowGreenDefinition.m | 86 +-
.../traci4matlab/+traci/+trafficlights/setPhase.m | 26 +-
.../+traci/+trafficlights/setPhaseDuration.m | 26 +-
.../+traci/+trafficlights/setProgram.m | 22 +-
.../+traci/+trafficlights/setRedYellowGreenState.m | 26 +-
.../traci4matlab/+traci/+trafficlights/subscribe.m | 74 +-
.../+traci/+trafficlights/subscribeContext.m | 90 +-
.../contributed/traci4matlab/+traci/+vehicle/add.m | 112 +-
.../traci4matlab/+traci/+vehicle/changeLane.m | 38 +-
.../traci4matlab/+traci/+vehicle/changeTarget.m | 22 +-
.../traci4matlab/+traci/+vehicle/getAccel.m | 22 +-
.../+traci/+vehicle/getAdaptedTraveltime.m | 40 +-
.../traci4matlab/+traci/+vehicle/getAngle.m | 22 +-
.../traci4matlab/+traci/+vehicle/getBestLanes.m | 26 +-
.../traci4matlab/+traci/+vehicle/getCO2Emission.m | 22 +-
.../traci4matlab/+traci/+vehicle/getCOEmission.m | 22 +-
.../traci4matlab/+traci/+vehicle/getColor.m | 20 +-
.../+vehicle/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+vehicle/getDecel.m | 22 +-
.../+traci/+vehicle/getDrivingDistance.m | 46 +-
.../+traci/+vehicle/getDrivingDistance2D.m | 36 +-
.../traci4matlab/+traci/+vehicle/getEffort.m | 40 +-
.../+traci/+vehicle/getEmissionClass.m | 22 +-
.../+traci/+vehicle/getFuelConsumption.m | 22 +-
.../traci4matlab/+traci/+vehicle/getHCEmission.m | 22 +-
.../traci4matlab/+traci/+vehicle/getIDList.m | 22 +-
.../traci4matlab/+traci/+vehicle/getImperfection.m | 22 +-
.../traci4matlab/+traci/+vehicle/getLaneID.m | 28 +-
.../traci4matlab/+traci/+vehicle/getLaneIndex.m | 22 +-
.../traci4matlab/+traci/+vehicle/getLanePosition.m | 22 +-
.../traci4matlab/+traci/+vehicle/getLeader.m | 55 +-
.../traci4matlab/+traci/+vehicle/getLength.m | 20 +-
.../traci4matlab/+traci/+vehicle/getMaxSpeed.m | 22 +-
.../traci4matlab/+traci/+vehicle/getMinGap.m | 22 +-
.../traci4matlab/+traci/+vehicle/getNOxEmission.m | 22 +-
.../+traci/+vehicle/getNoiseEmission.m | 22 +-
.../traci4matlab/+traci/+vehicle/getPMxEmission.m | 22 +-
.../traci4matlab/+traci/+vehicle/getPosition.m | 22 +-
.../traci4matlab/+traci/+vehicle/getRoadID.m | 22 +-
.../traci4matlab/+traci/+vehicle/getRoute.m | 22 +-
.../traci4matlab/+traci/+vehicle/getRouteID.m | 22 +-
.../traci4matlab/+traci/+vehicle/getShapeClass.m | 22 +-
.../traci4matlab/+traci/+vehicle/getSignals.m | 58 +-
.../traci4matlab/+traci/+vehicle/getSpeed.m | 22 +-
.../+traci/+vehicle/getSpeedDeviation.m | 22 +-
.../traci4matlab/+traci/+vehicle/getSpeedFactor.m | 22 +-
.../+traci/+vehicle/getSpeedWithoutTraCI.m | 14 +-
.../+traci/+vehicle/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+vehicle/getTau.m | 22 +-
.../traci4matlab/+traci/+vehicle/getTypeID.m | 22 +-
.../traci4matlab/+traci/+vehicle/getUniversal.m | 48 +-
.../traci4matlab/+traci/+vehicle/getVehicleClass.m | 22 +-
.../traci4matlab/+traci/+vehicle/getWidth.m | 20 +-
.../traci4matlab/+traci/+vehicle/isRouteValid.m | 22 +-
.../traci4matlab/+traci/+vehicle/moveTo.m | 40 +-
.../traci4matlab/+traci/+vehicle/moveToVTD.m | 48 +-
.../traci4matlab/+traci/+vehicle/readBestLanes.m | 60 +-
.../traci4matlab/+traci/+vehicle/readLeader.m | 10 +
.../traci4matlab/+traci/+vehicle/remove.m | 32 +-
.../traci4matlab/+traci/+vehicle/rerouteEffort.m | 36 +-
.../+traci/+vehicle/rerouteTraveltime.m | 36 +-
.../traci4matlab/+traci/+vehicle/setAccel.m | 22 +-
.../+traci/+vehicle/setAdaptedTraveltime.m | 46 +-
.../traci4matlab/+traci/+vehicle/setColor.m | 30 +-
.../traci4matlab/+traci/+vehicle/setDecel.m | 24 +-
.../traci4matlab/+traci/+vehicle/setEffort.m | 46 +-
.../+traci/+vehicle/setEmissionClass.m | 20 +-
.../traci4matlab/+traci/+vehicle/setImperfection.m | 24 +-
.../+traci/+vehicle/setLaneChangeMode.m | 36 +-
.../traci4matlab/+traci/+vehicle/setLength.m | 20 +-
.../traci4matlab/+traci/+vehicle/setMaxSpeed.m | 20 +-
.../traci4matlab/+traci/+vehicle/setMinGap.m | 22 +-
.../traci4matlab/+traci/+vehicle/setRoute.m | 54 +-
.../traci4matlab/+traci/+vehicle/setRouteID.m | 22 +-
.../traci4matlab/+traci/+vehicle/setShapeClass.m | 20 +-
.../traci4matlab/+traci/+vehicle/setSignals.m | 56 +-
.../traci4matlab/+traci/+vehicle/setSpeed.m | 22 +-
.../+traci/+vehicle/setSpeedDeviation.m | 22 +-
.../traci4matlab/+traci/+vehicle/setSpeedFactor.m | 22 +-
.../traci4matlab/+traci/+vehicle/setSpeedMode.m | 38 +-
.../traci4matlab/+traci/+vehicle/setStop.m | 74 +-
.../traci4matlab/+traci/+vehicle/setTau.m | 20 +-
.../traci4matlab/+traci/+vehicle/setVehicleClass.m | 22 +-
.../traci4matlab/+traci/+vehicle/setWidth.m | 20 +-
.../traci4matlab/+traci/+vehicle/slowDown.m | 36 +-
.../traci4matlab/+traci/+vehicle/subscribe.m | 74 +-
.../+traci/+vehicle/subscribeContext.m | 90 +-
.../traci4matlab/+traci/+vehicletype/getAccel.m | 22 +-
.../traci4matlab/+traci/+vehicletype/getColor.m | 20 +-
.../+vehicletype/getContextSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+vehicletype/getDecel.m | 22 +-
.../+traci/+vehicletype/getEmissionClass.m | 22 +-
.../traci4matlab/+traci/+vehicletype/getIDList.m | 22 +-
.../+traci/+vehicletype/getImperfection.m | 22 +-
.../traci4matlab/+traci/+vehicletype/getLength.m | 22 +-
.../traci4matlab/+traci/+vehicletype/getMaxSpeed.m | 22 +-
.../traci4matlab/+traci/+vehicletype/getMinGap.m | 22 +-
.../+traci/+vehicletype/getShapeClass.m | 22 +-
.../+traci/+vehicletype/getSpeedDeviation.m | 22 +-
.../+traci/+vehicletype/getSpeedFactor.m | 22 +-
.../+traci/+vehicletype/getSubscriptionResults.m | 50 +-
.../traci4matlab/+traci/+vehicletype/getTau.m | 22 +-
.../+traci/+vehicletype/getUniversal.m | 48 +-
.../+traci/+vehicletype/getVehicleClass.m | 22 +-
.../traci4matlab/+traci/+vehicletype/getWidth.m | 22 +-
.../traci4matlab/+traci/+vehicletype/setAccel.m | 22 +-
.../traci4matlab/+traci/+vehicletype/setColor.m | 30 +-
.../traci4matlab/+traci/+vehicletype/setDecel.m | 22 +-
.../+traci/+vehicletype/setEmissionClass.m | 22 +-
.../+traci/+vehicletype/setImperfection.m | 24 +-
.../traci4matlab/+traci/+vehicletype/setLength.m | 22 +-
.../traci4matlab/+traci/+vehicletype/setMaxSpeed.m | 22 +-
.../traci4matlab/+traci/+vehicletype/setMinGap.m | 22 +-
.../+traci/+vehicletype/setShapeClass.m | 22 +-
.../+traci/+vehicletype/setSpeedDeviation.m | 22 +-
.../+traci/+vehicletype/setSpeedFactor.m | 22 +-
.../traci4matlab/+traci/+vehicletype/setTau.m | 22 +-
.../+traci/+vehicletype/setVehicleClass.m | 20 +-
.../traci4matlab/+traci/+vehicletype/setWidth.m | 20 +-
.../traci4matlab/+traci/+vehicletype/subscribe.m | 74 +-
.../+traci/+vehicletype/subscribeContext.m | 90 +-
tools/contributed/traci4matlab/+traci/Message.m | 26 +-
.../traci4matlab/+traci/RETURN_VALUE_FUNC.m | 491 +-
tools/contributed/traci4matlab/+traci/Socket.m | 68 +-
tools/contributed/traci4matlab/+traci/Storage.m | 140 +-
.../traci4matlab/+traci/SubscriptionResults.m | 172 +-
.../contributed/traci4matlab/+traci/beginMessage.m | 58 +-
.../contributed/traci4matlab/+traci/checkResult.m | 64 +-
tools/contributed/traci4matlab/+traci/constants.m | 1492 +-
tools/contributed/traci4matlab/+traci/getVersion.m | 66 +-
tools/contributed/traci4matlab/+traci/init.m | 145 +-
tools/contributed/traci4matlab/+traci/packInt32.m | 26 +-
tools/contributed/traci4matlab/+traci/packInt64.m | 18 +-
.../traci4matlab/+traci/readSubscription.m | 274 +-
tools/contributed/traci4matlab/+traci/recvExact.m | 102 +-
.../contributed/traci4matlab/+traci/sendByteCmd.m | 24 +-
.../traci4matlab/+traci/sendDoubleCmd.m | 26 +-
tools/contributed/traci4matlab/+traci/sendExact.m | 124 +-
tools/contributed/traci4matlab/+traci/sendIntCmd.m | 26 +-
.../traci4matlab/+traci/sendReadOneStringCmd.m | 20 +-
.../traci4matlab/+traci/sendStringCmd.m | 36 +-
.../traci4matlab/+traci/simulationStep.m | 114 +-
tools/contributed/traci4matlab/+traci/subscribe.m | 70 +-
.../traci4matlab/+traci/subscribeContext.m | 100 +-
.../traci4matlab/+traci/switchConnection.m | 24 +-
tools/contributed/traci4matlab/+traci/time2steps.m | 18 +-
tools/contributed/traci4matlab/README.md | 10 +
.../examples/inter_palmas/inter_palmas.poly.xml | 78 +-
.../inter_palmas/inter_palmas_buses.rou.alt.xml | 254 +-
.../inter_palmas/inter_palmas_buses.rou.xml | 190 +-
.../inter_palmas/inter_palmas_buses.trips.xml | 16 +-
.../inter_palmas/inter_palmas_demand.rou.xml | 12664 +-
.../inter_palmas/inter_palmas_pedestrians.trip.xml | 732 +-
.../tls_actuated/checkWaitingPersons.m | 48 +-
.../tls_actuated/inter_palmas_actuated.m | 329 +-
.../examples/inter_palmas/viewsettings.xml | 976 +-
.../traci4matlab/examples/traci_test2.m | 1291 +-
.../gaunal/traci4matlab/utils/DataReader.java | 116 +-
tools/contributed/trafficmodeler/.classpath | 14 +-
tools/contributed/trafficmodeler/.project | 50 +-
.../.settings/org.eclipse.jdt.ui.prefs | 8 +-
.../org.eclipse.ltk.core.refactoring.prefs | 6 +-
.../.settings/org.eclipse.wst.validation.prefs | 12 +-
tools/contributed/trafficmodeler/.umlproject | 18 +-
tools/contributed/trafficmodeler/MANIFEST.MF | 8 +-
.../contributed/trafficmodeler/SUMOConfXML.jardesc | 32 +-
tools/contributed/trafficmodeler/javadoc.xml | 12 +-
tools/contributed/trafficmodeler/src/Main.java | 30 +-
.../trafficmodeler/src/classes/Constants.java | 10 +-
.../trafficmodeler/src/classes/Layer.java | 688 +-
.../trafficmodeler/src/classes/Pair.java | 158 +-
.../trafficmodeler/src/classes/Project.java | 932 +-
.../trafficmodeler/src/classes/ProjectElement.java | 98 +-
.../trafficmodeler/src/classes/TypeSelection.java | 308 +-
.../trafficmodeler/src/enums/EditingMode.java | 16 +-
.../src/enums/MotionRestriction.java | 16 +-
.../trafficmodeler/src/enums/SchoolType.java | 16 +-
.../trafficmodeler/src/enums/SelectionCount.java | 16 +-
.../trafficmodeler/src/enums/SelectionType.java | 16 +-
.../trafficmodeler/src/enums/ToolType.java | 14 +-
.../src/enums/TrafficDefinitionLayerType.java | 16 +-
.../src/helpers/ApplicationSettings.java | 102 +-
.../trafficmodeler/src/helpers/Broadcaster.java | 106 +-
.../trafficmodeler/src/helpers/CursorProvider.java | 136 +-
.../trafficmodeler/src/helpers/DrawingHelper.java | 96 +-
.../src/helpers/MultipleTripExpander.java | 296 +-
.../src/helpers/RandomNumberProvider.java | 34 +-
.../trafficmodeler/src/helpers/StreamGobbler.java | 118 +-
.../trafficmodeler/src/helpers/TimeConverter.java | 84 +-
.../interfaces/CurrentLayerChangedListener.java | 36 +-
.../src/interfaces/DrawableElement.java | 24 +-
.../src/interfaces/DrawableLayer.java | 30 +-
.../src/interfaces/HandleListener.java | 32 +-
.../src/interfaces/ModifiedCollectionListener.java | 26 +-
.../src/interfaces/ProjectChangedListener.java | 40 +-
.../src/interfaces/SelectableType.java | 18 +-
.../src/interfaces/SelectionChangedListener.java | 36 +-
.../trafficmodeler/src/roadnetwork/Edge.java | 828 +-
.../trafficmodeler/src/roadnetwork/Junction.java | 152 +-
.../trafficmodeler/src/roadnetwork/Lane.java | 176 +-
.../src/roadnetwork/RoadNetwork.java | 1464 +-
.../src/roadnetwork/RoadNetworkElement.java | 226 +-
.../trafficmodeler/src/shapes/AreaExt.java | 186 +-
.../trafficmodeler/src/shapes/Ellipse2DExt.java | 70 +-
.../trafficmodeler/src/shapes/Line2DExt.java | 80 +-
.../trafficmodeler/src/shapes/Point2DExt.java | 72 +-
.../trafficmodeler/src/shapes/Polygon2D.java | 1424 +-
.../trafficmodeler/src/shapes/PolygonIterator.java | 294 +-
.../trafficmodeler/src/shapes/Rectangle2DExt.java | 82 +-
.../trafficmodeler/src/simulation/Adult.java | 952 +-
.../trafficmodeler/src/simulation/Child.java | 128 +-
.../src/simulation/CustomComparator.java | 22 +-
.../trafficmodeler/src/simulation/House.java | 710 +-
.../trafficmodeler/src/simulation/JobType.java | 204 +-
.../trafficmodeler/src/simulation/Person.java | 16 +-
.../trafficmodeler/src/simulation/Route.java | 18 +-
.../src/simulation/SUMOInstruction.java | 58 +-
.../src/simulation/SUMOInstructionList.java | 42 +-
.../trafficmodeler/src/simulation/Simulation.java | 276 +-
.../src/simulation/SimulationExporter.java | 796 +-
.../src/simulation/TrafficGenerator.java | 1090 +-
.../trafficmodeler/src/simulation/Trip.java | 24 +-
.../trafficmodeler/src/simulation/VehicleType.java | 340 +-
.../trafficmodeler/src/tdl/XMLHelpers.java | 144 +-
.../src/trafficdefinition/Accident.java | 536 +-
.../ActivityBasedTrafficDefinitionLayer.java | 140 +-
.../src/trafficdefinition/AreaFlow.java | 874 +-
.../trafficmodeler/src/trafficdefinition/Flow.java | 660 +-
.../src/trafficdefinition/Handle.java | 396 +-
.../src/trafficdefinition/HotSpot.java | 932 +-
.../RandomTrafficDefinitionLayer.java | 302 +-
.../src/trafficdefinition/School.java | 758 +-
.../src/trafficdefinition/TrafficArea.java | 854 +-
.../TrafficDefinitionElement.java | 450 +-
.../trafficdefinition/TrafficDefinitionLayer.java | 404 +-
.../UserDefinedTrafficDefinitionLayer.java | 150 +-
.../src/ui/AffectedLanesTableModel.java | 182 +-
.../contributed/trafficmodeler/src/ui/Display.java | 2604 +-
.../src/ui/ExportLayersTableModel.java | 180 +-
.../trafficmodeler/src/ui/MainWindow.java | 3724 +-
.../trafficmodeler/src/ui/PnlLayers.java | 890 +-
.../trafficmodeler/src/ui/PnlProperties.java | 818 +-
.../src/ui/TypeSelectionTableModel.java | 178 +-
.../src/ui/controls/JTrafficLayerTree.java | 56 +-
.../src/ui/controls/JTrafficLayerTreeModel.java | 74 +-
.../src/ui/controls/ProjectTreeCellRenderer.java | 124 +-
.../src/ui/controls/SimTimeEdit.java | 426 +-
.../src/ui/dialogs/DlgAddEditJobType.java | 554 +-
.../src/ui/dialogs/DlgAddEditVehicleType.java | 802 +-
.../src/ui/dialogs/DlgExportSimulation.java | 910 +-
.../src/ui/dialogs/DlgManageJobTypes.java | 570 +-
.../src/ui/dialogs/DlgManageVehicleTypes.java | 564 +-
.../src/ui/dialogs/DlgNewProject.java | 612 +-
.../src/ui/dialogs/DlgRandomLayerProperties.java | 384 +-
.../src/ui/dialogs/DlgSelectTypes.java | 428 +-
.../trafficmodeler/src/ui/dialogs/DlgSettings.java | 488 +-
.../src/ui/filefilters/ProjectFileFilter.java | 50 +-
.../src/ui/filefilters/SUMOFileFilter.java | 62 +-
.../src/ui/filefilters/TDLFileFilter.java | 48 +-
.../ui/propertypanels/PnlAccidentProperties.java | 532 +-
.../ui/propertypanels/PnlAreaFlowProperties.java | 710 +-
.../src/ui/propertypanels/PnlEdgeProperties.java | 390 +-
.../src/ui/propertypanels/PnlFlowProperties.java | 756 +-
.../ui/propertypanels/PnlHotSpotProperties.java | 1254 +-
.../ui/propertypanels/PnlJunctionProperties.java | 170 +-
.../src/ui/propertypanels/PnlSchoolProperties.java | 598 +-
.../propertypanels/PnlTrafficAreaProperties.java | 1152 +-
tools/detector/aggregateFlows.py | 16 +-
tools/detector/deleteUnusedDetectors.py | 12 +-
tools/detector/detector.py | 8 +-
tools/detector/flowFromRoutes.py | 27 +-
tools/detector/flowrouter.py | 117 +-
tools/detector/validate.py | 5 +-
tools/district/countConnectionsInDistricts.py | 8 +-
tools/district/districtMapper.py | 12 +-
tools/districts2poly.py | 5 +-
tools/edgesInDistricts.py | 12 +-
tools/emissions/nefz.csv | 1180 +
tools/emissions/nefz.py | 168 +
tools/extractTest.py | 18 +-
tools/game/patchTrafficLights.py | 10 +-
tools/game/runner.py | 26 +-
tools/game/setup.py | 50 +-
tools/generateBidiDistricts.py | 66 +-
tools/import/osm/osmPopulationExtractor.py | 30 +-
tools/import/transportationTestProblems.py | 5 +-
tools/import/vissim/convert_detectors2SUMO.py | 8 +-
.../vissim/convert_vissimXML_flows_statRoutes.py | 6 +-
.../import/vissim/tls_vissimXML2SUMOnet_update.py | 5 +-
tools/import/vissim/vissim_parseBusStops.py | 16 +-
tools/import/vissim/vissim_parseRoutes.py | 18 +-
tools/import/visum/visum_convertEdgeTypes.py | 10 +-
tools/import/visum/visum_convertRoutes.py | 5 +-
tools/import/visum/visum_convertTurnPercentages.py | 23 +-
tools/import/visum/visum_parseZaehlstelle.py | 16 +-
tools/launcher.py | 5 +-
tools/lib/rmsd.py | 10 +-
tools/lib/testUtil.py | 5 +-
tools/net/0103to0110.py | 19 +-
tools/net/0123to0130.py | 29 +-
tools/net/OrderedMultiSet.py | 5 +-
tools/net/batch0103to0110.py | 8 +-
tools/net/createRoundaboutConnections.py | 12 +-
tools/net/netcheck.py | 70 +-
tools/net/netdiff.py | 82 +-
tools/net/netduplicate.py | 8 +-
tools/net/netextract.py | 16 +-
tools/net/netextract_subPart.py | 14 +-
tools/net/netmatch.py | 5 +-
tools/net/netshiftadaptor.py | 4 +-
tools/net/netstats.py | 31 +-
tools/net/network_statistics.py | 9 +-
tools/net/odConnectionsCheck.py | 32 +-
tools/net/patchNetFiles.py | 10 +-
tools/net/prepareVISUM.py | 8 +-
tools/net/reprojectpolys.py | 24 +-
tools/net/visum_mapDistricts.py | 43 +-
tools/net/xmlconnections_mapEdges.py | 8 +-
tools/net/xmledges_applyOffset.py | 9 +-
tools/net/xmlnodes_applyOffset.py | 9 +-
tools/osmBuild.py | 5 +-
tools/osmGet.py | 18 +-
tools/osmWebWizard.py | 16 +-
tools/output/accelerations.py | 8 +-
tools/output/analyze_teleports.py | 18 +-
tools/output/countLaneChanges.py | 8 +-
tools/output/edgeDataDiff.py | 8 +-
tools/output/generateITetrisIntersectionMetrics.py | 14 +-
tools/output/generateITetrisNetworkMetrics.py | 62 +-
tools/output/generateMeanDataDefinitions.py | 5 +-
tools/output/generateTLSE1Detectors.py | 8 +-
tools/output/generateTLSE2Detectors.py | 8 +-
tools/output/generateTLSE3Detectors.py | 8 +-
tools/output/netdumpdiff.py | 14 +-
tools/output/netdumpmean.py | 14 +-
tools/output/timingStats.py | 8 +-
tools/output/vehLanes.py | 5 +-
tools/output/vehroute2amitranOD.py | 5 +-
tools/output/vehrouteDiff.py | 20 +-
tools/pedestrianFlow.py | 3 +-
.../projects/TLS-Evaluationsszenarien/changeNet.py | 5 +-
.../projects/TLS-Evaluationsszenarien/data/000.dat | 1152 +-
.../projects/TLS-Evaluationsszenarien/data/001.dat | 1152 +-
.../projects/TLS-Evaluationsszenarien/data/002.dat | 1152 +-
.../projects/TLS-Evaluationsszenarien/data/003.dat | 1152 +-
.../projects/TLS-Evaluationsszenarien/evaluator.py | 12 +-
.../projects/TLS-Evaluationsszenarien/genRoutes.py | 32 +-
tools/projects/TLS-Evaluationsszenarien/main.py | 18 +-
tools/projects/TLS-Evaluationsszenarien/plotter.py | 5 +-
.../sumoConfig/cross_sat/cross.out | 2348 +-
tools/projects/TLS-Evaluationsszenarien/test.py | 12 +-
tools/projects/TaxiFCD_Krieg/.project | 34 +-
tools/projects/TaxiFCD_Krieg/.pydevproject | 18 +-
.../TaxiFCD_Krieg/src/analysis/CompareVelocitys.py | 22 +-
.../TaxiFCD_Krieg/src/analysis/FetchData.py | 34 +-
tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/Traveltime.py | 46 +-
.../TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py | 56 +-
.../TaxiFCD_Krieg/src/analysis/Traveltime_DK.py | 29 +-
.../TaxiFCD_Krieg/src/analysis/VelocityCurve.py | 10 +-
.../src/analysis/VelocityOverRoute.py | 18 +-
.../TaxiFCD_Krieg/src/analysis/VelocityOverTime.py | 18 +-
.../TaxiFCD_Krieg/src/analysis/__init__.py | 4 +-
.../TaxiFCD_Krieg/src/backup/BackupFolder.pyw | 208 +-
.../projects/TaxiFCD_Krieg/src/backup/__init__.py | 4 +-
.../TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py | 20 +-
.../src/fcdQuality/ParamEffectsOLD.py | 18 +-
.../src/fcdQuality/ParamEffectsProcessedFCD.py | 29 +-
.../TaxiFCD_Krieg/src/fcdQuality/__init__.py | 4 +-
.../TaxiFCD_Krieg/src/fcdQuality/readPlot.py | 10 +-
.../TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py | 5 +-
.../src/fcdToRoutes/FCDvsCompleteRoute.py | 52 +-
.../src/fcdToRoutes/GenerateTaxiRoutes.py | 10 +-
.../src/fcdToRoutes/GenerateTaxiRoutesMain.py | 12 +-
.../src/fcdToRoutes/My_mpl_dump_onNet.py | 34 +-
.../TaxiFCD_Krieg/src/fcdToRoutes/__init__.py | 4 +-
.../src/fcdToRoutes/differentDepartRoutes.py | 12 +-
.../TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py | 12 +-
.../src/taxiQuantity/QuantityOverDay.py | 8 +-
.../src/taxiQuantity/SeparateVLSArea.py | 12 +-
.../TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py | 16 +-
.../TaxiFCD_Krieg/src/util/BinarySearch.py | 12 +-
tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py | 10 +-
tools/projects/TaxiFCD_Krieg/src/util/Path.py | 5 +-
.../projects/TaxiFCD_Krieg/src/util/ProgressBar.py | 11 +-
tools/projects/TaxiFCD_Krieg/src/util/Reader.py | 5 +-
tools/projects/TaxiFCD_Krieg/src/util/__init__.py | 4 +-
tools/projects/evacuation/evacuation.py | 7 +-
tools/projects/evacuation/generateTraffic.py | 6 +-
tools/projects/vehicles2d/commons.py | 4 +-
tools/projects/vehicles2d/dijkstra_base.py | 4 +-
tools/projects/vehicles2d/main.py | 10 +-
tools/projects/vehicles2d/test.py | 4 +-
tools/projects/vehicles2d/unittest_ada_star.py | 4 +-
.../unittest_ada_star_bugs_on_the_way.py | 4 +-
tools/projects/vehicles2d/unittest_constants.py | 4 +-
tools/projects/vehicles2d/unittest_dijkstra.py | 4 +-
tools/projects/vehicles2d/unittest_flaeche.py | 4 +-
tools/projects/vehicles2d/unittest_utils.py | 4 +-
tools/projects/vehicles2d/unittest_vessel.py | 4 +-
tools/purgatory/10to11.py | 18 +-
tools/purgatory/findUTurns.py | 48 +-
tools/purgatory/generate-ns2.py | 56 +-
tools/purgatory/generateTripsXml.py | 38 +-
tools/purgatory/kShortest.py | 18 +-
tools/purgatory/removeSVN.py | 5 +-
tools/purgatory/routes2OD.py | 34 +-
tools/randomTrips.py | 19 +-
tools/route/cutRoutes.py | 35 +-
tools/route/route2alts.py | 14 +-
tools/route/route2poly.py | 19 +-
tools/route/routeDiffStats.py | 6 +-
tools/route/routeStats.py | 8 +-
tools/route/route_1htoDay.py | 10 +-
tools/route/route_departOffset.py | 9 +-
tools/route/routecheck.py | 48 +-
tools/route/routecompare.py | 53 +-
tools/route/routes_Join.py | 18 +-
tools/route/sort_routes.py | 16 +-
tools/route/tracegenerator.py | 5 +-
tools/route/tracemapper.py | 5 +-
tools/route/vehicle2flow.py | 5 +-
tools/route2sel.py | 5 +-
tools/route2trips.py | 15 +-
tools/shapes/CSV2polyconvertXML.py | 16 +-
tools/shapes/circlePolygon.py | 9 +-
tools/shapes/poi_alongRoads.py | 13 +-
tools/shapes/poi_atTLS.py | 24 +-
tools/shapes/pois2inductionLoops.py | 24 +-
tools/sumolib/__init__.py | 17 +-
tools/sumolib/color.py | 5 +-
tools/sumolib/files/__init__.py | 8 +-
tools/sumolib/files/additional.py | 7 +-
tools/sumolib/files/selection.py | 4 +-
tools/sumolib/geomhelper.py | 5 +-
tools/sumolib/miscutils.py | 38 +-
tools/sumolib/net/__init__.py | 23 +-
tools/sumolib/net/connection.py | 4 +-
tools/sumolib/net/edge.py | 6 +-
tools/sumolib/net/generator/__init__.py | 25 +
tools/sumolib/net/generator/corridor.py | 60 +
tools/sumolib/net/generator/cross.py | 48 +
tools/sumolib/net/generator/demand.py | 173 +
tools/sumolib/net/generator/grid.py | 68 +
tools/sumolib/net/generator/network.py | 332 +
tools/sumolib/net/generator/straight.py | 47 +
tools/sumolib/net/lane.py | 4 +-
tools/sumolib/net/node.py | 4 +-
tools/sumolib/net/roundabout.py | 4 +-
tools/sumolib/options.py | 21 +-
tools/sumolib/output/__init__.py | 10 +-
tools/sumolib/output/convert/__init__.py | 5 +-
tools/sumolib/output/convert/gpsdat.py | 9 +-
tools/sumolib/output/convert/gpx.py | 7 +-
tools/sumolib/output/convert/ns2.py | 7 +-
tools/sumolib/output/convert/omnet.py | 7 +-
tools/sumolib/output/convert/phem.py | 13 +-
tools/sumolib/output/convert/poi.py | 3 +-
tools/sumolib/output/convert/shawn.py | 5 +-
tools/sumolib/output/dump.py | 5 +-
tools/sumolib/output/inductionloop.py | 5 +-
tools/sumolib/route.py | 4 +-
tools/sumolib/scenario/__init__.py | 20 +
tools/sumolib/scenario/checkFlows.py | 48 +
tools/sumolib/scenario/pop2.py | 3594 +
tools/sumolib/scenario/runsdb.py | 171 +
.../scenario/scenarios/BasicCorridor/net.net.xml | 1260 +
.../scenario/scenarios/BasicCorridor/tls.add.xml | 43 +
.../scenario/scenarios/BasicCross/net.net.xml | 324 +
.../scenario/scenarios/BasicCross/tls.add.xml | 10 +
.../scenario/scenarios/BasicCrossL/net.net.xml | 324 +
.../scenario/scenarios/BasicCrossL/tls.add.xml | 14 +
.../scenario/scenarios/BasicNet/tls.add.xml | 204 +
.../scenarios/BasicRiLSACorridor3/network.net.xml | 4754 +
.../routes_BasicRiLSACorridor3(1-31).rou.alt.xml | 269798 ++++++++++++++++++
.../scenarios/BasicRiLSACorridor3/tls.add.xml | 198 +
.../scenarios/BasicRiLSANet2x2/network.net.xml | 5028 +
.../scenarios/BasicRiLSANet2x2/tls.add.xml | 211 +
.../RealWorld/RiLSA_example1/genroutes.rou.xml | 6537 +
.../RealWorld/RiLSA_example1/makeRoutes.py | 64 +
.../RealWorld/RiLSA_example1/measures.add.xml | 62 +
.../scenarios/RealWorld/RiLSA_example1/net.net.xml | 176 +
.../RealWorld/RiLSA_example1/rilsa1.net.xml | 176 +
.../RealWorld/RiLSA_example1/rilsa1_tls.add.xml | 14 +
.../RealWorld/RiLSA_example1/routes.rou.xml | 6536 +
.../RealWorld/RiLSA_example1/run.sumo.cfg | 9 +
.../scenarios/RealWorld/RiLSA_example1/tls.add.xml | 14 +
.../RealWorld/RiLSA_example1/vtypes.add.xml | 4 +
.../RealWorld/RiLSA_example2/genroutes.rou.xml | 10425 +
.../RealWorld/RiLSA_example2/makeRoutes.py | 55 +
.../scenarios/RealWorld/RiLSA_example2/net.net.xml | 158 +
.../RealWorld/RiLSA_example2/rilsa2.net.xml | 158 +
.../RealWorld/RiLSA_example2/rilsa2_tls.add.xml | 20 +
.../RealWorld/RiLSA_example2/routes.rou.xml | 10424 +
.../RealWorld/RiLSA_example2/run.sumo.cfg | 9 +
.../RealWorld/RiLSA_example2/tls_add.add.xml | 20 +
.../RealWorld/RiLSA_example2/vtypes.add.xml | 4 +
.../RealWorld/RiLSA_example3/genroutes.rou.xml | 8172 +
.../RealWorld/RiLSA_example3/makeRoutes.py | 64 +
.../scenarios/RealWorld/RiLSA_example3/net.net.xml | 177 +
.../RealWorld/RiLSA_example3/rilsa3.net.xml | 177 +
.../RealWorld/RiLSA_example3/rilsa3_tls.add.xml | 19 +
.../RealWorld/RiLSA_example3/routes.rou.xml | 8171 +
.../RealWorld/RiLSA_example3/run.sumo.cfg | 9 +
.../RealWorld/RiLSA_example3/tls_add.add.xml | 28 +
.../RealWorld/RiLSA_example3/vtypes.add.xml | 4 +
.../RealWorld/RiLSA_example4/genroutes.rou.xml | 7029 +
.../RealWorld/RiLSA_example4/makeRoutes.py | 64 +
.../scenarios/RealWorld/RiLSA_example4/net.net.xml | 177 +
.../RealWorld/RiLSA_example4/rilsa4.net.xml | 177 +
.../RealWorld/RiLSA_example4/rilsa4_tls.add.xml | 19 +
.../RealWorld/RiLSA_example4/routes.rou.xml | 7028 +
.../RealWorld/RiLSA_example4/run.sumo.cfg | 9 +
.../RealWorld/RiLSA_example4/tls_add.add.xml | 31 +
.../RealWorld/RiLSA_example4/vtypes.add.xml | 4 +
.../scenarios/RealWorld/acosta/acosta.rou.xml | 8624 +
.../RealWorld/acosta/acosta_bus_stops.add.xml | 37 +
.../RealWorld/acosta/acosta_buslanes.net.xml | 3043 +
.../RealWorld/acosta/acosta_busses.add.xml | 858 +
.../RealWorld/acosta/acosta_detectors.add.xml | 86 +
.../scenarios/RealWorld/acosta/acosta_tls.add.xml | 119 +
.../RealWorld/acosta/acosta_vtypes.add.xml | 19 +
.../scenarios/RealWorld/acosta/e1_output.xml | 34 +
.../scenario/scenarios/RealWorld/acosta/meta.txt | 5 +
.../scenarios/RealWorld/acosta/run.sumo.cfg | 8 +
.../scenarios/RealWorld/acosta/sumo_log.txt | 18 +
.../scenarios/RealWorld/joined/joined.rou.xml | 11081 +
.../RealWorld/joined/joined_bus_stops.add.xml | 63 +
.../RealWorld/joined/joined_buslanes.net.xml | 5098 +
.../RealWorld/joined/joined_busses.add.xml | 1141 +
.../RealWorld/joined/joined_detectors.add.xml | 154 +
.../scenarios/RealWorld/joined/joined_tls.add.xml | 205 +
.../RealWorld/joined/joined_vtypes.add.xml | 19 +
.../scenario/scenarios/RealWorld/joined/meta.txt | 5 +
.../scenarios/RealWorld/joined/run.sumo.cfg | 9 +
.../scenarios/RealWorld/joined/sumo_log.txt | 58 +
.../scenario/scenarios/RealWorld/pasubio/meta.txt | 5 +
.../RealWorld/pasubio/pasubio.phase.sumo.cfg | 9 +
.../RealWorld/pasubio/pasubio.phase.tls.add.xml | 331 +
.../pasubio/pasubio.platoon.detectors.add.xml | 91 +
.../RealWorld/pasubio/pasubio.platoon.sumo.cfg | 14 +
.../RealWorld/pasubio/pasubio.platoon.tls.add.xml | 334 +
.../RealWorld/pasubio/pasubio.platoon.tripinfo.xml | 8823 +
.../RealWorld/pasubio/pasubio.request.sumo.cfg | 9 +
.../scenarios/RealWorld/pasubio/pasubio.rou.xml | 8683 +
.../RealWorld/pasubio/pasubio.swarm.sumo.cfg | 9 +
.../RealWorld/pasubio/pasubio.swarm.tls.add.xml | 331 +
.../RealWorld/pasubio/pasubio_bus_stops.add.xml | 27 +
.../RealWorld/pasubio/pasubio_buslanes.net.xml | 2337 +
.../RealWorld/pasubio/pasubio_busses.add.xml | 725 +
.../RealWorld/pasubio/pasubio_detectors.add.xml | 91 +
.../RealWorld/pasubio/pasubio_tls.add.xml | 134 +
.../RealWorld/pasubio/pasubio_tls_2.add.xml | 134 +
.../RealWorld/pasubio/pasubio_vtypes.add.xml | 19 +
.../scenarios/RealWorld/pasubio/run.sumo.cfg | 9 +
.../scenarios/RealWorld/pasubio/sumo_log.txt | 25 +
.../scenario/scenarios/RiLSA1/!rilsaTLSdef.txt | 12 +
.../scenario/scenarios/RiLSA1/build.netc.cfg | 8 +
.../scenarios/RiLSA1/input_connections.con.xml | 37 +
.../scenario/scenarios/RiLSA1/input_edges.edg.xml | 58 +
.../scenario/scenarios/RiLSA1/input_nodes.nod.xml | 14 +
.../scenario/scenarios/RiLSA1/rilsa1.net.xml | 330 +
.../sumolib/scenario/scenarios/RiLSA1/tls.add.xml | 16 +
.../scenarios/RiLSA1BothTLS/!rilsaTLSdef.txt | 12 +
.../scenarios/RiLSA1BothTLS/build.netc.cfg | 8 +
.../RiLSA1BothTLS/input_connections.con.xml | 37 +
.../scenarios/RiLSA1BothTLS/input_edges.edg.xml | 90 +
.../scenarios/RiLSA1BothTLS/input_nodes.nod.xml | 19 +
.../scenarios/RiLSA1BothTLS/rilsa1both.net.xml | 482 +
.../scenario/scenarios/RiLSA1BothTLS/tls.add.xml | 36 +
.../scenarios/RiLSA1OutTLS/!rilsaTLSdef.txt | 12 +
.../scenario/scenarios/RiLSA1OutTLS/build.netc.cfg | 8 +
.../RiLSA1OutTLS/input_connections.con.xml | 37 +
.../scenarios/RiLSA1OutTLS/input_edges.edg.xml | 74 +
.../scenarios/RiLSA1OutTLS/input_nodes.nod.xml | 19 +
.../scenario/scenarios/RiLSA1OutTLS/rilsa1.net.xml | 414 +
.../scenario/scenarios/RiLSA1OutTLS/tls.add.xml | 36 +
tools/sumolib/scenario/scenarios/__init__.py | 398 +
tools/sumolib/scenario/scenarios/basic_corridor.py | 63 +
tools/sumolib/scenario/scenarios/basic_cross.py | 55 +
tools/sumolib/scenario/scenarios/basic_crossl.py | 56 +
tools/sumolib/scenario/scenarios/basic_net.py | 69 +
.../scenario/scenarios/basic_rilsacorridor3.py | 197 +
tools/sumolib/scenario/scenarios/basic_rilsanet.py | 186 +
.../scenario/scenarios/basic_rilsanet2x2.py | 196 +
tools/sumolib/scenario/scenarios/net.net.xml | 324 +
tools/sumolib/scenario/scenarios/real_world.py | 56 +
tools/sumolib/scenario/scenarios/rilsa1.py | 80 +
.../sumolib/scenario/scenarios/rilsa1_both_tls.py | 93 +
.../scenario/scenarios/rilsa1_both_tls24.py | 93 +
tools/sumolib/scenario/scenarios/rilsa1_out_tls.py | 94 +
.../sumolib/scenario/scenarios/rilsa1_out_tls24.py | 94 +
tools/sumolib/scenario/vtypes/vtypes2010.add.xml | 85 +
tools/sumolib/scenario/vtypes/vtypes2014.add.xml | 85 +
tools/sumolib/scenario/vtypes/vtypes2020.add.xml | 85 +
tools/sumolib/scenario/vtypes/vtypes2030.add.xml | 85 +
tools/sumolib/scenario/vtypes/vtypes2040.add.xml | 85 +
tools/sumolib/sensors/__init__.py | 7 +-
tools/sumolib/sensors/inductive_loop.py | 9 +-
tools/sumolib/shapes/__init__.py | 8 +-
tools/sumolib/shapes/poi.py | 9 +-
tools/sumolib/shapes/polygon.py | 8 +-
tools/sumolib/visualization/__init__.py | 7 +-
tools/sumolib/visualization/helpers.py | 21 +-
tools/tls/tls_check.py | 15 +-
tools/tls/tls_csv2SUMO.py | 36 +-
tools/tlsCoordinator.py | 25 +-
tools/traceExporter.py | 5 +-
tools/traci/__init__.py | 495 +-
tools/traci/_areal.py | 109 +
tools/traci/_edge.py | 231 +
tools/traci/_gui.py | 126 +
tools/traci/_inductionloop.py | 127 +
tools/traci/_junction.py | 53 +
tools/traci/_lane.py | 307 +
tools/traci/_multientryexit.py | 67 +
tools/traci/_person.py | 146 +
tools/traci/_poi.py | 111 +
tools/traci/_polygon.py | 116 +
tools/traci/_route.py | 54 +
tools/traci/_simulation.py | 349 +
tools/traci/_trafficlights.py | 246 +
tools/traci/_vehicle.py | 877 +
tools/traci/_vehicletype.py | 264 +
tools/traci/areal.py | 160 -
tools/traci/connection.py | 285 +
tools/traci/constants.py | 11 +-
tools/traci/domain.py | 189 +
tools/traci/edge.py | 300 -
tools/traci/exceptions.py | 48 +
tools/traci/gui.py | 168 -
tools/traci/inductionloop.py | 178 -
tools/traci/junction.py | 98 -
tools/traci/lane.py | 387 -
tools/traci/multientryexit.py | 113 -
tools/traci/person.py | 204 -
tools/traci/poi.py | 162 -
tools/traci/polygon.py | 169 -
tools/traci/rebuildConstants.py | 9 +-
tools/traci/route.py | 105 -
tools/traci/simulation.py | 37 +-
tools/traci/storage.py | 74 +
tools/traci/traciToHex.py | 5 +-
tools/traci/trafficlights.py | 298 -
tools/traci/vehicle.py | 1004 -
tools/traci/vehicletype.py | 338 -
tools/trigger/csv2vss.py | 5 +-
tools/turn-defs/collectinghandler.py | 5 +-
tools/turn-defs/connections.py | 7 +-
tools/turn-defs/generateTurnDefs.py | 5 +-
tools/turn-defs/turndefinitions.py | 7 +-
tools/visualization/mpl_dump_onNet.py | 34 +-
tools/visualization/mpl_dump_timeline.py | 16 +-
tools/visualization/mpl_dump_twoAgainst.py | 18 +-
tools/visualization/mpl_tripinfos_twoAgainst.py | 22 +-
tools/visualization/plot_csv_bars.py | 8 +-
tools/visualization/plot_csv_pie.py | 12 +-
tools/visualization/plot_csv_timeline.py | 10 +-
tools/visualization/plot_net_dump.py | 29 +-
tools/visualization/plot_net_selection.py | 12 +-
tools/visualization/plot_net_speeds.py | 12 +-
tools/visualization/plot_net_trafficLights.py | 10 +-
tools/visualization/plot_summary.py | 10 +-
tools/visualization/plot_tripinfo_distributions.py | 10 +-
tools/webWizard/SimpleWebSocketServer.py | 18 +-
tools/webWizard/__init__.py | 7 +-
tools/webWizard/script.js | 11 +-
tools/xml/addSchema.py | 8 +-
tools/xml/binary2plain.py | 8 +-
tools/xml/csv2xml.py | 41 +-
tools/xml/protobuf2xml.py | 5 +-
tools/xml/rebuildSchemata.py | 8 +-
tools/xml/schemaCheck.py | 24 +-
tools/xml/xml2csv.py | 27 +-
tools/xml/xml2protobuf.py | 5 +-
tools/xml/xsd.py | 11 +-
tools_filelist | Bin 119328 -> 128742 bytes
unittest/Makefile.in | 1 +
unittest/src/Makefile.am | 3 +-
unittest/src/Makefile.in | 5 +-
unittest/src/microsim/MSCFModelTest.cpp | 6 +-
unittest/src/microsim/MSEventControlTest.cpp | 24 +-
unittest/src/microsim/Makefile.in | 1 +
unittest/src/netbuild/Makefile.in | 1 +
unittest/src/netbuild/NBHeightMapperTest.cpp | 4 +-
unittest/src/netbuild/NBTrafficLightLogicTest.cpp | 19 +-
unittest/src/unittest_main.cpp | 4 +-
unittest/src/utils/Makefile.in | 1 +
unittest/src/utils/common/CommandMock.h | 4 +-
unittest/src/utils/common/Makefile.in | 1 +
unittest/src/utils/common/RGBColorTest.cpp | 4 +-
unittest/src/utils/common/StringTokenizerTest.cpp | 101 +-
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 | 17 +-
unittest/src/utils/foxtools/Makefile.in | 1 +
unittest/src/utils/geom/BoundaryTest.cpp | 111 +-
unittest/src/utils/geom/GeoConvHelperTest.cpp | 4 +-
unittest/src/utils/geom/GeomHelperTest.cpp | 4 +-
unittest/src/utils/geom/Makefile.in | 1 +
unittest/src/utils/geom/PositionVectorTest.cpp | 4 +-
unittest/src/utils/iodevices/Makefile.in | 1 +
unittest/src/utils/iodevices/OutputDeviceMock.h | 4 +-
2976 files changed, 546743 insertions(+), 112839 deletions(-)
diff --cc bin/Makefile.am
index 284fda3,cf3f552..60ed054
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@@ -104,14 -59,7 +59,10 @@@ $(GUI_APP): ../src/$(GUI_APP
if [ ! -e $(GUI_APP) -a -e $(GUI_APP)D ]; then ln -s $(GUI_APP)D $(GUI_APP); fi
$(NETEDIT_APP): ../src/netedit/$(NETEDIT_APP)
cp ../src/netedit/$(NETEDIT_APP) ./`echo $(NETEDIT_APP) | sed '$(transform)'`
+ if [ ! -e $(NETEDIT_APP) -a -e $(NETEDIT_APP)Int ]; then ln -s $(NETEDIT_APP)Int $(NETEDIT_APP); fi
+ if [ ! -e $(NETEDIT_APP)D -a -e $(NETEDIT_APP)IntD ]; then ln -s $(NETEDIT_APP)IntD $(NETEDIT_APP)D; fi
if [ ! -e $(NETEDIT_APP) -a -e $(NETEDIT_APP)D ]; then ln -s $(NETEDIT_APP)D $(NETEDIT_APP); fi
+ if [ ! -e $(NETEDIT_APP)Int -a -e $(NETEDIT_APP)IntD ]; then ln -s $(NETEDIT_APP)IntD $(NETEDIT_APP)Int; fi
$(TRACI_TESTCLIENT_APP): ../src/traci_testclient/$(TRACI_TESTCLIENT_APP)
cp ../src/traci_testclient/$(TRACI_TESTCLIENT_APP) ./`echo $(TRACI_TESTCLIENT_APP) | sed '$(transform)'`
- if [ ! -e $(TRACI_TESTCLIENT_APP) -a -e $(TRACI_TESTCLIENT_APP)Int ]; then ln -s $(TRACI_TESTCLIENT_APP)Int $(TRACI_TESTCLIENT_APP); fi
- if [ ! -e $(TRACI_TESTCLIENT_APP)D -a -e $(TRACI_TESTCLIENT_APP)IntD ]; then ln -s $(TRACI_TESTCLIENT_APP)IntD $(TRACI_TESTCLIENT_APP)D; fi
if [ ! -e $(TRACI_TESTCLIENT_APP) -a -e $(TRACI_TESTCLIENT_APP)D ]; then ln -s $(TRACI_TESTCLIENT_APP)D $(TRACI_TESTCLIENT_APP); fi
diff --cc bin/Makefile.in
index 428846e,452c52a..6ccb776
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@@ -542,16 -498,9 +498,12 @@@ $(GUI_APP): ../src/$(GUI_APP
if [ ! -e $(GUI_APP) -a -e $(GUI_APP)D ]; then ln -s $(GUI_APP)D $(GUI_APP); fi
$(NETEDIT_APP): ../src/netedit/$(NETEDIT_APP)
cp ../src/netedit/$(NETEDIT_APP) ./`echo $(NETEDIT_APP) | sed '$(transform)'`
+ if [ ! -e $(NETEDIT_APP) -a -e $(NETEDIT_APP)Int ]; then ln -s $(NETEDIT_APP)Int $(NETEDIT_APP); fi
+ if [ ! -e $(NETEDIT_APP)D -a -e $(NETEDIT_APP)IntD ]; then ln -s $(NETEDIT_APP)IntD $(NETEDIT_APP)D; fi
if [ ! -e $(NETEDIT_APP) -a -e $(NETEDIT_APP)D ]; then ln -s $(NETEDIT_APP)D $(NETEDIT_APP); fi
+ if [ ! -e $(NETEDIT_APP)Int -a -e $(NETEDIT_APP)IntD ]; then ln -s $(NETEDIT_APP)IntD $(NETEDIT_APP)Int; fi
$(TRACI_TESTCLIENT_APP): ../src/traci_testclient/$(TRACI_TESTCLIENT_APP)
cp ../src/traci_testclient/$(TRACI_TESTCLIENT_APP) ./`echo $(TRACI_TESTCLIENT_APP) | sed '$(transform)'`
- if [ ! -e $(TRACI_TESTCLIENT_APP) -a -e $(TRACI_TESTCLIENT_APP)Int ]; then ln -s $(TRACI_TESTCLIENT_APP)Int $(TRACI_TESTCLIENT_APP); fi
- if [ ! -e $(TRACI_TESTCLIENT_APP)D -a -e $(TRACI_TESTCLIENT_APP)IntD ]; then ln -s $(TRACI_TESTCLIENT_APP)IntD $(TRACI_TESTCLIENT_APP)D; fi
if [ ! -e $(TRACI_TESTCLIENT_APP) -a -e $(TRACI_TESTCLIENT_APP)D ]; then ln -s $(TRACI_TESTCLIENT_APP)D $(TRACI_TESTCLIENT_APP); fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --cc docs/tutorial/traci_tls/runner.py
index 68dc624,fbc5865..7a37fa8
--- a/docs/tutorial/traci_tls/runner.py
+++ b/docs/tutorial/traci_tls/runner.py
@@@ -71,14 -73,14 +73,23 @@@ def generate_routefile()
vehNr += 1
lastVeh = i
if random.uniform(0, 1) < pNS:
- print >> routes, ' <vehicle id="down_%i" type="typeNS" route="down" depart="%i" color="1,0,0"/>' % (
- vehNr, i)
+ print(' <vehicle id="down_%i" type="typeNS" route="down" depart="%i" color="1,0,0"/>' % (
+ vehNr, i), file=routes)
vehNr += 1
lastVeh = i
- print >> routes, "</routes>"
+ print("</routes>", file=routes)
+
+ # The program looks like this
+ # <tlLogic id="0" type="static" programID="0" offset="0">
++# the locations of the tls are NESW
++# <phase duration="31" state="GrGr"/>
++# <phase duration="6" state="yryr"/>
++# <phase duration="31" state="rGrG"/>
++# <phase duration="6" state="ryry"/>
++# </tlLogic>
+
+# The program looks like this
+# <tlLogic id="0" type="static" programID="0" offset="0">
# the locations of the tls are NESW
# <phase duration="31" state="GrGr"/>
# <phase duration="6" state="yryr"/>
diff --cc src/guinetload/GUITriggerBuilder.cpp
index ec285c6,3ab3276..ae75803
--- a/src/guinetload/GUITriggerBuilder.cpp
+++ b/src/guinetload/GUITriggerBuilder.cpp
@@@ -75,40 -75,37 +75,51 @@@ GUITriggerBuilder::buildRerouter(MSNet
return rr;
}
-
void
- GUITriggerBuilder::buildBusStop(MSNet& net, const std::string& id,
- const std::vector<std::string>& lines,
- MSLane* lane,
- SUMOReal frompos, SUMOReal topos) {
-
- GUIBusStop* stop = new GUIBusStop(id, lines, *lane, frompos, topos);
- if (!net.addBusStop(stop)) {
- delete stop;
- throw InvalidArgument("Could not build bus stop '" + id + "'; probably declared twice.");
+ GUITriggerBuilder::buildStoppingPlace(MSNet& net, const std::string& id, const std::vector<std::string>& lines,
+ MSLane* lane, SUMOReal frompos, SUMOReal topos, const SumoXMLTag element) {
+ bool success = false;
+ GUIGlObject* o = 0;
+ if (element == SUMO_TAG_CONTAINER_STOP) {
+ GUIContainerStop* stop = new GUIContainerStop(id, lines, *lane, frompos, topos);
+ success = net.addContainerStop(stop);
+ o = stop;
+ myCurrentStop = stop;
+ } else {
+ GUIBusStop* stop = new GUIBusStop(id, lines, *lane, frompos, topos);
+ success = net.addBusStop(stop);
+ o = stop;
+ myCurrentStop = stop;
}
- static_cast<GUINet&>(net).getVisualisationSpeedUp().addAdditionalGLObject(stop);
+ if (!success) {
+ delete o;
+ throw InvalidArgument("Could not build " + toString(element) + " stop '" + id + "'; probably declared twice.");
+ }
+ static_cast<GUINet&>(net).getVisualisationSpeedUp().addAdditionalGLObject(o);
}
+
void
- GUITriggerBuilder::buildContainerStop(MSNet& net, const std::string& id,
- const std::vector<std::string>& lines,
- MSLane* lane,
- SUMOReal frompos, SUMOReal topos) {
- GUIContainerStop* stop = new GUIContainerStop(id, lines, *lane, frompos, topos);
- if (!net.addContainerStop(stop)) {
- delete stop;
- throw InvalidArgument("Could not build container stop '" + id + "'; probably declared twice.");
+ GUITriggerBuilder::buildChargingStation(MSNet& net, const std::string& id,
+ const std::vector<std::string>& lines,
+ MSLane* lane,
+ SUMOReal frompos, SUMOReal topos, SUMOReal chrgpower, SUMOReal efficiency, SUMOReal chargeInTransit, SUMOReal chargeDelay) {
+ GUIChargingStation* chrg = new GUIChargingStation(id, lines, *lane, frompos, topos, chrgpower, efficiency, chargeInTransit, chargeDelay);
++
++ if (!net.addChargingStation(chrg)) {
++ delete chrg;
++ throw InvalidArgument("Could not build charging station '" + id + "'; probably declared twice.");
+ }
- static_cast<GUINet&>(net).getVisualisationSpeedUp().addAdditionalGLObject(stop);
- }
+
++ static_cast<GUINet&>(net).getVisualisationSpeedUp().addAdditionalGLObject(chrg);
++}
+
+void
+GUITriggerBuilder::buildChargingStation(MSNet& net, const std::string& id,
+ const std::vector<std::string>& lines,
+ MSLane* lane,
+ SUMOReal frompos, SUMOReal topos, SUMOReal chrgpower, SUMOReal efficiency, SUMOReal chargeInTransit, SUMOReal chargeDelay) {
+ GUIChargingStation* chrg = new GUIChargingStation(id, lines, *lane, frompos, topos, chrgpower, efficiency, chargeInTransit, chargeDelay);
if (!net.addChargingStation(chrg)) {
delete chrg;
diff --cc src/guinetload/GUITriggerBuilder.h
index d9ffba2,8009d1c..657e6fb
--- a/src/guinetload/GUITriggerBuilder.h
+++ b/src/guinetload/GUITriggerBuilder.h
@@@ -104,57 -104,41 +104,62 @@@ protected
/** @brief Builds a bus stop
*
- * Simply calls the GUIBusStop constructor.
+ * Simply calls the GUIBusStop / GUIContainerStop constructor.
*
- * @param[in] net The net the bus stop belongs to
- * @param[in] id The id of the bus stop
- * @param[in] lines Names of the bus lines that halt on this bus stop
- * @param[in] lane The lane the bus stop is placed on
- * @param[in] frompos Begin position of the bus stop on the lane
- * @param[in] topos End position of the bus stop on the lane
- * @exception InvalidArgument If the bus stop can not be added to the net (is duplicate)
+ * @param[in] net The net the stop belongs to
+ * @param[in] id The id of the stop
+ * @param[in] lines Names of the lines that halt on this stop
+ * @param[in] lane The lane the stop is placed on
+ * @param[in] frompos Begin position of the stop on the lane
+ * @param[in] topos End position of the stop on the lane
+ * @param[in] element which kind of stop is to be built
+ * @exception InvalidArgument If the stop can not be added to the net (is duplicate)
*/
- virtual void buildBusStop(MSNet& net, const std::string& id,
- const std::vector<std::string>& lines, MSLane* lane,
- SUMOReal frompos, SUMOReal topos);
+ virtual void buildStoppingPlace(MSNet& net, const std::string& id,
+ const std::vector<std::string>& lines, MSLane* lane,
+ SUMOReal frompos, SUMOReal topos, const SumoXMLTag element);
- /** @brief Builds a container stop
+ /** @brief Builds a charging station
*
- * Simply calls the GUIContainerStop constructor.
+ * Simply calls the ChrgSTN constructor.
*
- * @param[in] net The net the container stop belongs to
- * @param[in] id The id of the container stop
- * @param[in] lines Names of the lines that halt on this container stop
- * @param[in] lane The lane the container stop is placed on
- * @param[in] frompos Begin position of the container stop on the lane
- * @param[in] topos End position of the container stop on the lane
- * @exception InvalidArgument If the container stop can not be added to the net (is duplicate)
+ * @param[in] net The net the charging station belongs to
+ * @param[in] id The id of the charging station
+ * @param[in] lines Names of the bus lines that halt on this charging station
+ * @param[in] lane The lane the charging station is placed on
+ * @param[in] frompos Begin position of the charging station on the lane
+ * @param[in] topos End position of the charging station on the lane
+ * @param[in]
+ * @param[in] FALTAN ARGUMENTOS DE LA LLAMADA A FUNCION
+ * @param[in]
+ * @param[in]
+ * @exception InvalidArgument If the charging station can not be added to the net (is duplicate)
*/
- virtual void buildContainerStop(MSNet& net, const std::string& id,
- const std::vector<std::string>& lines, MSLane* lane,
- SUMOReal frompos, SUMOReal topos);
-
+ virtual void buildChargingStation(MSNet& net, const std::string& id,
+ const std::vector<std::string>& lines, MSLane* lane,
+ SUMOReal frompos, SUMOReal topos, SUMOReal chrgpower, SUMOReal efficiency,
++ SUMOReal chargeInTransit, SUMOReal chargeDelay);
+
+ /** @brief Builds a charging station
+ *
+ * Simply calls the ChrgSTN constructor.
+ *
+ * @param[in] net The net the charging station belongs to
+ * @param[in] id The id of the charging station
+ * @param[in] lines Names of the bus lines that halt on this charging station
+ * @param[in] lane The lane the charging station is placed on
+ * @param[in] frompos Begin position of the charging station on the lane
+ * @param[in] topos End position of the charging station on the lane
+ * @param[in]
+ * @param[in] FALTAN ARGUMENTOS DE LA LLAMADA A FUNCION
+ * @param[in]
+ * @param[in]
+ * @exception InvalidArgument If the charging station can not be added to the net (is duplicate)
+ */
+ virtual void buildChargingStation(MSNet& net, const std::string& id,
+ const std::vector<std::string>& lines, MSLane* lane,
+ SUMOReal frompos, SUMOReal topos, SUMOReal chrgpower, SUMOReal efficiency,
SUMOReal chargeInTransit, SUMOReal chargeDelay);
/** @brief builds a microscopic calibrator
diff --cc src/guisim/GUILane.cpp
index 133b227,0833b54..b7243da
--- a/src/guisim/GUILane.cpp
+++ b/src/guisim/GUILane.cpp
@@@ -423,10 -423,8 +423,9 @@@ GUILane::drawGL(const GUIVisualizationS
bool mustDrawMarkings = false;
SUMOReal exaggeration = s.laneWidthExaggeration;
if (MSGlobals::gUseMesoSim) {
+#ifdef HAVE_INTERNAL
GUIEdge* myGUIEdge = dynamic_cast<GUIEdge*>(myEdge);
exaggeration *= s.edgeScaler.getScheme().getColor(myGUIEdge->getScaleValue(s.edgeScaler.getActive()));
- #endif
} else {
exaggeration *= s.laneScaler.getScheme().getColor(getScaleValue(s.laneScaler.getActive()));
}
diff --cc src/marouter/ROMAAssignments.cpp
index 24e075d,9f285a4..36307c6
--- a/src/marouter/ROMAAssignments.cpp
+++ b/src/marouter/ROMAAssignments.cpp
@@@ -69,60 -70,60 +70,112 @@@ ROMAAssignments::~ROMAAssignments()
delete myDefaultVehicle;
}
- // based on the definitions in PTV-Validate and in the VISUM-K�ln network
+ // based on the definitions in PTV-Validate and in the VISUM-Cologne network
+ SUMOReal
+ ROMAAssignments::getCapacity(const ROEdge* edge) {
+ if (edge->getFunc() == ROEdge::ET_DISTRICT) {
+ return 0;
+ }
+ const int roadClass = -edge->getPriority();
+ // TODO: differ road class 1 from the unknown road class 1!!!
+ if (edge->getLaneNo() == 0) {
+ // TAZ have no cost
+ return 0;
+ } else if (roadClass == 0 || roadClass == 1) {
+ return edge->getLaneNo() * 2000.; //CR13 in table.py
+ } else if (roadClass == 2 && edge->getSpeed() <= 11.) {
+ return edge->getLaneNo() * 1333.33; //CR5 in table.py
+ } else if (roadClass == 2 && edge->getSpeed() > 11. && edge->getSpeed() <= 16.) {
+ return edge->getLaneNo() * 1500.; //CR3 in table.py
+ } else if (roadClass == 2 && edge->getSpeed() > 16.) {
+ return edge->getLaneNo() * 2000.; //CR13 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() <= 11.) {
+ return edge->getLaneNo() * 800.; //CR5 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() > 11. && edge->getSpeed() <= 13.) {
+ return edge->getLaneNo() * 875.; //CR5 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() > 13. && edge->getSpeed() <= 16.) {
+ return edge->getLaneNo() * 1500.; //CR4 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() > 16.) {
+ return edge->getLaneNo() * 1800.; //CR13 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() <= 5.) {
+ return edge->getLaneNo() * 200.; //CR7 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 5. && edge->getSpeed() <= 7.) {
+ return edge->getLaneNo() * 412.5; //CR7 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 7. && edge->getSpeed() <= 9.) {
+ return edge->getLaneNo() * 600.; //CR6 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 9. && edge->getSpeed() <= 11.) {
+ return edge->getLaneNo() * 800.; //CR5 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 11. && edge->getSpeed() <= 13.) {
+ return edge->getLaneNo() * 1125.; //CR5 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 13. && edge->getSpeed() <= 16.) {
+ return edge->getLaneNo() * 1583.; //CR4 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 16. && edge->getSpeed() <= 18.) {
+ return edge->getLaneNo() * 1100.; //CR3 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 18. && edge->getSpeed() <= 22.) {
+ return edge->getLaneNo() * 1200.; //CR3 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 22. && edge->getSpeed() <= 26.) {
+ return edge->getLaneNo() * 1300.; //CR3 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 26.) {
+ return edge->getLaneNo() * 1400.; //CR3 in table.py
+ }
+ return edge->getLaneNo() * 800.; //CR5 in table.py
+ }
+
+
+ // based on the definitions in PTV-Validate and in the VISUM-Cologne network
SUMOReal
+ROMAAssignments::getCapacity(const ROEdge* edge) {
+ if (edge->getFunc() == ROEdge::ET_DISTRICT) {
+ return 0;
+ }
+ const int roadClass = -edge->getPriority();
+ // TODO: differ road class 1 from the unknown road class 1!!!
+ if (edge->getLaneNo() == 0) {
+ // TAZ have no cost
+ return 0;
+ } else if (roadClass == 0 || roadClass == 1) {
+ return edge->getLaneNo() * 2000.; //CR13 in table.py
+ } else if (roadClass == 2 && edge->getSpeed() <= 11.) {
+ return edge->getLaneNo() * 1333.33; //CR5 in table.py
+ } else if (roadClass == 2 && edge->getSpeed() > 11. && edge->getSpeed() <= 16.) {
+ return edge->getLaneNo() * 1500.; //CR3 in table.py
+ } else if (roadClass == 2 && edge->getSpeed() > 16.) {
+ return edge->getLaneNo() * 2000.; //CR13 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() <= 11.) {
+ return edge->getLaneNo() * 800.; //CR5 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() > 11. && edge->getSpeed() <= 13.) {
+ return edge->getLaneNo() * 875.; //CR5 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() > 13. && edge->getSpeed() <= 16.) {
+ return edge->getLaneNo() * 1500.; //CR4 in table.py
+ } else if (roadClass == 3 && edge->getSpeed() > 16.) {
+ return edge->getLaneNo() * 1800.; //CR13 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() <= 5.) {
+ return edge->getLaneNo() * 200.; //CR7 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 5. && edge->getSpeed() <= 7.) {
+ return edge->getLaneNo() * 412.5; //CR7 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 7. && edge->getSpeed() <= 9.) {
+ return edge->getLaneNo() * 600.; //CR6 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 9. && edge->getSpeed() <= 11.) {
+ return edge->getLaneNo() * 800.; //CR5 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 11. && edge->getSpeed() <= 13.) {
+ return edge->getLaneNo() * 1125.; //CR5 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 13. && edge->getSpeed() <= 16.) {
+ return edge->getLaneNo() * 1583.; //CR4 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 16. && edge->getSpeed() <= 18.) {
+ return edge->getLaneNo() * 1100.; //CR3 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 18. && edge->getSpeed() <= 22.) {
+ return edge->getLaneNo() * 1200.; //CR3 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 22. && edge->getSpeed() <= 26.) {
+ return edge->getLaneNo() * 1300.; //CR3 in table.py
+ } else if ((roadClass >= 4 || roadClass == -1) && edge->getSpeed() > 26.) {
+ return edge->getLaneNo() * 1400.; //CR3 in table.py
+ }
+ return edge->getLaneNo() * 800.; //CR5 in table.py
+}
+
+
+// based on the definitions in PTV-Validate and in the VISUM-K�ln network
+SUMOReal
ROMAAssignments::capacityConstraintFunction(const ROEdge* edge, const SUMOReal flow) const {
if (edge->getFunc() == ROEdge::ET_DISTRICT) {
return 0;
diff --cc src/marouter/ROMARouteHandler.h
index fbd5a0b,987884a..0000000
deleted file mode 100644,100644
--- a/src/marouter/ROMARouteHandler.h
+++ /dev/null
@@@ -1,94 -1,94 +1,0 @@@
--/****************************************************************************/
--/// @file ROMARouteHandler.h
--/// @author Daniel Krajzewicz
--/// @author Jakob Erdmann
--/// @author Michael Behrisch
--/// @date Mon, 9 Jul 2001
- /// @version $Id: ROMARouteHandler.h 18530 2015-07-07 05:05:19Z behrisch $
-/// @version $Id: ROMARouteHandler.h 20433 2016-04-13 08:00:14Z behrisch $
--///
--// Parser and container for routes during their loading
--/****************************************************************************/
--// SUMO, Simulation of Urban MObility; see http://sumo.dlr.de/
- // Copyright (C) 2001-2015 DLR (http://www.dlr.de/) and contributors
-// Copyright (C) 2001-2016 DLR (http://www.dlr.de/) and contributors
--/****************************************************************************/
--//
--// This file is part of SUMO.
--// SUMO is free software: you can redistribute it and/or modify
--// it under the terms of the GNU General Public License as published by
--// the Free Software Foundation, either version 3 of the License, or
--// (at your option) any later version.
--//
--/****************************************************************************/
--#ifndef ROMARouteHandler_h
--#define ROMARouteHandler_h
--
--
--// ===========================================================================
--// included modules
--// ===========================================================================
--#ifdef _MSC_VER
--#include <windows_config.h>
--#else
--#include <config.h>
--#endif
--
--#include <utils/xml/SUMOSAXHandler.h>
--
--
--// ===========================================================================
--// class declarations
--// ===========================================================================
--class ODMatrix;
--
--
--// ===========================================================================
--// class definitions
--// ===========================================================================
--/**
-- * @class ROMARouteHandler
-- * @brief Parser and container for routes during their loading
-- *
-- * ROMARouteHandler transforms vehicles, trips and flows into contributions
-- * to an ODMatrix.
-- */
--class ROMARouteHandler : public SUMOSAXHandler {
--public:
-- /// standard constructor
-- ROMARouteHandler(ODMatrix& matrix);
--
-- /// standard destructor
-- virtual ~ROMARouteHandler();
--
--protected:
-- /// @name inherited from GenericSAXHandler
-- //@{
--
-- /** @brief Called on the opening of a tag;
-- *
-- * @param[in] element ID of the currently opened element
-- * @param[in] attrs Attributes within the currently opened element
-- * @exception ProcessError If something fails
-- * @see GenericSAXHandler::myStartElement
-- */
-- void myStartElement(int element, const SUMOSAXAttributes& attrs);
-- //@}
--
--
--protected:
-- /// @brief The current route
-- ODMatrix& myMatrix;
--
--private:
-- /// @brief Invalidated copy constructor
-- ROMARouteHandler(const ROMARouteHandler& s);
--
-- /// @brief Invalidated assignment operator
-- ROMARouteHandler& operator=(const ROMARouteHandler& s);
--
--};
--
--
--#endif
--
--/****************************************************************************/
--
diff --cc src/microsim/MSNet.cpp
index 7eed49f,31f1432..d47e044
--- a/src/microsim/MSNet.cpp
+++ b/src/microsim/MSNet.cpp
@@@ -604,15 -597,16 +597,22 @@@ MSNet::writeOutput()
// check emission dumps
if (OptionsCont::getOptions().isSet("emission-output")) {
- MSEmissionExport::write(OutputDevice::getDeviceByOption("emission-output"), myStep);
+ MSEmissionExport::write(OutputDevice::getDeviceByOption("emission-output"), myStep,
+ oc.getInt("emission-output.precision"));
+ }
+
+ // battery dumps
+ if (OptionsCont::getOptions().isSet("battery-output")) {
+ MSBatteryExport::write(OutputDevice::getDeviceByOption("battery-output"), myStep,
+ oc.getInt("battery-output.precision"));
}
+ // battery dumps
+ if (OptionsCont::getOptions().isSet("battery-output")) {
+ MSBatteryExport::write(OutputDevice::getDeviceByOption("battery-output"), myStep,
+ oc.getInt("battery-output.precision"));
+ }
+
// check full dumps
if (OptionsCont::getOptions().isSet("full-output")) {
MSFullExport::write(OutputDevice::getDeviceByOption("full-output"), myStep);
diff --cc src/microsim/MSVehicle.cpp
index 2958aa1,0496af8..5aa150d
--- a/src/microsim/MSVehicle.cpp
+++ b/src/microsim/MSVehicle.cpp
@@@ -353,29 -447,31 +447,51 @@@ MSVehicle::Influencer::postProcessVTD(M
}
myVTDLane->forceVehicleInsertion(v, myVTDPos);
v->updateBestLanes();
- myAmVTDControlled = false;
+ // inverse of GeomHelper::naviDegree
+ v->setAngle(M_PI / 2. - DEG2RAD(myVTDAngle));
+ }
+
+
+ SUMOReal
+ MSVehicle::Influencer::implicitSpeedVTD(const MSVehicle* veh, SUMOReal oldSpeed) {
+ const SUMOReal dist = veh->getDistanceToPosition(myVTDPos, &myVTDLane->getEdge());
+ if (DIST2SPEED(dist) > veh->getMaxSpeed()) {
+ return oldSpeed;
+ } else {
+ return DIST2SPEED(dist);
+ }
+ }
+
+ SUMOReal
+ MSVehicle::Influencer::implicitDeltaPosVTD(const MSVehicle* veh) {
+ const SUMOReal dist = veh->getDistanceToPosition(myVTDPos, &myVTDLane->getEdge());
+ if (DIST2SPEED(dist) > veh->getMaxSpeed()) {
+ return 0;
+ } else {
+ return dist;
+ }
}
+SUMOReal
+MSVehicle::Influencer::implicitSpeedVTD(const MSVehicle* veh, SUMOReal oldSpeed) {
+ const SUMOReal dist = veh->getDistanceToPosition(myVTDPos, &myVTDLane->getEdge());
+ if (DIST2SPEED(dist) > veh->getMaxSpeed()) {
+ return oldSpeed;
+ } else {
+ return DIST2SPEED(dist);
+ }
+}
+
+SUMOReal
+MSVehicle::Influencer::implicitDeltaPosVTD(const MSVehicle* veh) {
+ const SUMOReal dist = veh->getDistanceToPosition(myVTDPos, &myVTDLane->getEdge());
+ if (DIST2SPEED(dist) > veh->getMaxSpeed()) {
+ return 0;
+ } else {
+ return dist;
+ }
+}
+
#endif
@@@ -2486,6 -2721,6 +2741,9 @@@ MSVehicle::addTraciStop(MSLane* const l
newStop.containerTriggered = containerTriggered;
newStop.parking = parking;
newStop.index = STOP_INDEX_FIT;
++ newStop.lane = bs->getLane().getID();
++ newStop.endPos = bs->getEndLanePosition();
++ newStop.startPos = bs->getBeginLanePosition();
const bool result = addStop(newStop, errorMsg);
if (myLane != 0) {
updateBestLanes(true);
diff --cc src/microsim/traffic_lights/MSTrafficLightLogic.cpp
index 7b426be,d2d3cce..295517b
--- a/src/microsim/traffic_lights/MSTrafficLightLogic.cpp
+++ b/src/microsim/traffic_lights/MSTrafficLightLogic.cpp
@@@ -167,7 -171,6 +171,14 @@@ MSTrafficLightLogic::init(NLDetectorBui
break;
}
}
++ for (int j = 0; j < (int)foundGreen.size(); ++j) {
++ if (!foundGreen[j]) {
++ WRITE_WARNING("Missing green phase in tlLogic '" + getID()
++ + "', program '" + getProgramID() + "' for tl-index " + toString(j));
++ break;
++ }
++ }
+
}
}
diff --cc src/netbuild/NBEdge.cpp
index 27efa2f,d2556e5..35154bb
--- a/src/netbuild/NBEdge.cpp
+++ b/src/netbuild/NBEdge.cpp
@@@ -1587,10 -1593,14 +1593,59 @@@ NBEdge::recheckLanes()
i = myConnections.erase(i);
}
}
+ } else if (isRailway(getPermissions(c.fromLane)) && isRailway(c.toEdge->getPermissions(c.toLane))
+ && isTurningDirectionAt(c.toEdge)) {
+ // do not allow sharp rail turns
+ i = myConnections.erase(i);
+ } else {
+ ++i;
+ }
+ }
++ // check restrictions
++ for (std::vector<Connection>::iterator i = myConnections.begin(); i != myConnections.end();) {
++ Connection& c = *i;
++ const SVCPermissions common = getPermissions(c.fromLane) & c.toEdge->getPermissions(c.toLane);
++ if (common == SVC_PEDESTRIAN || getPermissions(c.fromLane) == SVC_PEDESTRIAN) {
++ // these are computed in NBNode::buildWalkingAreas
++ i = myConnections.erase(i);
++ } else if (common == 0) {
++ // no common permissions.
++ // try to find a suitable target lane to the right
++ const int origToLane = c.toLane;
++ c.toLane = -1; // ignore this connection when calling hasConnectionTo
++ int toLane = origToLane;
++ while (toLane > 0
++ && (getPermissions(c.fromLane) & c.toEdge->getPermissions(toLane)) == 0
++ && !hasConnectionTo(c.toEdge, toLane)
++ ) {
++ toLane--;
++ }
++ if ((getPermissions(c.fromLane) & c.toEdge->getPermissions(toLane)) != 0
++ && !hasConnectionTo(c.toEdge, toLane)) {
++ c.toLane = toLane;
++ ++i;
++ } else {
++ // try to find a suitable target lane to the left
++ int toLane = origToLane;
++ while (toLane < (int)c.toEdge->getNumLanes() - 1
++ && (getPermissions(c.fromLane) & c.toEdge->getPermissions(toLane)) == 0
++ && !hasConnectionTo(c.toEdge, toLane)
++ ) {
++ toLane++;
++ }
++ if ((getPermissions(c.fromLane) & c.toEdge->getPermissions(toLane)) != 0
++ && !hasConnectionTo(c.toEdge, toLane)) {
++ c.toLane = toLane;
++ ++i;
++ } else {
++ // no alternative target found
++ i = myConnections.erase(i);
++ }
++ }
+ } else {
+ ++i;
+ }
+ }
}
// check delayed removals
for (std::vector<Connection>::iterator it = myConnectionsToDelete.begin(); it != myConnectionsToDelete.end(); ++it) {
diff --cc src/netbuild/NBOwnTLDef.cpp
index 5871f8e,74ceb4c..fd2a223
--- a/src/netbuild/NBOwnTLDef.cpp
+++ b/src/netbuild/NBOwnTLDef.cpp
@@@ -601,79 -570,129 +580,201 @@@ NBOwnTLDef::initNeedsContRelation() con
}
myNeedsContRelationReady = true;
}
+ }
+
+
+ EdgeVector
+ NBOwnTLDef::getConnectedOuterEdges(const EdgeVector& incoming) {
+ EdgeVector result = incoming;
+ for (EdgeVector::iterator it = result.begin(); it != result.end();) {
+ if ((*it)->getConnections().size() == 0 || (*it)->isInnerEdge()) {
+ it = result.erase(it);
+ } else {
+ ++it;
+ }
+ }
+ return result;
+ }
+
+
+ std::string
+ NBOwnTLDef::allowFollowersOfChosen(std::string state, const EdgeVector& fromEdges, const EdgeVector& toEdges) {
+ bool check = true;
+ while (check) {
+ check = false;
+ for (int i1 = 0; i1 < (int)fromEdges.size(); ++i1) {
+ if (state[i1] == 'G') {
+ continue;
+ }
+ bool followsChosen = false;
+ for (int i2 = 0; i2 < (int)fromEdges.size() && !followsChosen; ++i2) {
+ if (state[i2] == 'G' && fromEdges[i1] == toEdges[i2]) {
+ followsChosen = true;
+ }
+ }
+ if (followsChosen) {
+ state[i1] = 'G';
+ check = true;
+ }
+ }
+ }
+ return state;
+ }
+
+ std::string
+ NBOwnTLDef::correctConflicting(std::string state, const EdgeVector& fromEdges, const EdgeVector& toEdges,
+ const std::vector<bool>& isTurnaround,
+ const std::vector<int>& fromLanes,
+ const std::vector<bool>& hadGreenMajor,
+ bool& haveForbiddenLeftMover,
+ std::vector<bool>& rightTurnConflicts) {
+ const bool controlledWithin = !OptionsCont::getOptions().getBool("tls.uncontrolled-within");
+ for (int i1 = 0; i1 < (int)fromEdges.size(); ++i1) {
+ if (state[i1] == 'G') {
+ for (int i2 = 0; i2 < (int)fromEdges.size(); ++i2) {
+ if ((state[i2] == 'G' || state[i2] == 'g')) {
+ if (NBNode::rightTurnConflict(
+ fromEdges[i1], toEdges[i1], fromLanes[i1], fromEdges[i2], toEdges[i2], fromLanes[i2])) {
+ rightTurnConflicts[i1] = true;
+ }
+ if (forbids(fromEdges[i2], toEdges[i2], fromEdges[i1], toEdges[i1], true, controlledWithin) || rightTurnConflicts[i1]) {
+ state[i1] = 'g';
+ myNeedsContRelation.insert(StreamPair(fromEdges[i1], toEdges[i1], fromEdges[i2], toEdges[i2]));
+ if (!isTurnaround[i1] && !hadGreenMajor[i1]) {
+ haveForbiddenLeftMover = true;
+ }
+ }
+ }
+ }
+ }
+ if (state[i1] == 'r') {
+ if (fromEdges[i1]->getToNode()->getType() == NODETYPE_TRAFFIC_LIGHT_RIGHT_ON_RED &&
+ fromEdges[i1]->getToNode()->getDirection(fromEdges[i1], toEdges[i1]) == LINKDIR_RIGHT) {
+ // handle right-on-red conflicts
+ state[i1] = 's';
+ for (int i2 = 0; i2 < (int)fromEdges.size(); ++i2) {
+ if (state[i2] == 'G' && !isTurnaround[i2] &&
+ (forbids(fromEdges[i2], toEdges[i2], fromEdges[i1], toEdges[i1], true) || forbids(fromEdges[i1], toEdges[i1], fromEdges[i2], toEdges[i2], true))) {
+ myRightOnRedConflicts.insert(std::make_pair(i1, i2));
+ }
+ }
+ }
+ }
+ }
+ return state;
+ }
+
+
+ void
+ NBOwnTLDef::addPedestrianScramble(NBTrafficLightLogic* logic, unsigned int noLinksAll, SUMOTime /* greenTime */, SUMOTime brakingTime,
+ const std::vector<NBNode::Crossing>& crossings, const EdgeVector& fromEdges, const EdgeVector& toEdges) {
+ const int vehLinks = noLinksAll - (int)crossings.size();
+ std::vector<bool> foundGreen(crossings.size(), false);
+ const std::vector<NBTrafficLightLogic::PhaseDefinition>& phases = logic->getPhases();
+ for (int i = 0; i < (int)phases.size(); ++i) {
+ const std::string state = phases[i].state;
+ for (int j = 0; j < (int)crossings.size(); ++j) {
+ LinkState ls = (LinkState)state[vehLinks + j];
+ if (ls == LINKSTATE_TL_GREEN_MAJOR || ls == LINKSTATE_TL_GREEN_MINOR) {
+ foundGreen[j] = true;
+ }
+ }
+ }
+ for (int j = 0; j < (int)foundGreen.size(); ++j) {
+ if (!foundGreen[j]) {
+
+ // add a phase where all pedestrians may walk, (preceded by a yellow phase and followed by a clearing phase)
+ if (phases.size() > 0) {
+ bool needYellowPhase = false;
+ std::string state = phases.back().state;
+ for (int i1 = 0; i1 < vehLinks; ++i1) {
+ if (state[i1] == 'G' || state[i1] == 'g') {
+ state[i1] = 'y';
+ needYellowPhase = true;
+ }
+ }
+ // add yellow step
+ if (needYellowPhase) {
+ logic->addStep(brakingTime, state);
+ }
+ }
+ addPedestrianPhases(logic, TIME2STEPS(10), std::string(noLinksAll, 'r'), crossings, fromEdges, toEdges);
+ break;
+ }
+ }
}
+
+EdgeVector
+NBOwnTLDef::getConnectedOuterEdges(const EdgeVector& incoming) {
+ EdgeVector result = incoming;
+ // do not sele
+ for (EdgeVector::iterator it = result.begin(); it != result.end();) {
+ if ((*it)->getConnections().size() == 0 || (*it)->isInnerEdge()) {
+ it = result.erase(it);
+ } else {
+ ++it;
+ }
+ }
+ return result;
+}
+
+
+std::string
+NBOwnTLDef::allowFollowersOfChosen(std::string state, const EdgeVector& fromEdges, const EdgeVector& toEdges) {
+ bool check = true;
+ while (check) {
+ check = false;
+ for (int i1 = 0; i1 < (int)fromEdges.size(); ++i1) {
+ if (state[i1] == 'G') {
+ continue;
+ }
+ bool followsChosen = false;
+ for (int i2 = 0; i2 < (int)fromEdges.size() && !followsChosen; ++i2) {
+ if (state[i2] == 'G' && fromEdges[i1] == toEdges[i2]) {
+ followsChosen = true;
+ }
+ }
+ if (followsChosen) {
+ state[i1] = 'G';
+ check = true;
+ }
+ }
+ }
+ return state;
+}
+
+
+std::string
+NBOwnTLDef::correctConflicting(std::string state, const EdgeVector& fromEdges, const EdgeVector& toEdges,
+ const std::vector<bool>& isTurnaround,
+ const std::vector<int>& fromLanes,
+ const std::vector<bool>& hadGreenMajor,
+ bool& haveForbiddenLeftMover,
+ std::vector<bool>& rightTurnConflicts) {
+ const bool controlledWithin = !OptionsCont::getOptions().getBool("tls.uncontrolled-within");
+ for (int i1 = 0; i1 < (int)fromEdges.size(); ++i1) {
+ if (state[i1] != 'G') {
+ continue;
+ }
+ for (int i2 = 0; i2 < (int)fromEdges.size(); ++i2) {
+ if ((state[i2] == 'G' || state[i2] == 'g')) {
+ if (NBNode::rightTurnConflict(
+ fromEdges[i1], toEdges[i1], fromLanes[i1], fromEdges[i2], toEdges[i2], fromLanes[i2])) {
+ rightTurnConflicts[i1] = true;
+ }
+ if (forbids(fromEdges[i2], toEdges[i2], fromEdges[i1], toEdges[i1], true, controlledWithin) || rightTurnConflicts[i1]) {
+ state[i1] = 'g';
+ myNeedsContRelation.insert(StreamPair(fromEdges[i1], toEdges[i1], fromEdges[i2], toEdges[i2]));
+ if (!isTurnaround[i1] && !hadGreenMajor[i1]) {
+ haveForbiddenLeftMover = true;
+ }
+ }
+ }
+ }
+ }
+ return state;
+}
+
/****************************************************************************/
diff --cc src/netload/NLHandler.cpp
index 0667f06,360a404..f9aca93
--- a/src/netload/NLHandler.cpp
+++ b/src/netload/NLHandler.cpp
@@@ -161,14 -161,16 +161,19 @@@ NLHandler::myStartElement(int element
myTriggerBuilder.parseAndBuildRerouter(myNet, attrs, getFileName());
break;
case SUMO_TAG_BUS_STOP:
- myTriggerBuilder.parseAndBuildBusStop(myNet, attrs);
- break;
+ case SUMO_TAG_TRAIN_STOP:
case SUMO_TAG_CONTAINER_STOP:
- myTriggerBuilder.parseAndBuildContainerStop(myNet, attrs);
+ myTriggerBuilder.parseAndBuildStoppingPlace(myNet, attrs, (SumoXMLTag)element);
+ break;
+ case SUMO_TAG_ACCESS:
+ myTriggerBuilder.addAccess(myNet, attrs);
+ break;
+ case SUMO_TAG_CHARGING_STATION:
+ myTriggerBuilder.parseAndBuildChargingStation(myNet, attrs);
break;
+ case SUMO_TAG_CHARGING_STATION:
+ myTriggerBuilder.parseAndBuildChargingStation(myNet, attrs);
+ break;
case SUMO_TAG_VTYPEPROBE:
addVTypeProbeDetector(attrs);
break;
diff --cc src/polyconvert/PCLoaderOSM.cpp
index 3772e12,74717fc..cc3530f
--- a/src/polyconvert/PCLoaderOSM.cpp
+++ b/src/polyconvert/PCLoaderOSM.cpp
@@@ -434,18 -434,18 +434,44 @@@ PCLoaderOSM::RelationsHandler::myEndEle
// definitions of PCLoaderOSM::EdgesHandler-methods
// ---------------------------------------------------------------------------
PCLoaderOSM::EdgesHandler::EdgesHandler(const std::map<long long int, PCOSMNode*>& osmNodes,
+ EdgeMap& toFill,
+ const RelationsMap& additionalWays,
+ bool withAttributes, MsgHandler& errorHandler) :
+ SUMOSAXHandler("osm - file"),
+ myWithAttributes(withAttributes),
+ myErrorHandler(errorHandler),
+ myOSMNodes(osmNodes),
+ myEdgeMap(toFill),
+ myAdditionalWays(additionalWays) {
+ }
+
+
++void
++PCLoaderOSM::RelationsHandler::myEndElement(int element) {
++ myParentElements.pop_back();
++ if (element == SUMO_TAG_RELATION) {
++ myCurrentRelation = 0;
++ myCurrentWays.clear();
++ }
++}
++
++
++// ---------------------------------------------------------------------------
++// definitions of PCLoaderOSM::EdgesHandler-methods
++// ---------------------------------------------------------------------------
++PCLoaderOSM::EdgesHandler::EdgesHandler(const std::map<long long int, PCOSMNode*>& osmNodes,
+ EdgeMap& toFill,
+ const RelationsMap& additionalWays,
+ bool withAttributes, MsgHandler& errorHandler) :
+ SUMOSAXHandler("osm - file"),
+ myWithAttributes(withAttributes),
+ myErrorHandler(errorHandler),
+ myOSMNodes(osmNodes),
+ myEdgeMap(toFill),
+ myAdditionalWays(additionalWays)
+{ }
+
+
PCLoaderOSM::EdgesHandler::~EdgesHandler() {
}
diff --cc src/router/ROEdge.h
index 26b6db4,7ae2bcf..4011f13
--- a/src/router/ROEdge.h
+++ b/src/router/ROEdge.h
@@@ -406,11 -410,8 +410,9 @@@ public
return myEdges.size();
};
- static void setGlobalOptions(
- bool interpolate,
- bool isParallel) {
+ static void setGlobalOptions(const bool interpolate) {
myInterpolate = interpolate;
+ myAmParallel = isParallel;
}
/// @brief get edge priority (road class)
diff --cc src/router/RONet.cpp
index efc2112,14e898c..4a9d448
--- a/src/router/RONet.cpp
+++ b/src/router/RONet.cpp
@@@ -93,17 -98,17 +98,33 @@@ RONet::~RONet()
myEdges.clear();
myVehicleTypes.clear();
myRoutes.clear();
- myVehicles.clear();
+ myRoutables.clear();
+ }
+
+
+ void
+ RONet::addRestriction(const std::string& id, const SUMOVehicleClass svc, const SUMOReal speed) {
+ myRestrictions[id][svc] = speed;
+ }
+
+
+ const std::map<SUMOVehicleClass, SUMOReal>*
++RONet::getRestrictions(const std::string& id) const {
++ std::map<std::string, std::map<SUMOVehicleClass, SUMOReal> >::const_iterator i = myRestrictions.find(id);
++ if (i == myRestrictions.end()) {
++ return 0;
++ }
++ return &i->second;
+}
+
+
+void
+RONet::addRestriction(const std::string& id, const SUMOVehicleClass svc, const SUMOReal speed) {
+ myRestrictions[id][svc] = speed;
+}
+
+
+const std::map<SUMOVehicleClass, SUMOReal>*
RONet::getRestrictions(const std::string& id) const {
std::map<std::string, std::map<SUMOVehicleClass, SUMOReal> >::const_iterator i = myRestrictions.find(id);
if (i == myRestrictions.end()) {
diff --cc src/utils/common/StdDefs.h
index 91d8f14,c5ea235..39f932b
--- a/src/utils/common/StdDefs.h
+++ b/src/utils/common/StdDefs.h
@@@ -60,11 -60,7 +60,9 @@@ const SUMOReal SUMO_const_haltingSpeed
*/
const RGBColor& getLinkColor(const LinkState& ls);
- /// @brief attach some build flags to the version string
- const std::string getBuildName(const std::string& version);
+
+
/* -------------------------------------------------------------------------
* templates for mathematical functions missing in some c++-implementations
* ----------------------------------------------------------------------- */
--
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