[sumo] 01/05: Merge tag 'upstream/0.18_dfsg'
Anton Gladky
gladk at alioth.debian.org
Fri Aug 30 20:30:54 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit 388b7e49f5086c6424844b774d938f159dacff3c
Merge: d014241 23e6778
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Fri Aug 30 21:52:17 2013 +0200
Merge tag 'upstream/0.18_dfsg'
Upstream version 0.18~dfsg
AUTHORS | 1 +
ChangeLog | 2 +-
README | 14 +-
bin/Makefile.am | 1 +
bin/Makefile.in | 2 +-
build/msvc10/guisim/guisim.vcxproj | 30 +-
build/msvc10/internal.sln | 52 +
build/msvc10/prj.sln | 446 +++++++++
build/msvc10/sumo/sumo.vcxproj | 6 +
build/msvc10/y_libguisim/y_libguisim.vcxproj | 6 +-
.../msvc10/y_libguisim/y_libguisim.vcxproj.filters | 18 +-
build/msvc10/y_libmesosim/y_libmesosim.vcxproj | 2 -
.../y_libmesosim/y_libmesosim.vcxproj.filters | 6 -
build/msvc10/y_libmicrosim/y_libmicrosim.vcxproj | 41 +-
.../y_libmicrosim/y_libmicrosim.vcxproj.filters | 101 +-
.../z_libmicrosim_cfmodels.vcxproj} | 141 +--
.../z_libmicrosim_cfmodels.vcxproj.filters | 77 ++
.../z_libmicrosim_devices.vcxproj} | 139 +--
.../z_libmicrosim_devices.vcxproj.filters | 71 ++
.../z_libmicrosim_trigger.vcxproj | 2 -
.../z_libmicrosim_trigger.vcxproj.filters | 6 -
.../z_libutils_gui_windows.vcxproj | 18 -
build/msvc9/guisim/guisim.vcproj | 20 +-
build/msvc9/prj.sln | 26 +
build/msvc9/y_libguisim/y_libguisim.vcproj | 62 +-
build/msvc9/y_libmicrosim/y_libmicrosim.vcproj | 144 +--
.../z_libmicrosim_cfmodels.vcproj} | 80 +-
.../z_libmicrosim_devices.vcproj} | 56 +-
.../z_libmicrosim_trigger.vcproj | 8 -
.../z_libutils_gui_globjects.vcproj | 24 +-
build/package/sumo.spec | 36 +-
configure | 37 +-
configure.ac | 10 +-
.../cross3ltl_vtypeprobe.sumocfg} | 7 +-
.../cross3ltl_vtypeprobe/input_additional.add.xml | 5 +
.../input_routes.rou.xml | 0
.../net.net.xml | 0
docs/tutorial/hello/data/hello.edg.xml | 6 +-
docs/tutorial/hello/data/hello.net.xml | 49 +
docs/tutorial/hello/data/hello.nod.xml | 8 +-
docs/tutorial/hello/data/hello.settings.xml | 4 +
docs/tutorial/hello/data/hello.sumocfg | 9 +-
docs/tutorial/hello/runner.py | 14 +-
docs/tutorial/traci_tls/data/cross.sumocfg | 11 +-
docs/tutorial/traci_tls/embedded.py | 46 +
docs/tutorial/traci_tls/runner.py | 72 +-
src/Makefile.am | 8 +-
src/Makefile.in | 14 +-
src/activitygen/AGActivityGen.cpp | 4 +-
src/activitygen/AGActivityGen.h | 4 +-
src/activitygen/AGActivityGenHandler.cpp | 12 +-
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/activities/AGActivities.cpp | 4 +-
src/activitygen/activities/AGActivities.h | 4 +-
src/activitygen/activities/AGActivity.cpp | 4 +-
src/activitygen/activities/AGActivity.h | 4 +-
src/activitygen/activities/AGFreeTime.cpp | 4 +-
src/activitygen/activities/AGFreeTime.h | 4 +-
src/activitygen/activities/AGTrip.cpp | 4 +-
src/activitygen/activities/AGTrip.h | 4 +-
src/activitygen/activities/AGWorkAndSchool.cpp | 4 +-
src/activitygen/activities/AGWorkAndSchool.h | 4 +-
src/activitygen/activitygen_main.cpp | 4 +-
src/activitygen/city/AGAdult.cpp | 6 +-
src/activitygen/city/AGAdult.h | 6 +-
src/activitygen/city/AGBus.cpp | 4 +-
src/activitygen/city/AGBus.h | 4 +-
src/activitygen/city/AGBusLine.cpp | 6 +-
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 | 6 +-
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 | 6 +-
src/config.h | 9 +-
src/config.h.in | 3 -
src/dfrouter/RODFDetFlowLoader.cpp | 6 +-
src/dfrouter/RODFDetFlowLoader.h | 6 +-
src/dfrouter/RODFDetector.cpp | 55 +-
src/dfrouter/RODFDetector.h | 16 +-
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 | 26 +-
src/dfrouter/RODFFrame.h | 4 +-
src/dfrouter/RODFNet.cpp | 4 +-
src/dfrouter/RODFNet.h | 4 +-
src/dfrouter/RODFRouteCont.cpp | 4 +-
src/dfrouter/RODFRouteCont.h | 4 +-
src/dfrouter/RODFRouteDesc.h | 4 +-
src/dfrouter/dfrouter_main.cpp | 4 +-
src/duarouter/RODUAEdgeBuilder.cpp | 4 +-
src/duarouter/RODUAEdgeBuilder.h | 4 +-
src/duarouter/RODUAFrame.cpp | 4 +-
src/duarouter/RODUAFrame.h | 4 +-
src/duarouter/duarouter_main.cpp | 4 +-
src/foreign/rtree/LayeredRTree.h | 4 +-
src/foreign/rtree/SUMORTree.h | 4 +-
src/gui/GUIApplicationWindow.cpp | 177 ++--
src/gui/GUIApplicationWindow.h | 18 +-
src/gui/GUIEvent_SimulationEnded.h | 4 +-
src/gui/GUIEvent_SimulationLoaded.h | 4 +-
src/gui/GUIGlobals.cpp | 4 +-
src/gui/GUIGlobals.h | 4 +-
src/gui/GUILoadThread.cpp | 39 +-
src/gui/GUILoadThread.h | 4 +-
src/gui/GUIManipulator.cpp | 4 +-
src/gui/GUIManipulator.h | 4 +-
src/gui/GUIRunThread.cpp | 28 +-
src/gui/GUIRunThread.h | 6 +-
src/gui/GUISUMOViewParent.cpp | 13 +-
src/gui/GUISUMOViewParent.h | 4 +-
src/gui/GUITLLogicPhasesTrackerWindow.cpp | 5 +-
src/gui/GUITLLogicPhasesTrackerWindow.h | 4 +-
src/gui/GUIViewTraffic.cpp | 7 +-
src/gui/GUIViewTraffic.h | 5 +-
src/gui/TraCIServerAPI_GUI.cpp | 8 +-
src/gui/TraCIServerAPI_GUI.h | 8 +-
src/gui/dialogs/GUIDialog_AboutSUMO.cpp | 8 +-
src/gui/dialogs/GUIDialog_AboutSUMO.h | 4 +-
src/gui/dialogs/GUIDialog_AppSettings.cpp | 8 +-
src/gui/dialogs/GUIDialog_AppSettings.h | 4 +-
src/gui/dialogs/GUIDialog_Breakpoints.cpp | 4 +-
src/gui/dialogs/GUIDialog_Breakpoints.h | 4 +-
src/guinetload/GUIDetectorBuilder.cpp | 4 +-
src/guinetload/GUIDetectorBuilder.h | 4 +-
src/guinetload/GUIEdgeControlBuilder.cpp | 31 +-
src/guinetload/GUIEdgeControlBuilder.h | 6 +-
src/guinetload/GUITriggerBuilder.cpp | 19 +-
src/guinetload/GUITriggerBuilder.h | 24 +-
src/guisim/GUIBusStop.cpp | 5 +-
src/guisim/GUIBusStop.h | 4 +-
src/guisim/GUICalibrator.cpp | 440 +++++++++
.../{GUILaneSpeedTrigger.h => GUICalibrator.h} | 66 +-
src/guisim/GUIDetectorWrapper.cpp | 4 +-
src/guisim/GUIDetectorWrapper.h | 4 +-
src/guisim/GUIE3Collector.cpp | 12 +-
src/guisim/GUIE3Collector.h | 4 +-
src/guisim/GUIEdge.cpp | 98 +-
src/guisim/GUIEdge.h | 46 +-
src/guisim/GUIEventControl.cpp | 4 +-
src/guisim/GUIEventControl.h | 4 +-
src/guisim/GUIInductLoop.cpp | 16 +-
src/guisim/GUIInductLoop.h | 14 +-
src/guisim/GUIInstantInductLoop.cpp | 15 +-
src/guisim/GUIInstantInductLoop.h | 14 +-
src/guisim/GUIInternalLane.cpp | 144 ---
src/guisim/GUIInternalLane.h | 163 ----
src/guisim/GUIJunctionWrapper.cpp | 4 +-
src/guisim/GUIJunctionWrapper.h | 4 +-
src/guisim/GUILane.cpp | 701 +++++++++++++-
src/guisim/GUILane.h | 180 +++-
src/guisim/GUILaneSpeedTrigger.cpp | 5 +-
src/guisim/GUILaneSpeedTrigger.h | 4 +-
src/guisim/GUILaneWrapper.cpp | 742 ---------------
src/guisim/GUILaneWrapper.h | 264 ------
src/guisim/GUINet.cpp | 11 +-
src/guisim/GUINet.h | 4 +-
src/guisim/GUIPerson.cpp | 54 +-
src/guisim/GUIPerson.h | 4 +-
src/guisim/GUIPersonControl.cpp | 4 +-
src/guisim/GUIPersonControl.h | 4 +-
src/guisim/GUIShapeContainer.cpp | 4 +-
src/guisim/GUIShapeContainer.h | 4 +-
src/guisim/GUITrafficLightLogicWrapper.cpp | 4 +-
src/guisim/GUITrafficLightLogicWrapper.h | 4 +-
src/guisim/GUITriggeredRerouter.cpp | 20 +-
src/guisim/GUITriggeredRerouter.h | 4 +-
src/guisim/GUIVehicle.cpp | 121 ++-
src/guisim/GUIVehicle.h | 23 +-
src/guisim/GUIVehicleControl.cpp | 4 +-
src/guisim/GUIVehicleControl.h | 4 +-
src/guisim/GUI_E2_ZS_Collector.cpp | 8 +-
src/guisim/GUI_E2_ZS_Collector.h | 5 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.cpp | 5 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.h | 10 +-
src/guisim/Makefile.am | 3 +-
src/guisim/Makefile.in | 16 +-
src/guisim_main.cpp | 18 +-
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 | 4 +-
src/jtrrouter/ROJTRRouter.h | 4 +-
src/jtrrouter/ROJTRTurnDefLoader.cpp | 4 +-
src/jtrrouter/ROJTRTurnDefLoader.h | 4 +-
src/jtrrouter/jtrrouter_main.cpp | 4 +-
src/microsim/MSAbstractLaneChangeModel.cpp | 186 ++++
src/microsim/MSAbstractLaneChangeModel.h | 145 ++-
src/microsim/MSBaseVehicle.cpp | 109 ++-
src/microsim/MSBaseVehicle.h | 51 +-
src/microsim/MSBitSetLogic.h | 4 +-
src/microsim/MSEdge.cpp | 50 +-
src/microsim/MSEdge.h | 14 +-
src/microsim/MSEdgeControl.cpp | 7 +-
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 | 65 +-
src/microsim/MSFrame.h | 4 +-
src/microsim/MSGlobals.cpp | 11 +-
src/microsim/MSGlobals.h | 14 +-
src/microsim/MSInsertionControl.cpp | 6 +-
src/microsim/MSInsertionControl.h | 4 +-
src/microsim/MSInternalJunction.cpp | 4 +-
src/microsim/MSInternalJunction.h | 4 +-
src/microsim/MSInternalLane.cpp | 91 --
src/microsim/MSInternalLane.h | 147 ---
src/microsim/MSJunction.cpp | 4 +-
src/microsim/MSJunction.h | 4 +-
src/microsim/MSJunctionControl.cpp | 4 +-
src/microsim/MSJunctionControl.h | 4 +-
src/microsim/MSJunctionLogic.cpp | 4 +-
src/microsim/MSJunctionLogic.h | 4 +-
src/microsim/MSLCM_DK2004.cpp | 20 +-
src/microsim/MSLCM_DK2004.h | 4 +-
src/microsim/MSLane.cpp | 200 ++--
src/microsim/MSLane.h | 84 +-
src/microsim/MSLaneChanger.cpp | 64 +-
src/microsim/MSLaneChanger.h | 9 +-
src/microsim/MSLink.cpp | 196 ++--
src/microsim/MSLink.h | 120 ++-
src/microsim/MSLinkCont.cpp | 4 +-
src/microsim/MSLinkCont.h | 4 +-
src/microsim/MSLogicJunction.cpp | 15 +-
src/microsim/MSLogicJunction.h | 8 +-
src/microsim/MSMessageEmitter.cpp | 339 -------
src/microsim/MSMessageEmitter.h | 100 --
src/microsim/MSMoveReminder.cpp | 9 +-
src/microsim/MSMoveReminder.h | 19 +-
src/microsim/MSNet.cpp | 84 +-
src/microsim/MSNet.h | 45 +-
src/microsim/MSNoLogicJunction.cpp | 26 +-
src/microsim/MSNoLogicJunction.h | 11 +-
src/microsim/MSPerson.cpp | 74 +-
src/microsim/MSPerson.h | 66 +-
src/microsim/MSPersonControl.cpp | 5 +-
src/microsim/MSPersonControl.h | 4 +-
src/microsim/MSRightOfWayJunction.cpp | 14 +-
src/microsim/MSRightOfWayJunction.h | 4 +-
src/microsim/MSRoute.cpp | 6 +-
src/microsim/MSRoute.h | 12 +-
src/microsim/MSRouteHandler.cpp | 29 +-
src/microsim/MSRouteHandler.h | 4 +-
src/microsim/MSStateHandler.cpp | 235 +++++
.../MSStateHandler.h} | 78 +-
src/microsim/MSVehicle.cpp | 628 +++++++-----
src/microsim/MSVehicle.h | 167 ++--
src/microsim/MSVehicleContainer.cpp | 4 +-
src/microsim/MSVehicleContainer.h | 4 +-
src/microsim/MSVehicleControl.cpp | 21 +-
src/microsim/MSVehicleControl.h | 8 +-
src/microsim/MSVehicleTransfer.cpp | 20 +-
src/microsim/MSVehicleTransfer.h | 13 +-
src/microsim/MSVehicleType.cpp | 14 +-
src/microsim/MSVehicleType.h | 25 +-
src/microsim/Makefile.am | 10 +-
src/microsim/Makefile.in | 33 +-
src/microsim/actions/Command_SaveTLCoupledDet.cpp | 4 +-
src/microsim/actions/Command_SaveTLCoupledDet.h | 4 +-
.../actions/Command_SaveTLCoupledLaneDet.cpp | 4 +-
.../actions/Command_SaveTLCoupledLaneDet.h | 4 +-
src/microsim/actions/Command_SaveTLSState.cpp | 4 +-
src/microsim/actions/Command_SaveTLSState.h | 4 +-
.../actions/Command_SaveTLSSwitchStates.cpp | 4 +-
src/microsim/actions/Command_SaveTLSSwitchStates.h | 4 +-
src/microsim/actions/Command_SaveTLSSwitches.cpp | 4 +-
src/microsim/actions/Command_SaveTLSSwitches.h | 4 +-
src/microsim/{ => cfmodels}/MSCFModel.cpp | 37 +-
src/microsim/{ => cfmodels}/MSCFModel.h | 38 +-
src/microsim/cfmodels/MSCFModel_Daniel1.cpp | 8 +-
src/microsim/cfmodels/MSCFModel_Daniel1.h | 8 +-
src/microsim/cfmodels/MSCFModel_IDM.cpp | 8 +-
src/microsim/cfmodels/MSCFModel_IDM.h | 8 +-
src/microsim/cfmodels/MSCFModel_Kerner.cpp | 36 +-
src/microsim/cfmodels/MSCFModel_Kerner.h | 28 +-
src/microsim/cfmodels/MSCFModel_Krauss.cpp | 26 +-
src/microsim/cfmodels/MSCFModel_Krauss.h | 6 +-
src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp | 8 +-
src/microsim/cfmodels/MSCFModel_KraussOrig1.h | 8 +-
src/microsim/cfmodels/MSCFModel_KraussPS.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_KraussPS.h | 4 +-
src/microsim/cfmodels/MSCFModel_PWag2009.cpp | 7 +-
src/microsim/cfmodels/MSCFModel_PWag2009.h | 8 +-
src/microsim/cfmodels/MSCFModel_SmartSK.cpp | 9 +-
src/microsim/cfmodels/MSCFModel_SmartSK.h | 8 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.cpp | 8 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.h | 8 +-
src/microsim/cfmodels/Makefile.am | 1 +
src/microsim/cfmodels/Makefile.in | 13 +-
src/microsim/devices/MSDevice.cpp | 115 +++
src/microsim/devices/MSDevice.h | 57 +-
src/microsim/devices/MSDevice_BTreceiver.cpp | 147 +++
.../{MSDevice_Tripinfo.h => MSDevice_BTreceiver.h} | 115 ++-
src/microsim/devices/MSDevice_BTsender.cpp | 95 ++
.../{MSDevice_HBEFA.h => MSDevice_BTsender.h} | 87 +-
src/microsim/devices/MSDevice_Example.cpp | 161 ++++
.../{MSDevice_Tripinfo.h => MSDevice_Example.h} | 62 +-
src/microsim/devices/MSDevice_HBEFA.cpp | 52 +-
src/microsim/devices/MSDevice_HBEFA.h | 18 +-
src/microsim/devices/MSDevice_Person.cpp | 4 +-
src/microsim/devices/MSDevice_Person.h | 18 +-
src/microsim/devices/MSDevice_Routing.cpp | 46 +-
src/microsim/devices/MSDevice_Routing.h | 21 +-
src/microsim/devices/MSDevice_Tripinfo.cpp | 7 +-
src/microsim/devices/MSDevice_Tripinfo.h | 36 +-
src/microsim/devices/MSDevice_Vehroutes.cpp | 10 +-
src/microsim/devices/MSDevice_Vehroutes.h | 50 +-
src/microsim/devices/Makefile.am | 5 +-
src/microsim/devices/Makefile.in | 17 +-
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/output/MSCrossSection.h | 4 +-
src/microsim/output/MSDetectorControl.cpp | 4 +-
src/microsim/output/MSDetectorControl.h | 4 +-
src/microsim/output/MSDetectorFileOutput.h | 4 +-
src/microsim/output/MSE2Collector.cpp | 25 +-
src/microsim/output/MSE2Collector.h | 4 +-
src/microsim/output/MSE3Collector.cpp | 18 +-
src/microsim/output/MSE3Collector.h | 12 +-
src/microsim/output/MSEmissionExport.cpp | 37 +-
src/microsim/output/MSEmissionExport.h | 2 +-
src/microsim/output/MSFCDExport.cpp | 14 +-
src/microsim/output/MSFCDExport.h | 4 +-
src/microsim/output/MSFullExport.cpp | 91 +-
src/microsim/output/MSFullExport.h | 2 +-
src/microsim/output/MSInductLoop.cpp | 9 +-
src/microsim/output/MSInductLoop.h | 4 +-
src/microsim/output/MSInstantInductLoop.cpp | 18 +-
src/microsim/output/MSInstantInductLoop.h | 20 +-
src/microsim/output/MSMeanData.cpp | 6 +-
src/microsim/output/MSMeanData.h | 4 +-
src/microsim/output/MSMeanData_HBEFA.cpp | 4 +-
src/microsim/output/MSMeanData_HBEFA.h | 4 +-
src/microsim/output/MSMeanData_Harmonoise.cpp | 4 +-
src/microsim/output/MSMeanData_Harmonoise.h | 4 +-
src/microsim/output/MSMeanData_Net.cpp | 9 +-
src/microsim/output/MSMeanData_Net.h | 4 +-
src/microsim/output/MSQueueExport.cpp | 109 +--
src/microsim/output/MSQueueExport.h | 2 +-
src/microsim/output/MSRouteProbe.cpp | 10 +-
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 | 4 +-
src/microsim/output/MSXMLRawOut.h | 4 +-
.../output/MS_E2_ZS_CollectorOverLanes.cpp | 12 +-
src/microsim/output/MS_E2_ZS_CollectorOverLanes.h | 16 +-
.../traffic_lights/MSActuatedTrafficLightLogic.cpp | 30 +-
.../traffic_lights/MSActuatedTrafficLightLogic.h | 6 +-
.../MSAgentbasedTrafficLightLogic.cpp | 38 +-
.../traffic_lights/MSAgentbasedTrafficLightLogic.h | 6 +-
.../traffic_lights/MSOffTrafficLightLogic.cpp | 6 +-
.../traffic_lights/MSOffTrafficLightLogic.h | 4 +-
src/microsim/traffic_lights/MSPhaseDefinition.h | 4 +-
.../traffic_lights/MSSimpleTrafficLightLogic.cpp | 6 +-
.../traffic_lights/MSSimpleTrafficLightLogic.h | 6 +-
src/microsim/traffic_lights/MSTLLogicControl.cpp | 18 +-
src/microsim/traffic_lights/MSTLLogicControl.h | 4 +-
.../traffic_lights/MSTrafficLightLogic.cpp | 33 +-
src/microsim/traffic_lights/MSTrafficLightLogic.h | 42 +-
src/microsim/trigger/MSBusStop.cpp | 6 +-
src/microsim/trigger/MSBusStop.h | 6 +-
src/microsim/trigger/MSCalibrator.cpp | 79 +-
src/microsim/trigger/MSCalibrator.h | 51 +-
src/microsim/trigger/MSLaneSpeedTrigger.cpp | 4 +-
src/microsim/trigger/MSLaneSpeedTrigger.h | 4 +-
src/microsim/trigger/MSTrigger.cpp | 4 +-
src/microsim/trigger/MSTrigger.h | 4 +-
src/microsim/trigger/MSTriggeredReader.cpp | 4 +-
src/microsim/trigger/MSTriggeredReader.h | 4 +-
src/microsim/trigger/MSTriggeredRerouter.cpp | 12 +-
src/microsim/trigger/MSTriggeredRerouter.h | 4 +-
src/microsim/trigger/MSTriggeredXMLReader.cpp | 104 --
src/microsim/trigger/MSTriggeredXMLReader.h | 92 --
src/microsim/trigger/Makefile.am | 4 +-
src/microsim/trigger/Makefile.in | 6 +-
src/netbuild/NBAlgorithms.cpp | 15 +-
src/netbuild/NBAlgorithms.h | 4 +-
src/netbuild/NBAlgorithms_Ramps.cpp | 12 +-
src/netbuild/NBAlgorithms_Ramps.h | 4 +-
src/netbuild/NBCapacity2Lanes.h | 4 +-
src/netbuild/NBConnection.cpp | 4 +-
src/netbuild/NBConnection.h | 4 +-
src/netbuild/NBConnectionDefs.h | 4 +-
src/netbuild/NBCont.h | 4 +-
src/netbuild/NBContHelper.cpp | 71 +-
src/netbuild/NBContHelper.h | 52 +-
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 | 119 ++-
src/netbuild/NBEdge.h | 93 +-
src/netbuild/NBEdgeCont.cpp | 36 +-
src/netbuild/NBEdgeCont.h | 13 +-
src/netbuild/NBFrame.cpp | 28 +-
src/netbuild/NBFrame.h | 4 +-
src/netbuild/NBHelpers.cpp | 6 +-
src/netbuild/NBHelpers.h | 4 +-
src/netbuild/NBJoinedEdgesMap.cpp | 4 +-
src/netbuild/NBJoinedEdgesMap.h | 4 +-
src/netbuild/NBLinkPossibilityMatrix.h | 4 +-
src/netbuild/NBLoadedSUMOTLDef.cpp | 4 +-
src/netbuild/NBLoadedSUMOTLDef.h | 4 +-
src/netbuild/NBLoadedTLDef.cpp | 4 +-
src/netbuild/NBLoadedTLDef.h | 4 +-
src/netbuild/NBNetBuilder.cpp | 130 ++-
src/netbuild/NBNetBuilder.h | 15 +-
src/netbuild/NBNode.cpp | 78 +-
src/netbuild/NBNode.h | 14 +-
src/netbuild/NBNodeCont.cpp | 15 +-
src/netbuild/NBNodeCont.h | 4 +-
src/netbuild/NBNodeShapeComputer.cpp | 24 +-
src/netbuild/NBNodeShapeComputer.h | 4 +-
src/netbuild/NBOwnTLDef.cpp | 4 +-
src/netbuild/NBOwnTLDef.h | 4 +-
src/netbuild/NBRequest.cpp | 70 +-
src/netbuild/NBRequest.h | 17 +-
src/netbuild/NBSign.cpp | 8 +-
src/netbuild/NBSign.h | 8 +-
src/netbuild/NBTrafficLightDefinition.cpp | 4 +-
src/netbuild/NBTrafficLightDefinition.h | 4 +-
src/netbuild/NBTrafficLightLogic.cpp | 4 +-
src/netbuild/NBTrafficLightLogic.h | 4 +-
src/netbuild/NBTrafficLightLogicCont.cpp | 4 +-
src/netbuild/NBTrafficLightLogicCont.h | 4 +-
src/netbuild/NBTypeCont.cpp | 4 +-
src/netbuild/NBTypeCont.h | 4 +-
src/netconvert_main.cpp | 8 +-
src/netgen/Makefile.am | 9 +
src/netgen/Makefile.in | 7 +-
src/netgen/NGEdge.cpp | 4 +-
src/netgen/NGEdge.h | 4 +-
src/netgen/NGFrame.cpp | 16 +-
src/netgen/NGFrame.h | 4 +-
src/netgen/NGNet.cpp | 6 +-
src/netgen/NGNet.h | 4 +-
src/netgen/NGNode.cpp | 8 +-
src/netgen/NGNode.h | 4 +-
src/netgen/NGRandomNetBuilder.cpp | 6 +-
src/netgen/NGRandomNetBuilder.h | 4 +-
src/netgen/netgen_main.cpp | 4 +-
src/netimport/NIFrame.cpp | 10 +-
src/netimport/NIFrame.h | 4 +-
src/netimport/NIImporter_ArcView.cpp | 6 +-
src/netimport/NIImporter_ArcView.h | 4 +-
src/netimport/NIImporter_DlrNavteq.cpp | 30 +-
src/netimport/NIImporter_DlrNavteq.h | 8 +-
src/netimport/NIImporter_ITSUMO.cpp | 14 +-
src/netimport/NIImporter_ITSUMO.h | 38 +-
src/netimport/NIImporter_MATSim.cpp | 6 +-
src/netimport/NIImporter_MATSim.h | 4 +-
src/netimport/NIImporter_OpenDrive.cpp | 20 +-
src/netimport/NIImporter_OpenDrive.h | 6 +-
src/netimport/NIImporter_OpenStreetMap.cpp | 29 +-
src/netimport/NIImporter_OpenStreetMap.h | 6 +-
src/netimport/NIImporter_RobocupRescue.cpp | 6 +-
src/netimport/NIImporter_RobocupRescue.h | 4 +-
src/netimport/NIImporter_SUMO.cpp | 42 +-
src/netimport/NIImporter_SUMO.h | 4 +-
src/netimport/NIImporter_VISUM.cpp | 32 +-
src/netimport/NIImporter_VISUM.h | 24 +-
src/netimport/NILoader.cpp | 69 +-
src/netimport/NILoader.h | 15 +-
src/netimport/NINavTeqHelper.cpp | 4 +-
src/netimport/NINavTeqHelper.h | 4 +-
src/netimport/NIVisumTL.cpp | 4 +-
src/netimport/NIVisumTL.h | 4 +-
src/netimport/NIXMLConnectionsHandler.cpp | 4 +-
src/netimport/NIXMLConnectionsHandler.h | 4 +-
src/netimport/NIXMLEdgesHandler.cpp | 34 +-
src/netimport/NIXMLEdgesHandler.h | 18 +-
src/netimport/NIXMLNodesHandler.cpp | 16 +-
src/netimport/NIXMLNodesHandler.h | 4 +-
src/netimport/NIXMLTrafficLightsHandler.cpp | 6 +-
src/netimport/NIXMLTrafficLightsHandler.h | 4 +-
src/netimport/NIXMLTypesHandler.cpp | 4 +-
src/netimport/NIXMLTypesHandler.h | 4 +-
src/netimport/vissim/NIImporter_Vissim.cpp | 4 +-
src/netimport/vissim/NIImporter_Vissim.h | 4 +-
src/netimport/vissim/NIVissimElements.h | 4 +-
.../vissim/tempstructs/NIVissimAbstractEdge.cpp | 8 +-
.../vissim/tempstructs/NIVissimAbstractEdge.h | 4 +-
.../tempstructs/NIVissimBoundedClusterObject.cpp | 4 +-
.../tempstructs/NIVissimBoundedClusterObject.h | 4 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.cpp | 4 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.h | 4 +-
.../vissim/tempstructs/NIVissimClosedLanesVector.h | 4 +-
.../vissim/tempstructs/NIVissimClosures.cpp | 4 +-
.../vissim/tempstructs/NIVissimClosures.h | 4 +-
.../vissim/tempstructs/NIVissimConnection.cpp | 4 +-
.../vissim/tempstructs/NIVissimConnection.h | 4 +-
.../tempstructs/NIVissimConnectionCluster.cpp | 4 +-
.../vissim/tempstructs/NIVissimConnectionCluster.h | 4 +-
.../tempstructs/NIVissimDistrictConnection.cpp | 4 +-
.../tempstructs/NIVissimDistrictConnection.h | 4 +-
.../vissim/tempstructs/NIVissimDisturbance.cpp | 4 +-
.../vissim/tempstructs/NIVissimDisturbance.h | 4 +-
src/netimport/vissim/tempstructs/NIVissimEdge.cpp | 4 +-
src/netimport/vissim/tempstructs/NIVissimEdge.h | 4 +-
.../vissim/tempstructs/NIVissimEdgePosMap.cpp | 4 +-
.../vissim/tempstructs/NIVissimEdgePosMap.h | 4 +-
.../tempstructs/NIVissimExtendedEdgePoint.cpp | 4 +-
.../vissim/tempstructs/NIVissimExtendedEdgePoint.h | 4 +-
.../tempstructs/NIVissimExtendedEdgePointVector.h | 4 +-
.../vissim/tempstructs/NIVissimNodeCluster.cpp | 6 +-
.../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 | 4 +-
src/netimport/vissim/tempstructs/NIVissimTL.h | 4 +-
.../tempstructs/NIVissimTrafficDescription.cpp | 4 +-
.../tempstructs/NIVissimTrafficDescription.h | 4 +-
.../vissim/tempstructs/NIVissimVehTypeClass.cpp | 4 +-
.../vissim/tempstructs/NIVissimVehTypeClass.h | 4 +-
.../vissim/tempstructs/NIVissimVehicleClass.cpp | 4 +-
.../vissim/tempstructs/NIVissimVehicleClass.h | 4 +-
.../tempstructs/NIVissimVehicleClassVector.h | 4 +-
.../vissim/tempstructs/NIVissimVehicleType.cpp | 4 +-
.../vissim/tempstructs/NIVissimVehicleType.h | 4 +-
...issimSingleTypeParser_Auswertungsdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Auswertungsdefinition.h | 4 +-
...NIVissimSingleTypeParser_Detektordefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Detektordefinition.h | 4 +-
.../typeloader/NIVissimSingleTypeParser_DynUml.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_DynUml.h | 4 +-
...IVissimSingleTypeParser_Einheitendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Einheitendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Emission.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_Emission.h | 4 +-
...IVissimSingleTypeParser_Fahrtverlaufdateien.cpp | 4 +-
.../NIVissimSingleTypeParser_Fahrtverlaufdateien.h | 4 +-
...simSingleTypeParser_Fahrverhaltendefinition.cpp | 4 +-
...issimSingleTypeParser_Fahrverhaltendefinition.h | 4 +-
...mSingleTypeParser_Fahrzeugklassendefinition.cpp | 17 +-
...simSingleTypeParser_Fahrzeugklassendefinition.h | 4 +-
...issimSingleTypeParser_Fahrzeugtypdefinition.cpp | 17 +-
...IVissimSingleTypeParser_Fahrzeugtypdefinition.h | 4 +-
.../NIVissimSingleTypeParser_Fensterdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Fensterdefinition.h | 4 +-
...imSingleTypeParser_Gefahrwarnungsdefinition.cpp | 4 +-
...ssimSingleTypeParser_Gefahrwarnungsdefinition.h | 4 +-
...simSingleTypeParser_Gelbverhaltendefinition.cpp | 4 +-
...issimSingleTypeParser_Gelbverhaltendefinition.h | 4 +-
...arser_Geschwindigkeitsverteilungsdefinition.cpp | 4 +-
...eParser_Geschwindigkeitsverteilungsdefinition.h | 4 +-
...ssimSingleTypeParser_Haltestellendefinition.cpp | 4 +-
...VissimSingleTypeParser_Haltestellendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Kantensperrung.cpp | 4 +-
.../NIVissimSingleTypeParser_Kantensperrung.h | 4 +-
.../NIVissimSingleTypeParser_Kennungszeile.cpp | 4 +-
.../NIVissimSingleTypeParser_Kennungszeile.h | 4 +-
.../NIVissimSingleTypeParser_Knotendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Knotendefinition.h | 4 +-
...ssimSingleTypeParser_LSAKopplungsdefinition.cpp | 4 +-
...VissimSingleTypeParser_LSAKopplungsdefinition.h | 4 +-
...ngleTypeParser_Laengenverteilungsdefinition.cpp | 4 +-
...SingleTypeParser_Laengenverteilungsdefinition.h | 4 +-
...ngleTypeParser_Langsamfahrbereichdefinition.cpp | 4 +-
...SingleTypeParser_Langsamfahrbereichdefinition.h | 4 +-
...ngleTypeParser_Lichtsignalanlagendefinition.cpp | 4 +-
...SingleTypeParser_Lichtsignalanlagendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Liniendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Liniendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Linksverkehr.cpp | 4 +-
.../NIVissimSingleTypeParser_Linksverkehr.h | 4 +-
...NIVissimSingleTypeParser_Messungsdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Messungsdefinition.h | 4 +-
...VissimSingleTypeParser_Netzobjektdefinition.cpp | 4 +-
...NIVissimSingleTypeParser_Netzobjektdefinition.h | 4 +-
...IVissimSingleTypeParser_Parkplatzdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Parkplatzdefinition.h | 4 +-
...leTypeParser_Querschnittsmessungsdefinition.cpp | 4 +-
...ngleTypeParser_Querschnittsmessungsdefinition.h | 4 +-
...eTypeParser_Querverkehrsstoerungsdefinition.cpp | 4 +-
...gleTypeParser_Querverkehrsstoerungsdefinition.h | 4 +-
.../NIVissimSingleTypeParser_Rautedefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Rautedefinition.h | 4 +-
...ingleTypeParser_Reisezeitmessungsdefinition.cpp | 4 +-
...mSingleTypeParser_Reisezeitmessungsdefinition.h | 4 +-
...TypeParser_Richtungsentscheidungsdefinition.cpp | 4 +-
...leTypeParser_Richtungsentscheidungsdefinition.h | 4 +-
...imSingleTypeParser_Richtungspfeildefinition.cpp | 4 +-
...ssimSingleTypeParser_Richtungspfeildefinition.h | 4 +-
...gleTypeParser_Routenentscheidungsdefinition.cpp | 4 +-
...ingleTypeParser_Routenentscheidungsdefinition.h | 4 +-
...issimSingleTypeParser_Signalgeberdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Signalgeberdefinition.h | 4 +-
...simSingleTypeParser_Signalgruppendefinition.cpp | 4 +-
...issimSingleTypeParser_Signalgruppendefinition.h | 4 +-
.../NIVissimSingleTypeParser_SimRate.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_SimRate.h | 4 +-
.../NIVissimSingleTypeParser_Simdauer.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_Simdauer.h | 4 +-
.../NIVissimSingleTypeParser_Startuhrzeit.cpp | 4 +-
.../NIVissimSingleTypeParser_Startuhrzeit.h | 4 +-
.../NIVissimSingleTypeParser_Startzufallszahl.cpp | 4 +-
.../NIVissimSingleTypeParser_Startzufallszahl.h | 4 +-
...simSingleTypeParser_Stauparameterdefinition.cpp | 4 +-
...issimSingleTypeParser_Stauparameterdefinition.h | 4 +-
...issimSingleTypeParser_Stauzaehlerdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Stauzaehlerdefinition.h | 4 +-
...VissimSingleTypeParser_Stopschilddefinition.cpp | 4 +-
...NIVissimSingleTypeParser_Stopschilddefinition.h | 4 +-
...NIVissimSingleTypeParser_Streckendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Streckendefinition.h | 4 +-
...issimSingleTypeParser_Streckentypdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Streckentypdefinition.h | 4 +-
.../NIVissimSingleTypeParser_TEAPACDefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_TEAPACDefinition.h | 4 +-
...leTypeParser_VWunschentscheidungsdefinition.cpp | 4 +-
...ngleTypeParser_VWunschentscheidungsdefinition.h | 4 +-
...issimSingleTypeParser_Verbindungsdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Verbindungsdefinition.h | 4 +-
...peParser_Verkehrszusammensetzungsdefinition.cpp | 4 +-
...TypeParser_Verkehrszusammensetzungsdefinition.h | 4 +-
...gleTypeParser_Verlustzeitmessungsdefinition.cpp | 4 +-
...ingleTypeParser_Verlustzeitmessungsdefinition.h | 4 +-
...ingleTypeParser_Zeitenverteilungsdefinition.cpp | 4 +-
...mSingleTypeParser_Zeitenverteilungsdefinition.h | 4 +-
.../NIVissimSingleTypeParser_Zeitschrittfaktor.cpp | 4 +-
.../NIVissimSingleTypeParser_Zeitschrittfaktor.h | 4 +-
.../NIVissimSingleTypeParser_Zuflussdefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Zuflussdefinition.h | 4 +-
...SingleTypeParser_Zusammensetzungsdefinition.cpp | 4 +-
...imSingleTypeParser_Zusammensetzungsdefinition.h | 4 +-
.../NIVissimSingleTypeParser__XKurvedefinition.cpp | 4 +-
.../NIVissimSingleTypeParser__XKurvedefinition.h | 4 +-
...simSingleTypeParser__XVerteilungsdefinition.cpp | 4 +-
...issimSingleTypeParser__XVerteilungsdefinition.h | 4 +-
src/netload/NLBuilder.cpp | 22 +-
src/netload/NLBuilder.h | 4 +-
src/netload/NLDetectorBuilder.cpp | 4 +-
src/netload/NLDetectorBuilder.h | 4 +-
src/netload/NLDiscreteEventBuilder.cpp | 4 +-
src/netload/NLDiscreteEventBuilder.h | 4 +-
src/netload/NLEdgeControlBuilder.cpp | 23 +-
src/netload/NLEdgeControlBuilder.h | 5 +-
src/netload/NLHandler.cpp | 40 +-
src/netload/NLHandler.h | 18 +-
src/netload/NLJunctionControlBuilder.cpp | 9 +-
src/netload/NLJunctionControlBuilder.h | 4 +-
src/netload/NLTriggerBuilder.cpp | 4 +-
src/netload/NLTriggerBuilder.h | 14 +-
src/netwrite/NWFrame.cpp | 4 +-
src/netwrite/NWFrame.h | 4 +-
src/netwrite/NWWriter_DlrNavteq.cpp | 41 +-
src/netwrite/NWWriter_DlrNavteq.h | 12 +-
src/netwrite/NWWriter_MATSim.cpp | 4 +-
src/netwrite/NWWriter_MATSim.h | 4 +-
src/netwrite/NWWriter_OpenDrive.cpp | 10 +-
src/netwrite/NWWriter_OpenDrive.h | 4 +-
src/netwrite/NWWriter_SUMO.cpp | 57 +-
src/netwrite/NWWriter_SUMO.h | 12 +-
src/netwrite/NWWriter_XML.cpp | 4 +-
src/netwrite/NWWriter_XML.h | 4 +-
src/od2trips/ODCell.h | 4 +-
src/od2trips/ODDistrict.cpp | 8 +-
src/od2trips/ODDistrict.h | 8 +-
src/od2trips/ODDistrictCont.cpp | 8 +-
src/od2trips/ODDistrictCont.h | 8 +-
src/od2trips/ODDistrictHandler.cpp | 4 +-
src/od2trips/ODDistrictHandler.h | 4 +-
src/od2trips/ODMatrix.cpp | 4 +-
src/od2trips/ODMatrix.h | 4 +-
src/od2trips/od2trips_main.cpp | 4 +-
src/polyconvert/PCLoaderArcView.cpp | 4 +-
src/polyconvert/PCLoaderArcView.h | 4 +-
src/polyconvert/PCLoaderDlrNavteq.cpp | 4 +-
src/polyconvert/PCLoaderDlrNavteq.h | 4 +-
src/polyconvert/PCLoaderOSM.cpp | 4 +-
src/polyconvert/PCLoaderOSM.h | 4 +-
src/polyconvert/PCLoaderVisum.cpp | 6 +-
src/polyconvert/PCLoaderVisum.h | 4 +-
src/polyconvert/PCLoaderXML.cpp | 4 +-
src/polyconvert/PCLoaderXML.h | 4 +-
src/polyconvert/PCNetProjectionLoader.cpp | 4 +-
src/polyconvert/PCNetProjectionLoader.h | 4 +-
src/polyconvert/PCPolyContainer.cpp | 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/polyconvert_main.cpp | 4 +-
src/router/ROAbstractEdgeBuilder.h | 4 +-
src/router/ROCostCalculator.cpp | 6 +-
src/router/ROCostCalculator.h | 4 +-
src/router/ROEdge.cpp | 4 +-
src/router/ROEdge.h | 4 +-
src/router/ROFrame.cpp | 4 +-
src/router/ROFrame.h | 4 +-
src/router/ROHelper.cpp | 4 +-
src/router/ROHelper.h | 4 +-
src/router/ROLane.h | 4 +-
src/router/ROLoader.cpp | 8 +-
src/router/ROLoader.h | 18 +-
src/router/RONet.cpp | 11 +-
src/router/RONet.h | 4 +-
src/router/RONetHandler.cpp | 4 +-
src/router/RONetHandler.h | 4 +-
src/router/RONode.cpp | 4 +-
src/router/RONode.h | 4 +-
src/router/RORoute.cpp | 4 +-
src/router/RORoute.h | 4 +-
src/router/RORouteDef.cpp | 85 +-
src/router/RORouteDef.h | 4 +-
src/router/RORouteHandler.cpp | 14 +-
src/router/RORouteHandler.h | 4 +-
src/router/ROVehicle.cpp | 4 +-
src/router/ROVehicle.h | 4 +-
src/router/ROVehicleCont.cpp | 4 +-
src/router/ROVehicleCont.h | 4 +-
src/router/ReferencedItem.h | 4 +-
src/sumo_main.cpp | 6 +-
src/traci-server/TraCIConstants.h | 17 +-
src/traci-server/TraCIException.h | 4 +-
src/traci-server/TraCIRTree.h | 4 +-
src/traci-server/TraCIServer.cpp | 10 +-
src/traci-server/TraCIServer.h | 4 +-
src/traci-server/TraCIServerAPI_Edge.cpp | 18 +-
src/traci-server/TraCIServerAPI_Edge.h | 4 +-
src/traci-server/TraCIServerAPI_InductionLoop.cpp | 4 +-
src/traci-server/TraCIServerAPI_InductionLoop.h | 4 +-
src/traci-server/TraCIServerAPI_Junction.cpp | 4 +-
src/traci-server/TraCIServerAPI_Junction.h | 4 +-
src/traci-server/TraCIServerAPI_Lane.cpp | 30 +-
src/traci-server/TraCIServerAPI_Lane.h | 4 +-
src/traci-server/TraCIServerAPI_MeMeDetector.cpp | 4 +-
src/traci-server/TraCIServerAPI_MeMeDetector.h | 4 +-
src/traci-server/TraCIServerAPI_POI.cpp | 4 +-
src/traci-server/TraCIServerAPI_POI.h | 4 +-
src/traci-server/TraCIServerAPI_Polygon.cpp | 4 +-
src/traci-server/TraCIServerAPI_Polygon.h | 4 +-
src/traci-server/TraCIServerAPI_Route.cpp | 4 +-
src/traci-server/TraCIServerAPI_Route.h | 4 +-
src/traci-server/TraCIServerAPI_Simulation.cpp | 20 +-
src/traci-server/TraCIServerAPI_Simulation.h | 4 +-
src/traci-server/TraCIServerAPI_TLS.cpp | 8 +-
src/traci-server/TraCIServerAPI_TLS.h | 4 +-
src/traci-server/TraCIServerAPI_Vehicle.cpp | 77 +-
src/traci-server/TraCIServerAPI_Vehicle.h | 4 +-
src/traci-server/TraCIServerAPI_VehicleType.cpp | 4 +-
src/traci-server/TraCIServerAPI_VehicleType.h | 4 +-
src/traci_testclient/TraCITestClient.cpp | 4 +-
src/traci_testclient/TraCITestClient.h | 4 +-
src/traci_testclient/tracitestclient_main.cpp | 4 +-
src/utils/common/AStarRouter.h | 4 +-
src/utils/common/AbstractMutex.h | 4 +-
src/utils/common/Command.h | 4 +-
src/utils/common/DijkstraRouterEffort.h | 4 +-
src/utils/common/DijkstraRouterTT.h | 5 +-
src/utils/common/FileHelpers.cpp | 4 +-
src/utils/common/FileHelpers.h | 4 +-
src/utils/common/HelpersHBEFA.cpp | 4 +-
src/utils/common/HelpersHBEFA.h | 4 +-
src/utils/common/HelpersHarmonoise.cpp | 4 +-
src/utils/common/HelpersHarmonoise.h | 4 +-
src/utils/common/IDSupplier.cpp | 4 +-
src/utils/common/IDSupplier.h | 4 +-
src/utils/common/InstancePool.h | 4 +-
src/utils/common/MsgHandler.cpp | 10 +-
src/utils/common/MsgHandler.h | 4 +-
src/utils/common/MsgRetrievingFunction.h | 4 +-
src/utils/common/Named.h | 4 +-
src/utils/common/NamedObjectCont.h | 4 +-
src/utils/common/Parameterised.cpp | 4 +-
src/utils/common/Parameterised.h | 4 +-
src/utils/common/RGBColor.cpp | 6 +-
src/utils/common/RGBColor.h | 6 +-
src/utils/common/RandHelper.cpp | 7 +-
src/utils/common/RandHelper.h | 4 +-
src/utils/common/RandomDistributor.h | 4 +-
src/utils/common/SUMOAbstractRouter.h | 4 +-
src/utils/common/SUMOTime.cpp | 6 +-
src/utils/common/SUMOTime.h | 6 +-
src/utils/common/SUMOVTypeParameter.cpp | 15 +-
src/utils/common/SUMOVTypeParameter.h | 10 +-
src/utils/common/SUMOVehicle.h | 22 +-
src/utils/common/SUMOVehicleClass.cpp | 10 +-
src/utils/common/SUMOVehicleClass.h | 12 +-
src/utils/common/SUMOVehicleParameter.cpp | 53 +-
src/utils/common/SUMOVehicleParameter.h | 10 +-
src/utils/common/StaticCommand.h | 2 +-
src/utils/common/StdDefs.h | 7 +-
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/SysUtils.cpp | 4 +-
src/utils/common/SysUtils.h | 4 +-
src/utils/common/SystemFrame.cpp | 4 +-
src/utils/common/SystemFrame.h | 4 +-
src/utils/common/ToString.h | 10 +-
src/utils/common/TplConvert.h | 6 +-
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/foxtools/FXThreadEvent.cpp | 4 +-
src/utils/foxtools/FXThreadEvent.h | 4 +-
src/utils/foxtools/FXThreadMessageRetriever.h | 4 +-
src/utils/foxtools/MFXAddEditTypedTable.cpp | 4 +-
src/utils/foxtools/MFXAddEditTypedTable.h | 4 +-
src/utils/foxtools/MFXCheckableButton.cpp | 4 +-
src/utils/foxtools/MFXCheckableButton.h | 4 +-
src/utils/foxtools/MFXEditableTable.cpp | 4 +-
src/utils/foxtools/MFXEditableTable.h | 4 +-
src/utils/foxtools/MFXEventQue.cpp | 4 +-
src/utils/foxtools/MFXEventQue.h | 4 +-
src/utils/foxtools/MFXImageHelper.cpp | 16 +-
src/utils/foxtools/MFXImageHelper.h | 8 +-
src/utils/foxtools/MFXInterThreadEventClient.h | 4 +-
src/utils/foxtools/MFXMenuHeader.cpp | 4 +-
src/utils/foxtools/MFXMenuHeader.h | 4 +-
src/utils/foxtools/MFXUtils.cpp | 4 +-
src/utils/foxtools/MFXUtils.h | 4 +-
src/utils/geom/AbstractPoly.h | 4 +-
src/utils/geom/Boundary.cpp | 4 +-
src/utils/geom/Boundary.h | 4 +-
src/utils/geom/Bresenham.cpp | 4 +-
src/utils/geom/Bresenham.h | 4 +-
src/utils/geom/GeoConvHelper.cpp | 10 +-
src/utils/geom/GeoConvHelper.h | 5 +-
src/utils/geom/GeomConvHelper.cpp | 4 +-
src/utils/geom/GeomConvHelper.h | 4 +-
src/utils/geom/GeomHelper.cpp | 12 +-
src/utils/geom/GeomHelper.h | 14 +-
src/utils/geom/Helper_ConvexHull.cpp | 4 +-
src/utils/geom/Helper_ConvexHull.h | 4 +-
src/utils/geom/Line.cpp | 10 +-
src/utils/geom/Line.h | 4 +-
src/utils/geom/Position.cpp | 4 +-
src/utils/geom/Position.h | 4 +-
src/utils/geom/PositionVector.cpp | 42 +-
src/utils/geom/PositionVector.h | 6 +-
src/utils/geom/bezier.cpp | 4 +-
src/utils/geom/bezier.h | 4 +-
src/utils/gui/div/GLHelper.cpp | 14 +-
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 | 20 +-
src/utils/gui/div/GUIParameterTableWindow.h | 28 +-
src/utils/gui/div/GUISelectedStorage.cpp | 4 +-
src/utils/gui/div/GUISelectedStorage.h | 4 +-
src/utils/gui/div/GUIUserIO.cpp | 4 +-
src/utils/gui/div/GUIUserIO.h | 4 +-
src/utils/gui/events/GUIEvent.h | 4 +-
src/utils/gui/events/GUIEvent_Message.h | 4 +-
src/utils/gui/events/GUIEvent_SimulationStep.h | 4 +-
src/utils/gui/globjects/GLIncludes.h | 4 +-
src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp | 4 +-
src/utils/gui/globjects/GUIGLObjectPopupMenu.h | 4 +-
src/utils/gui/globjects/GUIGlObject.cpp | 4 +-
src/utils/gui/globjects/GUIGlObject.h | 4 +-
src/utils/gui/globjects/GUIGlObjectStorage.cpp | 4 +-
src/utils/gui/globjects/GUIGlObjectStorage.h | 4 +-
src/utils/gui/globjects/GUIGlObjectTypes.h | 4 +-
.../gui/globjects/GUIGlObject_AbstractAdd.cpp | 4 +-
src/utils/gui/globjects/GUIGlObject_AbstractAdd.h | 4 +-
src/utils/gui/globjects/GUIPointOfInterest.cpp | 4 +-
src/utils/gui/globjects/GUIPointOfInterest.h | 4 +-
src/utils/gui/globjects/GUIPolygon.cpp | 10 +-
src/utils/gui/globjects/GUIPolygon.h | 4 +-
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 | 31 +-
src/utils/gui/images/GUITexturesHelper.h | 32 +-
src/utils/gui/settings/GUIColorScheme.h | 4 +-
src/utils/gui/settings/GUIColorer.h | 4 +-
.../gui/settings/GUICompleteSchemeStorage.cpp | 4 +-
src/utils/gui/settings/GUICompleteSchemeStorage.h | 4 +-
src/utils/gui/settings/GUISettingsHandler.cpp | 12 +-
src/utils/gui/settings/GUISettingsHandler.h | 4 +-
.../gui/settings/GUIVisualizationSettings.cpp | 58 +-
src/utils/gui/settings/GUIVisualizationSettings.h | 20 +-
src/utils/gui/tracker/GUIParameterTracker.cpp | 4 +-
src/utils/gui/tracker/GUIParameterTracker.h | 4 +-
src/utils/gui/tracker/TrackerValueDesc.cpp | 4 +-
src/utils/gui/tracker/TrackerValueDesc.h | 4 +-
src/utils/gui/windows/GUIAppEnum.h | 12 +-
.../gui/windows/GUIDanielPerspectiveChanger.cpp | 4 +-
.../gui/windows/GUIDanielPerspectiveChanger.h | 4 +-
src/utils/gui/windows/GUIDialog_EditViewport.cpp | 6 +-
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 | 111 ++-
src/utils/gui/windows/GUIDialog_ViewSettings.h | 15 +-
src/utils/gui/windows/GUIGlChildWindow.cpp | 4 +-
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 | 106 ++-
src/utils/gui/windows/GUISUMOAbstractView.h | 14 +-
src/utils/importio/LineHandler.h | 4 +-
src/utils/importio/LineReader.cpp | 4 +-
src/utils/importio/LineReader.h | 4 +-
src/utils/importio/NamedColumnsParser.cpp | 6 +-
src/utils/importio/NamedColumnsParser.h | 6 +-
src/utils/iodevices/BinaryFormatter.cpp | 14 +-
src/utils/iodevices/BinaryFormatter.h | 19 +-
src/utils/iodevices/BinaryInputDevice.cpp | 4 +-
src/utils/iodevices/BinaryInputDevice.h | 4 +-
src/utils/iodevices/OutputDevice.cpp | 12 +-
src/utils/iodevices/OutputDevice.h | 44 +-
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 | 12 +-
src/utils/iodevices/PlainXMLFormatter.cpp | 9 +-
src/utils/iodevices/PlainXMLFormatter.h | 9 +-
src/utils/options/Option.cpp | 4 +-
src/utils/options/Option.h | 4 +-
src/utils/options/OptionsCont.cpp | 8 +-
src/utils/options/OptionsCont.h | 6 +-
src/utils/options/OptionsIO.cpp | 4 +-
src/utils/options/OptionsIO.h | 4 +-
src/utils/options/OptionsLoader.cpp | 4 +-
src/utils/options/OptionsLoader.h | 4 +-
src/utils/options/OptionsParser.cpp | 4 +-
src/utils/options/OptionsParser.h | 4 +-
src/utils/shapes/PointOfInterest.h | 4 +-
src/utils/shapes/Polygon.cpp | 4 +-
src/utils/shapes/Polygon.h | 4 +-
src/utils/shapes/Shape.cpp | 4 +-
src/utils/shapes/Shape.h | 4 +-
src/utils/shapes/ShapeContainer.cpp | 4 +-
src/utils/shapes/ShapeContainer.h | 4 +-
src/utils/traci/TraCIAPI.cpp | 6 +-
src/utils/traci/TraCIAPI.h | 8 +-
src/utils/xml/GenericSAXHandler.cpp | 4 +-
src/utils/xml/GenericSAXHandler.h | 4 +-
src/utils/xml/SAXWeightsHandler.cpp | 4 +-
src/utils/xml/SAXWeightsHandler.h | 4 +-
src/utils/xml/SUMORouteHandler.cpp | 25 +-
src/utils/xml/SUMORouteHandler.h | 7 +-
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 | 21 +-
src/utils/xml/SUMOSAXAttributes.h | 23 +-
src/utils/xml/SUMOSAXAttributesImpl_Binary.cpp | 15 +-
src/utils/xml/SUMOSAXAttributesImpl_Binary.h | 11 +-
src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp | 15 +-
src/utils/xml/SUMOSAXAttributesImpl_Xerces.h | 11 +-
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 | 39 +-
src/utils/xml/SUMOVehicleParserHelper.h | 4 +-
src/utils/xml/SUMOXMLDefinitions.cpp | 25 +-
src/utils/xml/SUMOXMLDefinitions.h | 36 +-
src/utils/xml/XMLSubSys.cpp | 4 +-
src/utils/xml/XMLSubSys.h | 4 +-
src/windows_config.h | 9 +-
tools/10to11.py | 4 +-
tools/assign/Assignment.py | 6 +-
tools/assign/assign.py | 4 +-
tools/assign/cadytsIterate.py | 4 +-
tools/assign/costFunctionChecker.py | 4 +-
tools/assign/costMemory.py | 69 +-
tools/assign/dijkstra.py | 95 +-
tools/assign/duaIterate.py | 16 +-
tools/assign/duaIterate_analysis.py | 4 +-
tools/assign/elements.py | 4 +-
tools/assign/inputs.py | 5 +-
tools/assign/matrixDailyToHourly.py | 4 +-
tools/assign/network.py | 6 +-
tools/assign/networkStatistics.py | 4 +-
tools/assign/one-shot.py | 4 +-
tools/assign/outputs.py | 6 +-
tools/assign/routeChoices.py | 5 +-
tools/assign/run.py | 4 +-
tools/assign/statisticsElements.py | 4 +-
tools/assign/tables.py | 2 +-
tools/bin/traceExporter.py | 9 +-
tools/build/apply_astyle.py | 4 +-
tools/build/buildHTMLDocs.py | 78 +-
tools/build/checkAuthors.py | 4 +-
tools/build/checkSvnProps.py | 95 +-
tools/build/dailyBuildMSVC.py | 13 +-
tools/build/dailyUpdateMakeGCC | 2 +-
tools/build/mirrorWiki.py | 126 ++-
tools/build/pythonPropsMSVC.py | 4 +-
tools/build/svn-hook-post-commit | 5 +
tools/build/version.py | 12 +-
tools/build/wix.py | 4 +-
tools/contributed/smallmaps/AUTHOR | 1 -
tools/contributed/smallmaps/COPYING | 340 -------
tools/contributed/smallmaps/Makefile | 51 -
tools/contributed/smallmaps/README | 22 -
tools/contributed/smallmaps/smallmaps.kdevelop | 137 ---
tools/contributed/smallmaps/smallmaps.kdevelop.pcs | Bin 3894 -> 0 bytes
tools/contributed/smallmaps/smallmaps.kdevses | 29 -
tools/contributed/smallmaps/smallmaps.pro | 6 -
tools/contributed/smallmaps/src/Makefile | 145 ---
tools/contributed/smallmaps/src/fileopen.xpm | 22 -
tools/contributed/smallmaps/src/fileprint.xpm | 24 -
tools/contributed/smallmaps/src/filesave.xpm | 22 -
tools/contributed/smallmaps/src/main.cpp | 36 -
tools/contributed/smallmaps/src/moc_smallmaps.cpp | 104 --
tools/contributed/smallmaps/src/smallmaps.cpp | 253 -----
tools/contributed/smallmaps/src/smallmaps.h | 62 --
tools/contributed/smallmaps/src/src.pro | 9 -
.../src/java-gen/it/polito/appeal/traci/Edge.java | 598 ++++++------
.../it/polito/appeal/traci/InductionLoop.java | 414 ++++----
.../src/java-gen/it/polito/appeal/traci/Lane.java | 834 ++++++++--------
.../it/polito/appeal/traci/MeMeDetector.java | 322 +++----
.../src/java-gen/it/polito/appeal/traci/POI.java | 436 ++++-----
.../src/java-gen/it/polito/appeal/traci/Route.java | 222 ++---
.../it/polito/appeal/traci/TrafficLight.java | 682 ++++++-------
.../java-gen/it/polito/appeal/traci/Vehicle.java | 1001 ++++++++++----------
.../it/polito/appeal/traci/VehicleType.java | 218 ++---
.../it/polito/appeal/traci/SimulationData.java | 21 +-
.../polito/appeal/traci/SumoTraciConnection.java | 6 +-
.../traci4j/src/xml/traciObjects/Vehicle.xml | 16 +
.../appeal/traci/test/PositionConvertionTest.java | 30 +
.../polito/appeal/traci/test/TraCIServerTest.java | 2 +-
.../it/polito/appeal/traci/test/TraCITest.java | 32 +-
tools/contributed/trafficmodeler/MANIFEST.MF | 4 +
.../contributed/trafficmodeler/SUMOConfXML.jardesc | 2 +-
tools/contributed/trafficmodeler/build.sh | 10 +
.../trafficmodeler/jar/SUMOTradegen.jar | Bin 366878 -> 0 bytes
.../trafficmodeler/jar/SUMOTrafficModeler.jar | Bin 0 -> 834386 bytes
.../trafficmodeler/{jar => lib}/colt.jar | Bin 581945 -> 581945 bytes
tools/contributed/trafficmodeler/run.sh | 2 +
.../src/helpers/ApplicationSettings.java | 10 +-
.../trafficmodeler/src/simulation/Adult.java | 8 +-
.../src/simulation/SimulationExporter.java | 45 +-
.../src/simulation/TrafficGenerator.java | 10 +-
.../trafficmodeler/src/simulation/VehicleType.java | 2 +-
.../trafficmodeler/src/ui/MainWindow.java | 2 +-
tools/detector/deleteUnusedDetectors.py | 4 +-
tools/detector/detector.py | 49 +-
tools/detector/flowrouter.py | 219 +++--
tools/district/countConnectionsInDistricts.py | 4 +-
tools/district/districtMapper.py | 4 +-
tools/district/edgesInDistricts.py | 4 +-
tools/game/cross/cross.rou.xml | 30 +-
.../settings.xml => cross/cross3d.settings.xml} | 12 +-
...t.sumocfg.disabled => cross3d.sumocfg.disabled} | 6 +-
tools/game/cross_opt.sumocfg.disabled | 2 +-
tools/game/kuehne.sumocfg.disabled | 2 +-
tools/game/kuehne/kuehne.rou.xml | 4 +-
tools/game/patchTrafficLights.py | 4 +-
tools/game/runner.py | 10 +-
tools/game/square/settings.xml | 2 +-
tools/game/square/square.rou.xml | 4 +-
tools/import/osm/osmBuild.py | 4 +-
tools/import/osm/osmGet.py | 4 +-
tools/import/osm/osmPopulationExtractor.py | 4 +-
tools/import/vissim/vissim_parseBusStops.py | 4 +-
tools/import/vissim/vissim_parseRoutes.py | 4 +-
tools/import/visum/visum_convertEdgeTypes.py | 4 +-
tools/import/visum/visum_convertRoutes.py | 4 +-
tools/import/visum/visum_convertTurnPercentages.py | 4 +-
tools/import/visum/visum_parseZaehlstelle.py | 4 +-
tools/lib/sumonet.py | 19 -
tools/lib/sumopoi.py | 19 -
tools/lib/testUtil.py | 4 +-
tools/net/0103to0110.py | 4 +-
tools/net/0123to0130.py | 4 +-
tools/net/OrderedMultiSet.py | 9 +-
tools/net/batch0103to0110.py | 4 +-
tools/net/createRoundaboutConnections.py | 4 +-
tools/net/netcheck.py | 4 +-
tools/net/netdiff.py | 44 +-
tools/net/netduplicate.py | 4 +-
tools/net/netextract.py | 4 +-
tools/net/netextract_subPart.py | 4 +-
tools/net/netshiftadaptor.py | 4 +-
tools/net/netstats.py | 4 +-
tools/net/network_statistics.py | 2 +-
tools/net/odConnectionsCheck.py | 4 +-
tools/net/patchNetFiles.py | 4 +-
tools/net/prepareVISUM.py | 4 +-
tools/net/reprojectpolys.py | 4 +-
tools/net/visum_mapDistricts.py | 4 +-
tools/net/xmlconnections_mapEdges.py | 4 +-
tools/net/xmledges_applyOffset.py | 4 +-
tools/net/xmlnodes_applyOffset.py | 4 +-
tools/output/analyze_teleports.py | 4 +-
tools/output/generateITetrisIntersectionMetrics.py | 4 +-
tools/output/generateITetrisNetworkMetrics.py | 4 +-
tools/output/generateTLSE1Detectors.py | 4 +-
tools/output/generateTLSE2Detectors.py | 4 +-
tools/output/generateTLSE3Detectors.py | 4 +-
tools/output/netdumpdiff.py | 4 +-
tools/output/netdumpmean.py | 4 +-
tools/output/timingStats.py | 4 +-
tools/output/vehrouteDiff.py | 69 ++
.../TaxiFCD_Krieg/src/analysis/CompareVelocitys.py | 2 +-
.../TaxiFCD_Krieg/src/analysis/FetchData.py | 2 +-
tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py | 2 +-
.../TaxiFCD_Krieg/src/analysis/Traveltime.py | 2 +-
.../TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py | 2 +-
.../TaxiFCD_Krieg/src/analysis/VelocityCurve.py | 2 +-
.../src/analysis/VelocityOverRoute.py | 2 +-
.../TaxiFCD_Krieg/src/analysis/VelocityOverTime.py | 2 +-
.../TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py | 2 +-
.../src/fcdQuality/ParamEffectsOLD.py | 2 +-
.../src/fcdQuality/ParamEffectsProcessedFCD.py | 2 +-
.../src/fcdToRoutes/FCDvsCompleteRoute.py | 2 +-
.../src/fcdToRoutes/GenerateTaxiRoutes.py | 2 +-
.../src/fcdToRoutes/GenerateTaxiRoutesMain.py | 2 +-
.../src/fcdToRoutes/My_mpl_dump_onNet.py | 4 +-
.../src/fcdToRoutes/differentDepartRoutes.py | 2 +-
.../TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py | 2 +-
.../src/taxiQuantity/QuantityOverDay.py | 2 +-
.../src/taxiQuantity/SeparateVLSArea.py | 2 +-
.../TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py | 2 +-
tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py | 2 +-
tools/projects/TaxiFCD_Krieg/src/util/Path.py | 2 +-
.../projects/TaxiFCD_Krieg/src/util/ProgressBar.py | 2 +-
tools/projects/TaxiFCD_Krieg/src/util/Reader.py | 2 +-
tools/removeSVN.py | 4 +-
tools/route/extract_route_edges.py | 4 +-
tools/route/findUTurns.py | 4 +-
tools/route/route2alts.py | 4 +-
tools/route/route2poly.py | 6 +-
tools/route/route_1htoDay.py | 4 +-
tools/route/route_departOffset.py | 4 +-
tools/route/routecheck.py | 4 +-
tools/route/routecompare.py | 4 +-
tools/route/routes2OD.py | 4 +-
tools/route/routes_Join.py | 4 +-
tools/route/sort_routes.py | 4 +-
tools/route/vehicle2flow.py | 55 ++
tools/shapes/CSV2polyconvertXML.py | 2 +-
tools/shapes/circlePolygon.py | 4 +-
tools/shapes/poi_alongRoads.py | 2 +-
tools/shapes/poi_atTLS.py | 4 +-
tools/shapes/pois2inductionLoops.py | 4 +-
tools/sumolib/__init__.py | 6 +-
tools/sumolib/color.py | 4 +-
tools/sumolib/files/__init__.py | 7 +-
tools/sumolib/files/selection.py | 23 +
tools/sumolib/geomhelper.py | 49 +-
tools/sumolib/miscutils.py | 54 +-
tools/sumolib/net/__init__.py | 17 +-
tools/sumolib/net/connection.py | 4 +-
tools/sumolib/net/edge.py | 4 +-
tools/sumolib/net/lane.py | 4 +-
tools/sumolib/net/node.py | 4 +-
tools/sumolib/net/roundabout.py | 4 +-
tools/sumolib/options.py | 4 +-
tools/sumolib/output/__init__.py | 4 +-
tools/sumolib/output/convert/__init__.py | 4 +-
tools/sumolib/output/convert/gpsdat.py | 4 +-
tools/sumolib/output/convert/ns2.py | 4 +-
tools/sumolib/output/convert/omnet.py | 4 +-
tools/sumolib/output/convert/phem.py | 15 +-
tools/sumolib/output/convert/shawn.py | 4 +-
tools/sumolib/sensors/__init__.py | 4 +-
tools/sumolib/sensors/inductive_loop.py | 4 +-
tools/sumolib/shapes/__init__.py | 4 +-
tools/sumolib/shapes/poi.py | 15 +-
tools/sumolib/shapes/polygon.py | 4 +-
tools/tls/tls_check.py | 4 +-
tools/tls/tls_csv2SUMO.py | 8 +-
tools/traci/__init__.py | 4 +-
tools/traci/constants.py | 17 +-
tools/traci/edge.py | 8 +-
tools/traci/gui.py | 6 +-
tools/traci/inductionloop.py | 6 +-
tools/traci/junction.py | 6 +-
tools/traci/lane.py | 12 +-
tools/traci/multientryexit.py | 6 +-
tools/traci/poi.py | 4 +-
tools/traci/polygon.py | 6 +-
tools/traci/rebuildConstants.py | 6 +-
tools/traci/route.py | 4 +-
tools/traci/simulation.py | 14 +-
tools/traci/trafficlights.py | 6 +-
tools/traci/vehicle.py | 6 +-
tools/traci/vehicletype.py | 4 +-
tools/trigger/csv2vss.py | 68 ++
tools/trip/generateTripsXml.py | 6 +-
tools/trip/randomTrips.py | 16 +-
tools/trip/route2trips.py | 6 +-
tools/visualization/mpl_dump_onNet.py | 8 +-
tools/visualization/mpl_dump_timeline.py | 4 +-
tools/visualization/mpl_dump_twoAgainst.py | 4 +-
tools/visualization/mpl_tripinfos_twoAgainst.py | 4 +-
tools/xml/addSchema.py | 4 +-
tools/xml/binary2plain.py | 4 +-
tools/xml/configTemplateToWiki.py | 4 +-
tools/xml/rebuildSchemata.py | 9 +-
tools/xml/schemaCheck.py | 8 +-
tools_filelist | 33 +-
unittest/src/Makefile.am | 33 +-
unittest/src/Makefile.in | 65 +-
unittest/src/microsim/MSCFModelTest.cpp | 46 +
unittest/src/microsim/MSEventControlTest.cpp | 2 -
unittest/src/microsim/Makefile.am | 3 +-
unittest/src/microsim/Makefile.in | 8 +-
unittest/src/utils/geom/LineTest.cpp | 4 +-
unittest/src/utils/geom/PositionVectorTest.cpp | 12 +
1279 files changed, 13826 insertions(+), 12170 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git
More information about the debian-science-commits
mailing list