[sumo] branch master updated (a52c792 -> e2c7d46)
Anton Gladky
gladk at moszumanska.debian.org
Fri Aug 12 18:44:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a change to branch master
in repository sumo.
from a52c792 Update changelog.
adds 0622343 Imported Upstream version 0.27.1+dfsg1
new 06bd55e Merge.
new e550fac Refresh patches.
new 03913ad Apply cme fix dpkg-copytight.
new e2c7d46 Update changelog.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile.am | 16 +-
Makefile.in | 16 +-
configure | 35 +-
configure.ac | 10 +-
data/3D/car-microcargo-citrus.mtl | 65 +
data/3D/car-microcargo-citrus.obj | 2422 ++++++
data/3D/car-minibus-citrus.mtl | 65 +
data/3D/car-minibus-citrus.obj | 2614 +++++++
data/3D/car-normal-citrus.mtl | 65 +
data/3D/car-normal-citrus.obj | 2448 ++++++
data/3D/tl.obj.mtl | 34 +
data/3D/tlg.obj | 5075 ++++++++++++
data/3D/tlr.obj | 5075 ++++++++++++
data/3D/tlu.obj | 5075 ++++++++++++
data/3D/tly.obj | 5075 ++++++++++++
data/typemap/opendriveNetconvert.typ.xml | 39 +-
data/typemap/opendriveNetconvertBicycle.typ.xml | 2 +-
.../typemap/opendriveNetconvertPedestrians.typ.xml | 2 +-
data/typemap/osmNetconvert.typ.xml | 4 +-
data/typemap/osmNetconvertBicycle.typ.xml | 8 +-
data/xsd/additional_file.xsd | 14 +
data/xsd/det_e2_file.xsd | 2 +-
data/xsd/edgediff_file.xsd | 6 +
data/xsd/edges_file.xsd | 6 +
data/xsd/marouterConfiguration.xsd | 2 +
data/xsd/net_file.xsd | 5 +
data/xsd/netconvertConfiguration.xsd | 4 +
data/xsd/netgenerateConfiguration.xsd | 4 +
data/xsd/netstate_file.xsd | 9 +-
data/xsd/polyconvertConfiguration.xsd | 2 +-
data/xsd/routeTypes.xsd | 14 +
data/xsd/sumoConfiguration.xsd | 6 +-
debian/changelog | 8 +
debian/copyright | 70 +-
debian/patches/10_remove_embedded_gl2ps.patch | 56 +-
debian/patches/20_fix_scripts_headers.patch | 62 +-
debian/patches/30_add_missing_link.patch | 12 +-
debian/patches/40_drop_some_buildflags.patch | 8 +-
debian/patches/50_use_system_openlayers.patch | 6 +-
.../dlr-testtrack/input_connections.con.xml | 4 +-
.../sumo/sublane_model/input_routes.rou.xml | 9 +
docs/examples/sumo/sublane_model/net.net.xml | 54 +
.../sublane_model.sumocfg} | 8 +-
.../sumo/visualization/parade/input_routes.rou.xml | 83 +
.../examples/sumo/visualization/parade/net.net.xml | 208 +
.../sumo/visualization/parade/parade.sumocfg | 1 +
docs/tutorial/osm_activitygen/eichstaett.osm | 8120 ++++++++++++++++++++
src/activitygen/city/AGAdult.cpp | 32 +-
src/activitygen/city/AGCity.cpp | 12 +-
src/activitygen/city/AGHousehold.cpp | 10 +-
src/activitygen/city/AGHousehold.h | 6 +-
src/activitygen/city/AGStreet.cpp | 4 +-
src/activitygen/city/AGStreet.h | 4 +-
src/config.h | 6 +-
src/dfrouter/RODFDetector.cpp | 32 +-
src/dfrouter/RODFDetector.h | 8 +-
src/dfrouter/RODFDetectorFlow.cpp | 6 +-
src/dfrouter/RODFDetectorHandler.cpp | 4 +-
src/dfrouter/RODFEdge.cpp | 4 +-
src/dfrouter/RODFEdge.h | 4 +-
src/dfrouter/RODFNet.cpp | 26 +-
src/dfrouter/RODFNet.h | 4 +-
src/duarouter/duarouter_main.cpp | 6 +-
src/foreign/PHEMlight/cpp/CEP.cpp | 3 +-
src/foreign/PHEMlight/cpp/CEPHandler.cpp | 2 +-
src/foreign/tcpip/socket.cpp | 60 +-
src/foreign/tcpip/socket.h | 4 +-
src/gui/GUIApplicationWindow.cpp | 115 +-
src/gui/GUIApplicationWindow.h | 16 +-
src/gui/GUIGlobals.cpp | 8 +-
src/gui/GUIGlobals.h | 5 +-
src/gui/GUILoadThread.cpp | 12 +-
src/gui/GUIRunThread.h | 6 +-
src/gui/GUISUMOViewParent.cpp | 6 +-
src/gui/GUITLLogicPhasesTrackerWindow.cpp | 24 +-
src/gui/GUITLLogicPhasesTrackerWindow.h | 6 +-
src/gui/GUIViewTraffic.cpp | 14 +-
src/gui/GUIViewTraffic.h | 6 +-
src/gui/TraCIServerAPI_GUI.cpp | 12 +-
src/gui/dialogs/GUIDialog_AppSettings.cpp | 61 +-
src/gui/dialogs/GUIDialog_AppSettings.h | 18 +-
src/gui/dialogs/GUIDialog_Breakpoints.cpp | 118 +-
src/gui/dialogs/GUIDialog_Breakpoints.h | 17 +-
src/guinetload/GUIEdgeControlBuilder.h | 3 +-
src/guinetload/GUITriggerBuilder.cpp | 16 +-
src/guinetload/GUITriggerBuilder.h | 18 +-
src/guisim/GUIBaseVehicle.cpp | 36 +-
src/guisim/GUIBaseVehicle.h | 34 +-
src/guisim/GUIBusStop.cpp | 7 +-
src/guisim/GUICalibrator.cpp | 4 +-
src/guisim/GUIChargingStation.cpp | 110 +-
src/guisim/GUIChargingStation.h | 43 +-
src/guisim/GUIContainer.cpp | 6 +-
src/guisim/GUIContainer.h | 6 +-
src/guisim/GUIContainerControl.cpp | 59 -
src/guisim/GUIContainerControl.h | 66 -
src/guisim/GUIContainerStop.cpp | 8 +-
src/guisim/GUIEdge.cpp | 121 +-
src/guisim/GUIEdge.h | 26 +-
src/guisim/GUIInductLoop.cpp | 8 +-
src/guisim/GUIInductLoop.h | 6 +-
src/guisim/GUIJunctionWrapper.cpp | 16 +-
src/guisim/GUILane.cpp | 141 +-
src/guisim/GUILane.h | 37 +-
src/guisim/GUILaneSpeedTrigger.cpp | 6 +-
src/guisim/GUINet.cpp | 50 +-
src/guisim/GUINet.h | 16 +-
src/guisim/GUIPerson.cpp | 12 +-
src/guisim/GUIPerson.h | 6 +-
src/guisim/GUITrafficLightLogicWrapper.cpp | 10 +-
...rsonControl.cpp => GUITransportableControl.cpp} | 31 +-
...UIPersonControl.h => GUITransportableControl.h} | 31 +-
src/guisim/GUITriggeredRerouter.cpp | 8 +-
src/guisim/GUIVehicle.cpp | 99 +-
src/guisim/GUIVehicle.h | 13 +-
src/guisim/GUI_E2_ZS_Collector.cpp | 12 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.cpp | 4 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.h | 4 +-
src/guisim/Makefile.am | 6 +-
src/guisim/Makefile.in | 25 +-
src/guisim_main.cpp | 15 +-
src/jtrrouter/ROJTREdge.cpp | 15 +-
src/jtrrouter/ROJTREdge.h | 4 +-
src/jtrrouter/jtrrouter_main.cpp | 4 +-
src/marouter/ROMAAssignments.cpp | 7 +-
src/marouter/ROMAEdge.cpp | 4 +-
src/marouter/ROMAEdge.h | 4 +-
src/marouter/ROMAFrame.cpp | 8 +-
src/marouter/ROMARouteHandler.cpp | 27 +-
.../ROMARouteHandler.h} | 71 +-
src/marouter/marouter_main.cpp | 75 +-
src/mesogui/GUIMEVehicle.cpp | 35 +-
src/mesogui/GUIMEVehicle.h | 48 +-
src/mesosim/MELoop.cpp | 23 +-
src/mesosim/MELoop.h | 5 +-
src/mesosim/MESegment.cpp | 102 +-
src/mesosim/MESegment.h | 52 +-
src/mesosim/METriggeredCalibrator.cpp | 4 +-
src/mesosim/MEVehicle.cpp | 24 +-
src/mesosim/MEVehicle.h | 17 +-
src/microsim/MSBaseVehicle.cpp | 52 +-
src/microsim/MSBaseVehicle.h | 44 +-
src/microsim/MSBitSetLogic.h | 12 +-
src/microsim/MSContainer.cpp | 219 +-
src/microsim/MSContainer.h | 211 +-
src/microsim/MSContainerControl.cpp | 239 -
src/microsim/MSContainerControl.h | 138 -
src/microsim/MSEdge.cpp | 146 +-
src/microsim/MSEdge.h | 53 +-
src/microsim/MSEdgeControl.cpp | 21 +-
src/microsim/MSEdgeControl.h | 2 +-
src/microsim/MSFrame.cpp | 60 +-
src/microsim/MSGlobals.cpp | 4 +-
src/microsim/MSGlobals.h | 5 +-
src/microsim/MSInsertionControl.cpp | 51 +-
src/microsim/MSInsertionControl.h | 22 +-
src/microsim/MSInternalJunction.cpp | 4 +-
src/microsim/MSJunctionLogic.cpp | 6 +-
src/microsim/MSJunctionLogic.h | 16 +-
src/microsim/MSLane.cpp | 1409 +++-
src/microsim/MSLane.h | 394 +-
src/microsim/MSLaneChanger.cpp | 709 +-
src/microsim/MSLaneChanger.h | 76 +-
src/microsim/MSLaneChangerSublane.cpp | 309 +
src/microsim/MSLaneChangerSublane.h | 102 +
src/microsim/MSLeaderInfo.cpp | 368 +
src/microsim/MSLeaderInfo.h | 220 +
src/microsim/MSLink.cpp | 275 +-
src/microsim/MSLink.h | 68 +-
src/microsim/MSLogicJunction.cpp | 4 +-
src/microsim/MSNet.cpp | 53 +-
src/microsim/MSNet.h | 50 +-
src/microsim/MSPersonControl.cpp | 260 -
src/microsim/MSPersonControl.h | 225 -
src/microsim/MSRightOfWayJunction.cpp | 12 +-
src/microsim/MSRoute.cpp | 8 +-
src/microsim/MSRoute.h | 8 +-
src/microsim/MSRouteHandler.cpp | 74 +-
src/microsim/MSStateHandler.cpp | 7 +-
src/microsim/MSStateHandler.h | 4 +-
src/microsim/MSStoppingPlace.h | 6 +-
src/microsim/MSTransportable.cpp | 237 +-
src/microsim/MSTransportable.h | 174 +-
src/microsim/MSTransportableControl.cpp | 276 +
src/microsim/MSTransportableControl.h | 232 +
src/microsim/MSVehicle.cpp | 1091 ++-
src/microsim/MSVehicle.h | 201 +-
src/microsim/MSVehicleContainer.cpp | 29 +-
src/microsim/MSVehicleContainer.h | 9 +-
src/microsim/MSVehicleControl.cpp | 17 +-
src/microsim/MSVehicleControl.h | 48 +-
src/microsim/MSVehicleTransfer.cpp | 9 +-
src/microsim/MSVehicleType.cpp | 52 +-
src/microsim/MSVehicleType.h | 26 +-
src/microsim/Makefile.am | 7 +-
src/microsim/Makefile.in | 30 +-
src/microsim/actions/Command_SaveTLSSwitches.cpp | 4 +-
src/microsim/cfmodels/MSCFModel.cpp | 9 +-
src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp | 5 +-
src/microsim/cfmodels/MSCFModel_SmartSK.cpp | 14 +-
src/microsim/devices/MSDevice.cpp | 10 +-
src/microsim/devices/MSDevice.h | 7 +-
src/microsim/devices/MSDevice_BTsender.h | 6 +-
src/microsim/devices/MSDevice_Battery.cpp | 634 +-
src/microsim/devices/MSDevice_Battery.h | 309 +-
src/microsim/devices/MSDevice_Routing.cpp | 89 +-
src/microsim/devices/MSDevice_Routing.h | 24 +-
src/microsim/devices/MSDevice_Transportable.cpp | 5 +-
src/microsim/devices/MSDevice_Transportable.h | 6 +-
src/microsim/devices/MSDevice_Tripinfo.cpp | 5 +-
src/microsim/devices/MSDevice_Tripinfo.h | 4 +-
src/microsim/devices/MSDevice_Vehroutes.cpp | 31 +-
src/microsim/devices/MSDevice_Vehroutes.h | 10 +-
.../lcmodels/MSAbstractLaneChangeModel.cpp | 309 +-
src/microsim/lcmodels/MSAbstractLaneChangeModel.h | 258 +-
src/microsim/lcmodels/MSLCM_DK2008.cpp | 15 +-
src/microsim/lcmodels/MSLCM_DK2008.h | 4 +-
src/microsim/lcmodels/MSLCM_JE2013.cpp | 439 +-
src/microsim/lcmodels/MSLCM_JE2013.h | 20 +-
src/microsim/lcmodels/MSLCM_LC2013.cpp | 563 +-
src/microsim/lcmodels/MSLCM_LC2013.h | 20 +-
src/microsim/lcmodels/MSLCM_SL2015.cpp | 2105 +++++
src/microsim/lcmodels/MSLCM_SL2015.h | 335 +
src/microsim/lcmodels/Makefile.am | 1 +
src/microsim/lcmodels/Makefile.in | 5 +-
src/microsim/logging/FuncBinding_IntParam.h | 4 +-
src/microsim/output/MSBatteryExport.cpp | 8 +-
src/microsim/output/MSE2Collector.cpp | 46 +-
src/microsim/output/MSE2Collector.h | 38 +-
src/microsim/output/MSE3Collector.cpp | 6 +-
src/microsim/output/MSE3Collector.h | 6 +-
src/microsim/output/MSFCDExport.cpp | 11 +-
src/microsim/output/MSFullExport.cpp | 4 +-
src/microsim/output/MSInductLoop.cpp | 14 +-
src/microsim/output/MSInductLoop.h | 10 +-
src/microsim/output/MSInstantInductLoop.cpp | 32 +-
src/microsim/output/MSMeanData_Amitran.cpp | 6 +-
src/microsim/output/MSMeanData_Amitran.h | 6 +-
src/microsim/output/MSMeanData_Net.h | 16 +-
src/microsim/output/MSRouteProbe.cpp | 4 +-
src/microsim/output/MSVTKExport.cpp | 4 +-
src/microsim/output/MSXMLRawOut.cpp | 10 +-
.../output/MS_E2_ZS_CollectorOverLanes.cpp | 10 +-
src/microsim/output/MS_E2_ZS_CollectorOverLanes.h | 6 +-
src/microsim/pedestrians/MSPModel_Striping.cpp | 18 +-
src/microsim/pedestrians/MSPerson.cpp | 244 +-
src/microsim/pedestrians/MSPerson.h | 171 +-
.../traffic_lights/MSActuatedTrafficLightLogic.cpp | 14 +-
.../traffic_lights/MSActuatedTrafficLightLogic.h | 4 +-
.../MSDeterministicHiLevelTrafficLightLogic.cpp | 10 +-
.../MSDeterministicHiLevelTrafficLightLogic.h | 4 +-
.../traffic_lights/MSOffTrafficLightLogic.cpp | 10 +-
.../traffic_lights/MSOffTrafficLightLogic.h | 8 +-
.../traffic_lights/MSPhasedTrafficLightLogic.cpp | 20 +-
.../traffic_lights/MSPhasedTrafficLightLogic.h | 10 +-
src/microsim/traffic_lights/MSRailCrossing.cpp | 10 +-
src/microsim/traffic_lights/MSRailCrossing.h | 8 +-
src/microsim/traffic_lights/MSRailSignal.cpp | 10 +-
src/microsim/traffic_lights/MSRailSignal.h | 10 +-
src/microsim/traffic_lights/MSSOTLE2Sensors.cpp | 22 +-
src/microsim/traffic_lights/MSSOTLE2Sensors.h | 4 +-
.../MSSOTLHiLevelTrafficLightLogic.cpp | 8 +-
.../MSSOTLHiLevelTrafficLightLogic.h | 12 +-
.../MSSOTLPhaseTrafficLightLogic.cpp | 6 +-
.../traffic_lights/MSSOTLPhaseTrafficLightLogic.h | 6 +-
.../MSSOTLPlatoonTrafficLightLogic.cpp | 6 +-
.../MSSOTLPlatoonTrafficLightLogic.h | 6 +-
.../MSSOTLPolicy5DFamilyStimulus.cpp | 6 +-
.../MSSOTLPolicyBasedTrafficLightLogic.cpp | 6 +-
.../MSSOTLPolicyBasedTrafficLightLogic.h | 6 +-
.../MSSOTLRequestTrafficLightLogic.cpp | 6 +-
.../MSSOTLRequestTrafficLightLogic.h | 6 +-
src/microsim/traffic_lights/MSSOTLSensors.h | 4 +-
.../traffic_lights/MSSOTLTrafficLightLogic.cpp | 24 +-
.../traffic_lights/MSSOTLTrafficLightLogic.h | 10 +-
.../traffic_lights/MSSOTLWaveTrafficLightLogic.cpp | 6 +-
.../traffic_lights/MSSOTLWaveTrafficLightLogic.h | 6 +-
.../traffic_lights/MSSimpleTrafficLightLogic.cpp | 22 +-
.../traffic_lights/MSSimpleTrafficLightLogic.h | 12 +-
.../traffic_lights/MSSwarmTrafficLightLogic.cpp | 24 +-
.../traffic_lights/MSSwarmTrafficLightLogic.h | 6 +-
src/microsim/traffic_lights/MSTLLogicControl.cpp | 36 +-
src/microsim/traffic_lights/MSTLLogicControl.h | 14 +-
.../traffic_lights/MSTrafficLightLogic.cpp | 18 +-
src/microsim/traffic_lights/MSTrafficLightLogic.h | 14 +-
src/microsim/trigger/MSCalibrator.cpp | 10 +-
src/microsim/trigger/MSCalibrator.h | 8 +-
src/microsim/trigger/MSChargingStation.cpp | 125 +-
src/microsim/trigger/MSChargingStation.h | 81 +-
src/microsim/trigger/MSContainerTerminal.cpp | 111 -
src/microsim/trigger/MSContainerTerminal.h | 179 -
src/microsim/trigger/Makefile.am | 1 -
src/microsim/trigger/Makefile.in | 7 +-
src/netbuild/Makefile.am | 4 +-
src/netbuild/Makefile.in | 7 +-
src/netbuild/NBAlgorithms.h | 8 +-
src/netbuild/NBAlgorithms_Ramps.cpp | 6 +-
src/netbuild/NBConnection.cpp | 6 +-
src/netbuild/NBCont.h | 4 +-
src/netbuild/NBContHelper.cpp | 63 +-
src/netbuild/NBContHelper.h | 25 +-
src/netbuild/NBDistrict.cpp | 8 +-
src/netbuild/NBDistrictCont.cpp | 6 +-
src/netbuild/NBDistrictCont.h | 4 +-
src/netbuild/NBEdge.cpp | 483 +-
src/netbuild/NBEdge.h | 153 +-
src/netbuild/NBEdgeCont.cpp | 111 +-
src/netbuild/NBEdgeCont.h | 40 +-
src/netbuild/NBFrame.cpp | 16 +-
src/netbuild/NBHeightMapper.cpp | 21 +-
src/netbuild/NBJoinedEdgesMap.cpp | 92 -
src/netbuild/NBJoinedEdgesMap.h | 94 -
src/netbuild/NBLoadedSUMOTLDef.cpp | 24 +-
src/netbuild/NBLoadedSUMOTLDef.h | 4 +-
src/netbuild/NBLoadedTLDef.cpp | 62 +-
src/netbuild/NBLoadedTLDef.h | 18 +-
src/netbuild/NBNetBuilder.cpp | 33 +-
src/netbuild/NBNetBuilder.h | 13 +-
src/netbuild/NBNode.cpp | 295 +-
src/netbuild/NBNode.h | 28 +-
src/netbuild/NBNodeCont.cpp | 47 +-
src/netbuild/NBNodeCont.h | 17 +-
src/netbuild/NBOwnTLDef.cpp | 88 +-
src/netbuild/NBOwnTLDef.h | 8 +-
src/netbuild/NBRequest.cpp | 82 +-
src/netbuild/NBRequest.h | 10 +-
src/netbuild/NBTrafficLightDefinition.cpp | 15 +-
src/netbuild/NBTrafficLightDefinition.h | 6 +-
src/netbuild/NBTrafficLightLogic.cpp | 26 +-
src/netbuild/NBTrafficLightLogic.h | 14 +-
src/netbuild/NBTrafficLightLogicCont.cpp | 8 +-
src/netbuild/NBTrafficLightLogicCont.h | 8 +-
src/netbuild/NBTypeCont.cpp | 4 +-
src/netbuild/NBTypeCont.h | 9 +-
src/netedit/GNEAdditional.cpp | 369 +
src/netedit/GNEAdditional.h | 296 +
src/netedit/GNEAdditionalDialog.cpp | 92 +
src/netedit/GNEAdditionalDialog.h | 113 +
src/netedit/GNEAdditionalFrame.cpp | 1468 ++++
src/netedit/GNEAdditionalFrame.h | 623 ++
src/netedit/GNEAdditionalHandler.cpp | 1303 ++++
src/netedit/GNEAdditionalHandler.h | 407 +
src/netedit/GNEAdditionalSet.cpp | 388 +
src/netedit/GNEAdditionalSet.h | 240 +
src/netedit/GNEApplicationWindow.cpp | 179 +-
src/netedit/GNEApplicationWindow.h | 168 +-
src/netedit/GNEAttributeCarrier.cpp | 783 +-
src/netedit/GNEAttributeCarrier.h | 143 +-
src/netedit/GNEBusStop.cpp | 397 +
src/netedit/GNEBusStop.h | 133 +
src/netedit/GNECalibrator.cpp | 398 +
src/netedit/GNECalibrator.h | 183 +
src/netedit/GNECalibratorDialog.cpp | 425 +
src/netedit/GNECalibratorDialog.h | 161 +
src/netedit/GNEChange.cpp | 31 +-
src/netedit/GNEChange.h | 35 +-
src/netedit/GNEChange_Additional.cpp | 99 +
.../{GNEChange_Edge.h => GNEChange_Additional.h} | 60 +-
src/netedit/GNEChange_Attribute.cpp | 20 +-
src/netedit/GNEChange_Attribute.h | 22 +-
src/netedit/GNEChange_Connection.cpp | 6 +-
src/netedit/GNEChange_Connection.h | 42 +-
src/netedit/GNEChange_Edge.cpp | 70 +-
src/netedit/GNEChange_Edge.h | 30 +-
src/netedit/GNEChange_Junction.h | 17 +-
src/netedit/GNEChange_Lane.cpp | 35 +-
src/netedit/GNEChange_Lane.h | 31 +-
src/netedit/GNEChange_Selection.h | 16 +-
src/netedit/GNEChange_TLS.h | 16 +-
src/netedit/GNEChargingStation.cpp | 483 ++
src/netedit/GNEChargingStation.h | 172 +
src/netedit/GNEConnection.cpp | 281 +
src/netedit/GNEConnection.h | 230 +
.../{GNEConnector.cpp => GNEConnectorFrame.cpp} | 193 +-
.../{GNEConnector.h => GNEConnectorFrame.h} | 88 +-
src/netedit/GNEContainerStop.cpp | 397 +
src/netedit/GNEContainerStop.h | 133 +
src/netedit/GNECrossing.cpp | 26 +-
src/netedit/GNECrossing.h | 65 +-
src/netedit/GNEDetector.cpp | 191 +
src/netedit/GNEDetector.h | 189 +
src/netedit/GNEDetectorE1.cpp | 309 +
src/netedit/GNEDetectorE1.h | 124 +
src/netedit/GNEDetectorE2.cpp | 345 +
src/netedit/GNEDetectorE2.h | 141 +
src/netedit/GNEDetectorE3.cpp | 293 +
src/netedit/GNEDetectorE3.h | 148 +
src/netedit/GNEDetectorEntry.cpp | 271 +
src/netedit/GNEDetectorEntry.h | 137 +
src/netedit/GNEDetectorExit.cpp | 273 +
src/netedit/GNEDetectorExit.h | 137 +
src/netedit/GNEDialog_About.cpp | 6 +-
src/netedit/GNEDialog_About.h | 12 +-
src/netedit/GNEDialog_Wizard.cpp | 6 +-
src/netedit/GNEDialog_Wizard.h | 52 +-
src/netedit/GNEEdge.cpp | 163 +-
src/netedit/GNEEdge.h | 189 +-
src/netedit/GNEEvent_NetworkLoaded.h | 20 +-
src/netedit/GNEFrame.cpp | 98 +
src/netedit/GNEFrame.h | 107 +
src/netedit/GNEInspector.cpp | 353 -
src/netedit/GNEInspector.h | 169 -
src/netedit/GNEInspectorFrame.cpp | 620 ++
src/netedit/GNEInspectorFrame.h | 256 +
src/netedit/GNEInternalLane.cpp | 27 +-
src/netedit/GNEInternalLane.h | 71 +-
src/netedit/GNEJunction.cpp | 139 +-
src/netedit/GNEJunction.h | 150 +-
src/netedit/GNELane.cpp | 220 +-
src/netedit/GNELane.h | 217 +-
src/netedit/GNELoadThread.cpp | 59 +-
src/netedit/GNELoadThread.h | 28 +-
src/netedit/GNENet.cpp | 279 +-
src/netedit/GNENet.h | 268 +-
.../Bresenham.cpp => netedit/GNENetElement.cpp} | 72 +-
src/netedit/GNENetElement.h | 158 +
src/netedit/GNEPOI.h | 39 +-
src/netedit/GNEPoly.h | 56 +-
.../GNEProhibition.cpp} | 49 +-
.../GUIGlobals.cpp => netedit/GNEProhibition.h} | 30 +-
src/netedit/GNEReferenceCounter.h | 4 +-
src/netedit/GNERerouter.cpp | 684 ++
src/netedit/GNERerouter.h | 347 +
src/netedit/GNERerouterDialog.cpp | 95 +
src/netedit/GNERerouterDialog.h | 92 +
src/netedit/GNERouteProbe.cpp | 379 +
src/netedit/GNERouteProbe.h | 172 +
src/netedit/GNESelector.h | 200 -
.../{GNESelector.cpp => GNESelectorFrame.cpp} | 147 +-
src/netedit/GNESelectorFrame.h | 158 +
src/netedit/GNEStoppingPlace.cpp | 176 +
src/netedit/GNEStoppingPlace.h | 183 +
.../{GNETLSEditor.cpp => GNETLSEditorFrame.cpp} | 216 +-
.../{GNETLSEditor.h => GNETLSEditorFrame.h} | 123 +-
src/netedit/GNEUndoList.cpp | 41 +-
src/netedit/GNEUndoList.h | 77 +-
src/netedit/GNEVaporizer.cpp | 356 +
src/netedit/GNEVaporizer.h | 156 +
src/netedit/GNEVariableSpeedSignal.cpp | 416 +
src/netedit/GNEVariableSpeedSignal.h | 157 +
src/netedit/GNEVariableSpeedSignalDialog.cpp | 210 +
src/netedit/GNEVariableSpeedSignalDialog.h | 117 +
src/netedit/GNEViewNet.cpp | 278 +-
src/netedit/GNEViewNet.h | 213 +-
src/netedit/GNEViewParent.cpp | 116 +-
src/netedit/GNEViewParent.h | 74 +-
src/netedit/Makefile.am | 38 +-
src/netedit/Makefile.in | 154 +-
src/netedit/netedit.rc | 1 +
src/netedit/netedit_main.cpp | 32 +-
src/netgen/NGFrame.cpp | 4 +-
src/netgen/NGNet.cpp | 11 +-
src/netgen/NGNet.h | 7 +-
src/netgen/NGRandomNetBuilder.cpp | 4 +-
src/netgen/netgen_main.cpp | 10 +-
src/netimport/NIFrame.cpp | 11 +-
src/netimport/NIImporter_ArcView.cpp | 14 +-
src/netimport/NIImporter_ArcView.h | 4 +-
src/netimport/NIImporter_DlrNavteq.cpp | 17 +-
src/netimport/NIImporter_ITSUMO.cpp | 6 +-
src/netimport/NIImporter_ITSUMO.h | 6 +-
src/netimport/NIImporter_MATSim.cpp | 4 +-
src/netimport/NIImporter_OpenDrive.cpp | 110 +-
src/netimport/NIImporter_OpenDrive.h | 47 +-
src/netimport/NIImporter_OpenStreetMap.cpp | 202 +-
src/netimport/NIImporter_OpenStreetMap.h | 10 +-
src/netimport/NIImporter_RobocupRescue.cpp | 32 +-
src/netimport/NIImporter_SUMO.cpp | 41 +-
src/netimport/NIImporter_SUMO.h | 10 +-
src/netimport/NIImporter_VISUM.cpp | 6 +-
src/netimport/NILoader.cpp | 4 +-
src/netimport/NINavTeqHelper.cpp | 4 +-
src/netimport/NINavTeqHelper.h | 4 +-
src/netimport/NIVisumTL.cpp | 4 +-
src/netimport/NIXMLConnectionsHandler.cpp | 4 +-
src/netimport/NIXMLEdgesHandler.cpp | 40 +-
src/netimport/NIXMLTrafficLightsHandler.cpp | 4 +-
src/netimport/typemap.h | 43 +-
src/netimport/vissim/NIImporter_Vissim.cpp | 4 +-
.../vissim/tempstructs/NIVissimConnection.cpp | 14 +-
.../vissim/tempstructs/NIVissimConnection.h | 4 +-
.../tempstructs/NIVissimConnectionCluster.cpp | 14 +-
.../vissim/tempstructs/NIVissimConnectionCluster.h | 6 +-
.../vissim/tempstructs/NIVissimDisturbance.cpp | 4 +-
src/netimport/vissim/tempstructs/NIVissimEdge.cpp | 19 +-
src/netimport/vissim/tempstructs/NIVissimEdge.h | 6 +-
.../vissim/tempstructs/NIVissimNodeCluster.cpp | 6 +-
.../vissim/tempstructs/NIVissimNodeCluster.h | 4 +-
.../vissim/tempstructs/NIVissimNodeDef.cpp | 6 +-
src/netimport/vissim/tempstructs/NIVissimNodeDef.h | 4 +-
src/netimport/vissim/tempstructs/NIVissimTL.cpp | 22 +-
src/netload/NLBuilder.cpp | 23 +-
src/netload/NLDetectorBuilder.cpp | 22 +-
src/netload/NLEdgeControlBuilder.cpp | 11 +-
src/netload/NLEdgeControlBuilder.h | 19 +-
src/netload/NLHandler.cpp | 24 +-
src/netload/NLHandler.h | 9 +-
src/netload/NLJunctionControlBuilder.cpp | 8 +-
src/netload/NLJunctionControlBuilder.h | 6 +-
src/netload/NLTriggerBuilder.cpp | 22 +-
src/netload/NLTriggerBuilder.h | 13 +-
src/netwrite/NWFrame.cpp | 4 +-
src/netwrite/NWFrame.h | 19 +-
src/netwrite/NWWriter_DlrNavteq.cpp | 25 +-
src/netwrite/NWWriter_DlrNavteq.h | 4 +-
src/netwrite/NWWriter_OpenDrive.cpp | 361 +-
src/netwrite/NWWriter_OpenDrive.h | 19 +-
src/netwrite/NWWriter_SUMO.cpp | 93 +-
src/netwrite/NWWriter_SUMO.h | 15 +-
src/netwrite/NWWriter_XML.cpp | 15 +-
src/od/ODDistrict.cpp | 10 +-
src/od/ODDistrict.h | 6 +-
src/od/ODMatrix.cpp | 106 +-
src/od/ODMatrix.h | 43 +-
src/od2trips_main.cpp | 10 +-
src/osgview/GUIOSGBoundingBoxCalculator.h | 10 +-
src/osgview/GUIOSGBuilder.cpp | 9 +-
src/osgview/GUIOSGView.cpp | 35 +-
src/osgview/GUIOSGView.h | 9 +-
src/polyconvert/PCLoaderArcView.cpp | 30 +-
src/polyconvert/PCLoaderDlrNavteq.cpp | 24 +-
src/polyconvert/PCLoaderOSM.cpp | 11 +-
src/polyconvert/PCLoaderVisum.cpp | 24 +-
src/polyconvert/PCLoaderXML.cpp | 144 +-
src/polyconvert/PCLoaderXML.h | 32 +-
src/polyconvert/PCPolyContainer.cpp | 86 +-
src/polyconvert/PCPolyContainer.h | 76 +-
src/polyconvert/PCTypeDefHandler.cpp | 14 +-
src/polyconvert/PCTypeMap.cpp | 6 +-
src/polyconvert/PCTypeMap.h | 6 +-
src/polyconvert/polyconvert_main.cpp | 21 +-
src/router/ROAbstractEdgeBuilder.h | 6 +-
src/router/ROEdge.cpp | 14 +-
src/router/ROEdge.h | 22 +-
src/router/ROHelper.cpp | 22 +-
src/router/RONet.cpp | 42 +-
src/router/RONet.h | 15 +-
src/router/RONetHandler.cpp | 6 +-
src/router/ROPerson.cpp | 3 +-
src/router/ROPerson.h | 11 +-
src/router/RORoute.h | 6 +-
src/router/RORouteDef.cpp | 32 +-
src/router/RORouteDef.h | 6 +-
src/router/RORouteHandler.cpp | 11 +-
src/router/ROVehicle.cpp | 11 +-
src/tools/TrajectoriesHandler.cpp | 10 +-
src/tools/TrajectoriesHandler.h | 6 +-
src/tools/emissionsDrivingCycle_main.cpp | 52 +-
src/traci-server/TraCIConstants.h | 33 +-
src/traci-server/TraCIServer.cpp | 44 +-
src/traci-server/TraCIServer.h | 6 +-
src/traci-server/TraCIServerAPI_Edge.cpp | 22 +-
src/traci-server/TraCIServerAPI_InductionLoop.cpp | 8 +-
src/traci-server/TraCIServerAPI_Junction.cpp | 6 +-
src/traci-server/TraCIServerAPI_Lane.cpp | 21 +-
src/traci-server/TraCIServerAPI_Person.cpp | 14 +-
src/traci-server/TraCIServerAPI_Polygon.cpp | 18 +-
src/traci-server/TraCIServerAPI_Polygon.h | 4 +-
src/traci-server/TraCIServerAPI_Simulation.cpp | 4 +-
src/traci-server/TraCIServerAPI_TLS.cpp | 22 +-
src/traci-server/TraCIServerAPI_Vehicle.cpp | 176 +-
src/traci-server/TraCIServerAPI_Vehicle.h | 4 +-
src/traci_testclient/TraCITestClient.cpp | 80 +-
src/traci_testclient/TraCITestClient.h | 8 +-
src/utils/common/FileHelpers.cpp | 16 +-
src/utils/common/FileHelpers.h | 38 +-
src/utils/common/IDSupplier.cpp | 4 +-
src/utils/common/Makefile.am | 3 +-
src/utils/common/Makefile.in | 3 +-
src/utils/common/Named.h | 5 +-
src/utils/common/NamedObjectCont.h | 6 +-
src/utils/common/RandHelper.cpp | 4 +-
src/utils/common/RandHelper.h | 11 +-
src/utils/common/RandomDistributor.h | 6 +-
src/utils/common/SUMOVehicleClass.cpp | 4 +-
src/utils/common/StdDefs.cpp | 4 +-
src/utils/common/StdDefs.h | 4 +-
src/utils/common/StringBijection.h | 6 +-
src/utils/common/StringTokenizer.cpp | 42 +-
src/utils/common/StringTokenizer.h | 10 +-
src/utils/common/StringUtils.cpp | 20 +-
src/utils/common/ToString.h | 33 +-
src/utils/common/TplCheck.h | 126 +
src/utils/common/TplConvert.h | 275 +-
src/utils/common/UtilExceptions.h | 33 +-
src/utils/distribution/Distribution_Points.cpp | 33 +-
src/utils/distribution/Distribution_Points.h | 10 +-
src/utils/emissions/HelpersHarmonoise.cpp | 4 +-
src/utils/emissions/HelpersPHEMlight.cpp | 4 +-
src/utils/emissions/PollutantsInterface.cpp | 4 +-
src/utils/foxtools/FXLinkLabel.cpp | 4 +-
src/utils/foxtools/FXWorkerThread.h | 4 +-
src/utils/foxtools/MFXAddEditTypedTable.cpp | 28 +-
src/utils/foxtools/MFXAddEditTypedTable.h | 16 +-
src/utils/foxtools/MFXEventQue.h | 6 +-
src/utils/geom/Bresenham.cpp | 14 +-
src/utils/geom/Bresenham.h | 6 +-
src/utils/geom/PositionVector.cpp | 85 +-
src/utils/geom/PositionVector.h | 225 +-
src/utils/geom/bezier.cpp | 28 +-
src/utils/geom/bezier.h | 7 +-
src/utils/gui/div/GLHelper.cpp | 12 +-
src/utils/gui/div/GLHelper.h | 4 +-
src/utils/gui/div/GUIParameterTableWindow.cpp | 4 +-
src/utils/gui/div/GUIParameterTableWindow.h | 4 +-
src/utils/gui/div/GUISelectedStorage.cpp | 4 +-
src/utils/gui/div/GUIVideoEncoder.h | 4 +-
src/utils/gui/events/GUIEvent.h | 5 +-
src/utils/gui/events/GUIEvent_Message.h | 7 +-
src/utils/gui/globjects/GUIGlObject.cpp | 72 +-
src/utils/gui/globjects/GUIGlObject.h | 153 +-
src/utils/gui/globjects/GUIGlObjectStorage.cpp | 4 +-
src/utils/gui/globjects/GUIGlObjectTypes.h | 6 +-
src/utils/gui/globjects/GUIPolygon.cpp | 4 +-
src/utils/gui/globjects/GUIShapeContainer.cpp | 6 +-
src/utils/gui/globjects/GUIShapeContainer.h | 6 +-
src/utils/gui/images/GNETexture_E1.cpp | 93 +
src/utils/gui/images/GNETexture_E2.cpp | 94 +
src/utils/gui/images/GNETexture_E3.cpp | 138 +
src/utils/gui/images/GNETexture_E3Selected.cpp | 138 +
src/utils/gui/images/GNETexture_Empty.cpp | 90 +
src/utils/gui/images/GNETexture_EmptySelected.cpp | 90 +
src/utils/gui/images/GNETexture_Entry.cpp | 102 +
src/utils/gui/images/GNETexture_Exit.cpp | 100 +
src/utils/gui/images/GNETexture_Lock.cpp | 156 +
src/utils/gui/images/GNETexture_LockSelected.cpp | 157 +
src/utils/gui/images/GNETexture_NotMoving.cpp | 113 +
.../gui/images/GNETexture_NotMovingSelected.cpp | 113 +
src/utils/gui/images/GNETexture_Rerouter.cpp | 149 +
.../gui/images/GNETexture_RerouterSelected.cpp | 150 +
src/utils/gui/images/GNETexture_RouteProbe.cpp | 143 +
.../gui/images/GNETexture_RouteProbeSelected.cpp | 143 +
.../gui/images/GNETexture_TLS.cpp} | 10 +-
src/utils/gui/images/GNETexture_Vaporizer.cpp | 143 +
.../gui/images/GNETexture_VaporizerSelected.cpp | 142 +
.../gui/images/GNETexture_VariableSpeedSignal.cpp | 149 +
.../GNETexture_VariableSpeedSignalSelected.cpp | 149 +
src/utils/gui/images/GUIIconSubSys.cpp | 27 +-
src/utils/gui/images/GUIIconSubSys.h | 21 +-
src/utils/gui/images/GUIIcons.h | 14 +-
src/utils/gui/images/GUITextureSubSys.cpp | 209 +
.../images/{GUIIconSubSys.h => GUITextureSubSys.h} | 53 +-
.../gui/images/GUITextures.h} | 60 +-
src/utils/gui/images/GUITexturesHelper.cpp | 10 +-
src/utils/gui/images/GUITexturesHelper.h | 6 +-
src/utils/gui/images/Makefile.am | 21 +-
src/utils/gui/images/Makefile.in | 24 +-
src/utils/gui/images/add.xpm | 38 +
src/utils/gui/images/green_edge.xpm | 23 +
src/utils/gui/images/green_person.xpm | 23 +
src/utils/gui/images/green_vehicle.xpm | 23 +
src/utils/gui/images/lock.xpm | 223 +
src/utils/gui/images/remove.xpm | 38 +
src/utils/gui/images/yellow_edge.xpm | 23 +
src/utils/gui/images/yellow_person.xpm | 23 +
src/utils/gui/images/yellow_vehicle.xpm | 23 +
.../gui/settings/GUICompleteSchemeStorage.cpp | 17 +-
src/utils/gui/settings/GUICompleteSchemeStorage.h | 10 +-
src/utils/gui/settings/GUIPropertyScheme.h | 12 +-
src/utils/gui/settings/GUIPropertySchemeStorage.h | 14 +-
src/utils/gui/settings/GUISettingsHandler.cpp | 20 +-
src/utils/gui/settings/GUISettingsHandler.h | 12 +-
.../gui/settings/GUIVisualizationSettings.cpp | 97 +-
src/utils/gui/settings/GUIVisualizationSettings.h | 19 +-
src/utils/gui/tracker/GUIParameterTracker.cpp | 12 +-
src/utils/gui/tracker/TrackerValueDesc.h | 4 +-
src/utils/gui/windows/GUIAppEnum.h | 94 +-
.../gui/windows/GUIDanielPerspectiveChanger.cpp | 26 +-
.../gui/windows/GUIDanielPerspectiveChanger.h | 13 +-
src/utils/gui/windows/GUIDialog_EditViewport.cpp | 30 +-
src/utils/gui/windows/GUIDialog_EditViewport.h | 4 +-
src/utils/gui/windows/GUIDialog_ViewSettings.cpp | 60 +-
src/utils/gui/windows/GUIDialog_ViewSettings.h | 7 +-
src/utils/gui/windows/GUIMainWindow.cpp | 14 +-
src/utils/gui/windows/GUIMainWindow.h | 7 +-
src/utils/gui/windows/GUIPerspectiveChanger.cpp | 47 +-
src/utils/gui/windows/GUIPerspectiveChanger.h | 96 +-
src/utils/gui/windows/GUISUMOAbstractView.cpp | 259 +-
src/utils/gui/windows/GUISUMOAbstractView.h | 332 +-
src/utils/importio/LineReader.cpp | 16 +-
src/utils/importio/LineReader.h | 8 +-
src/utils/importio/NamedColumnsParser.cpp | 8 +-
src/utils/importio/NamedColumnsParser.h | 4 +-
src/utils/iodevices/BinaryFormatter.cpp | 9 +-
src/utils/iodevices/BinaryFormatter.h | 11 +-
src/utils/iodevices/BinaryInputDevice.cpp | 38 +-
src/utils/iodevices/BinaryInputDevice.h | 23 +-
src/utils/iodevices/OutputDevice.cpp | 10 +-
src/utils/iodevices/OutputDevice.h | 6 +-
src/utils/iodevices/OutputDevice_String.cpp | 6 +-
src/utils/iodevices/OutputDevice_String.h | 6 +-
src/utils/iodevices/PlainXMLFormatter.cpp | 4 +-
src/utils/iodevices/PlainXMLFormatter.h | 6 +-
src/utils/options/Option.h | 4 +-
src/utils/options/OptionsCont.cpp | 26 +-
src/utils/options/OptionsCont.h | 13 +-
src/utils/options/OptionsIO.cpp | 20 +-
src/utils/options/OptionsIO.h | 4 +-
src/utils/options/OptionsLoader.cpp | 4 +-
src/utils/options/OptionsParser.cpp | 4 +-
src/utils/shapes/PointOfInterest.h | 27 +-
src/utils/shapes/Polygon.h | 7 +-
src/utils/shapes/ShapeContainer.cpp | 43 +-
src/utils/shapes/ShapeContainer.h | 20 +-
src/utils/shapes/ShapeHandler.cpp | 103 +-
src/utils/shapes/ShapeHandler.h | 25 +-
src/utils/traci/TraCIAPI.cpp | 546 +-
src/utils/traci/TraCIAPI.h | 252 +-
src/utils/vehicle/CHRouter.h | 10 +-
src/utils/vehicle/CarEdge.h | 10 +-
src/utils/vehicle/DijkstraRouterTT.h | 4 +-
src/utils/vehicle/IntermodalEdge.h | 10 +-
src/utils/vehicle/IntermodalNetwork.h | 6 +-
src/utils/vehicle/IntermodalRouter.h | 6 +-
src/utils/vehicle/PedestrianRouter.h | 6 +-
src/utils/vehicle/RouteCostCalculator.h | 6 +-
src/utils/vehicle/SUMOVTypeParameter.cpp | 49 +-
src/utils/vehicle/SUMOVTypeParameter.h | 34 +-
src/utils/vehicle/SUMOVehicle.h | 50 +-
src/utils/vehicle/SUMOVehicleParameter.cpp | 34 +-
src/utils/vehicle/SUMOVehicleParameter.h | 53 +-
src/utils/xml/GenericSAXHandler.cpp | 21 +-
src/utils/xml/SAXWeightsHandler.h | 4 +-
src/utils/xml/SUMORouteHandler.cpp | 10 +-
src/utils/xml/SUMOSAXReader.cpp | 4 +-
src/utils/xml/SUMOVehicleParserHelper.cpp | 71 +-
src/utils/xml/SUMOVehicleParserHelper.h | 7 +-
src/utils/xml/SUMOXMLDefinitions.cpp | 984 +--
src/utils/xml/SUMOXMLDefinitions.h | 129 +-
src/utils/xml/XMLSubSys.cpp | 4 +-
src/utils/xml/XMLSubSys.h | 4 +-
src/version.h | 2 +-
src/windows_config.h | 4 +-
tools/assign/duaIterate.py | 4 +-
tools/assign/network.py | 6 +-
tools/build/apply_astyle.py | 7 +-
tools/build/dailyBuildMSVC.py | 42 +-
tools/build/dailyUpdateMakeGCC.sh | 15 +-
tools/contributed/traas/build.xml | 2 +-
.../src/de/tudresden/sumo/cmd/Inductionloop.java | 2 +-
.../src/de/tudresden/sumo/cmd/Simulation.java | 2 +-
.../traas/src/de/tudresden/sumo/cmd/Vehicle.java | 43 +-
.../src/de/tudresden/sumo/config/Constants.java | 14 +-
.../de/tudresden/sumo/util/CommandProcessor.java | 119 +-
.../src/de/tudresden/sumo/util/ConvertHelper.java | 17 +
.../src/de/tudresden/sumo/util/SumoCommand.java | 1 -
.../traas/src/de/tudresden/ws/Traci.java | 7 +-
.../de/tudresden/ws/container/SumoBestLanes.java | 61 +
.../src/de/tudresden/ws/container/SumoLeader.java | 43 +
.../src/de/tudresden/ws/container/SumoNextTLS.java | 63 +
.../de/tudresden/ws/container/SumoVehicleData.java | 36 +
tools/contributed/traci4j/pom.xml | 1 +
tools/createVehTypeDistribution.py | 248 +
tools/detector/validate.py | 4 +-
tools/extractTest.py | 58 +-
tools/game/bs3d/bs3d.settings.xml | 10 +-
tools/game/cross/cross.net.xml | 102 +-
tools/import/vissim/vissim_parseRoutes.py | 2 +-
tools/net/netmatch.py | 6 +-
tools/osmBuild.py | 10 +-
tools/osmGet.py | 2 +-
tools/osmWebWizard.py | 5 +-
tools/output/tripinfoDiff.py | 76 +
tools/projects/vehicles2d/main.py | 18 +-
tools/route/cutRoutes.py | 6 +-
tools/route/route2poly.py | 27 +-
tools/route/tracegenerator.py | 6 +-
tools/route/tracemapper.py | 6 +-
tools/showDepartsAndArrivalsPerEdge.py | 108 +
tools/sumolib/geomhelper.py | 13 +-
tools/sumolib/net/__init__.py | 51 +-
tools/sumolib/net/connection.py | 11 +-
tools/sumolib/net/edge.py | 19 +-
tools/sumolib/net/lane.py | 7 +-
tools/sumolib/net/node.py | 26 +-
tools/sumolib/net/roundabout.py | 8 +-
tools/sumolib/output/__init__.py | 30 +-
tools/traci/__init__.py | 42 +-
tools/traci/_edge.py | 10 +-
tools/traci/_lane.py | 10 +-
tools/traci/_vehicle.py | 111 +-
tools/traci/connection.py | 10 +-
tools/traci/constants.py | 36 +-
tools/traci/simulation.py | 374 -
tools/visualization/plot_net_dump.py | 4 +-
tools_filelist | Bin 128742 -> 129108 bytes
unittest/src/utils/geom/PositionVectorTest.cpp | 50 +-
787 files changed, 80379 insertions(+), 12625 deletions(-)
create mode 100644 data/3D/car-microcargo-citrus.mtl
create mode 100644 data/3D/car-microcargo-citrus.obj
create mode 100644 data/3D/car-minibus-citrus.mtl
create mode 100644 data/3D/car-minibus-citrus.obj
create mode 100644 data/3D/car-normal-citrus.mtl
create mode 100644 data/3D/car-normal-citrus.obj
create mode 100644 data/3D/tl.obj.mtl
create mode 100644 data/3D/tlg.obj
create mode 100644 data/3D/tlr.obj
create mode 100644 data/3D/tlu.obj
create mode 100644 data/3D/tly.obj
create mode 100644 docs/examples/sumo/sublane_model/input_routes.rou.xml
create mode 100644 docs/examples/sumo/sublane_model/net.net.xml
copy docs/examples/sumo/{visualization/parade/parade.sumocfg => sublane_model/sublane_model.sumocfg} (72%)
create mode 100644 docs/examples/sumo/visualization/parade/input_routes.rou.xml
create mode 100644 docs/examples/sumo/visualization/parade/net.net.xml
create mode 100644 docs/tutorial/osm_activitygen/eichstaett.osm
delete mode 100644 src/guisim/GUIContainerControl.cpp
delete mode 100644 src/guisim/GUIContainerControl.h
rename src/guisim/{GUIPersonControl.cpp => GUITransportableControl.cpp} (62%)
rename src/guisim/{GUIPersonControl.h => GUITransportableControl.h} (63%)
copy src/{microsim/MSStateHandler.h => marouter/ROMARouteHandler.h} (58%)
delete mode 100644 src/microsim/MSContainerControl.cpp
delete mode 100644 src/microsim/MSContainerControl.h
create mode 100644 src/microsim/MSLaneChangerSublane.cpp
create mode 100644 src/microsim/MSLaneChangerSublane.h
create mode 100644 src/microsim/MSLeaderInfo.cpp
create mode 100644 src/microsim/MSLeaderInfo.h
delete mode 100644 src/microsim/MSPersonControl.cpp
delete mode 100644 src/microsim/MSPersonControl.h
create mode 100644 src/microsim/MSTransportableControl.cpp
create mode 100644 src/microsim/MSTransportableControl.h
create mode 100644 src/microsim/lcmodels/MSLCM_SL2015.cpp
create mode 100644 src/microsim/lcmodels/MSLCM_SL2015.h
delete mode 100644 src/microsim/trigger/MSContainerTerminal.cpp
delete mode 100644 src/microsim/trigger/MSContainerTerminal.h
delete mode 100644 src/netbuild/NBJoinedEdgesMap.cpp
delete mode 100644 src/netbuild/NBJoinedEdgesMap.h
create mode 100644 src/netedit/GNEAdditional.cpp
create mode 100644 src/netedit/GNEAdditional.h
create mode 100644 src/netedit/GNEAdditionalDialog.cpp
create mode 100644 src/netedit/GNEAdditionalDialog.h
create mode 100644 src/netedit/GNEAdditionalFrame.cpp
create mode 100644 src/netedit/GNEAdditionalFrame.h
create mode 100644 src/netedit/GNEAdditionalHandler.cpp
create mode 100644 src/netedit/GNEAdditionalHandler.h
create mode 100644 src/netedit/GNEAdditionalSet.cpp
create mode 100644 src/netedit/GNEAdditionalSet.h
create mode 100644 src/netedit/GNEBusStop.cpp
create mode 100644 src/netedit/GNEBusStop.h
create mode 100644 src/netedit/GNECalibrator.cpp
create mode 100644 src/netedit/GNECalibrator.h
create mode 100644 src/netedit/GNECalibratorDialog.cpp
create mode 100644 src/netedit/GNECalibratorDialog.h
create mode 100644 src/netedit/GNEChange_Additional.cpp
copy src/netedit/{GNEChange_Edge.h => GNEChange_Additional.h} (52%)
create mode 100644 src/netedit/GNEChargingStation.cpp
create mode 100644 src/netedit/GNEChargingStation.h
create mode 100644 src/netedit/GNEConnection.cpp
create mode 100644 src/netedit/GNEConnection.h
rename src/netedit/{GNEConnector.cpp => GNEConnectorFrame.cpp} (77%)
rename src/netedit/{GNEConnector.h => GNEConnectorFrame.h} (72%)
create mode 100644 src/netedit/GNEContainerStop.cpp
create mode 100644 src/netedit/GNEContainerStop.h
create mode 100644 src/netedit/GNEDetector.cpp
create mode 100644 src/netedit/GNEDetector.h
create mode 100644 src/netedit/GNEDetectorE1.cpp
create mode 100644 src/netedit/GNEDetectorE1.h
create mode 100644 src/netedit/GNEDetectorE2.cpp
create mode 100644 src/netedit/GNEDetectorE2.h
create mode 100644 src/netedit/GNEDetectorE3.cpp
create mode 100644 src/netedit/GNEDetectorE3.h
create mode 100644 src/netedit/GNEDetectorEntry.cpp
create mode 100644 src/netedit/GNEDetectorEntry.h
create mode 100644 src/netedit/GNEDetectorExit.cpp
create mode 100644 src/netedit/GNEDetectorExit.h
create mode 100644 src/netedit/GNEFrame.cpp
create mode 100644 src/netedit/GNEFrame.h
delete mode 100644 src/netedit/GNEInspector.cpp
delete mode 100644 src/netedit/GNEInspector.h
create mode 100644 src/netedit/GNEInspectorFrame.cpp
create mode 100644 src/netedit/GNEInspectorFrame.h
copy src/{utils/geom/Bresenham.cpp => netedit/GNENetElement.cpp} (54%)
create mode 100644 src/netedit/GNENetElement.h
copy src/{microsim/MSJunctionLogic.cpp => netedit/GNEProhibition.cpp} (63%)
copy src/{gui/GUIGlobals.cpp => netedit/GNEProhibition.h} (71%)
create mode 100644 src/netedit/GNERerouter.cpp
create mode 100644 src/netedit/GNERerouter.h
create mode 100644 src/netedit/GNERerouterDialog.cpp
create mode 100644 src/netedit/GNERerouterDialog.h
create mode 100644 src/netedit/GNERouteProbe.cpp
create mode 100644 src/netedit/GNERouteProbe.h
delete mode 100644 src/netedit/GNESelector.h
rename src/netedit/{GNESelector.cpp => GNESelectorFrame.cpp} (79%)
create mode 100644 src/netedit/GNESelectorFrame.h
create mode 100644 src/netedit/GNEStoppingPlace.cpp
create mode 100644 src/netedit/GNEStoppingPlace.h
rename src/netedit/{GNETLSEditor.cpp => GNETLSEditorFrame.cpp} (80%)
rename src/netedit/{GNETLSEditor.h => GNETLSEditorFrame.h} (67%)
create mode 100644 src/netedit/GNEVaporizer.cpp
create mode 100644 src/netedit/GNEVaporizer.h
create mode 100644 src/netedit/GNEVariableSpeedSignal.cpp
create mode 100644 src/netedit/GNEVariableSpeedSignal.h
create mode 100644 src/netedit/GNEVariableSpeedSignalDialog.cpp
create mode 100644 src/netedit/GNEVariableSpeedSignalDialog.h
create mode 100644 src/netedit/netedit.rc
create mode 100644 src/utils/common/TplCheck.h
create mode 100644 src/utils/gui/images/GNETexture_E1.cpp
create mode 100644 src/utils/gui/images/GNETexture_E2.cpp
create mode 100644 src/utils/gui/images/GNETexture_E3.cpp
create mode 100644 src/utils/gui/images/GNETexture_E3Selected.cpp
create mode 100644 src/utils/gui/images/GNETexture_Empty.cpp
create mode 100644 src/utils/gui/images/GNETexture_EmptySelected.cpp
create mode 100644 src/utils/gui/images/GNETexture_Entry.cpp
create mode 100644 src/utils/gui/images/GNETexture_Exit.cpp
create mode 100644 src/utils/gui/images/GNETexture_Lock.cpp
create mode 100644 src/utils/gui/images/GNETexture_LockSelected.cpp
create mode 100644 src/utils/gui/images/GNETexture_NotMoving.cpp
create mode 100644 src/utils/gui/images/GNETexture_NotMovingSelected.cpp
create mode 100644 src/utils/gui/images/GNETexture_Rerouter.cpp
create mode 100644 src/utils/gui/images/GNETexture_RerouterSelected.cpp
create mode 100644 src/utils/gui/images/GNETexture_RouteProbe.cpp
create mode 100644 src/utils/gui/images/GNETexture_RouteProbeSelected.cpp
rename src/{netedit/tlslogo.cpp => utils/gui/images/GNETexture_TLS.cpp} (97%)
create mode 100644 src/utils/gui/images/GNETexture_Vaporizer.cpp
create mode 100644 src/utils/gui/images/GNETexture_VaporizerSelected.cpp
create mode 100644 src/utils/gui/images/GNETexture_VariableSpeedSignal.cpp
create mode 100644 src/utils/gui/images/GNETexture_VariableSpeedSignalSelected.cpp
create mode 100644 src/utils/gui/images/GUITextureSubSys.cpp
copy src/utils/gui/images/{GUIIconSubSys.h => GUITextureSubSys.h} (53%)
copy src/{gui/GUIGlobals.h => utils/gui/images/GUITextures.h} (56%)
create mode 100644 src/utils/gui/images/add.xpm
create mode 100644 src/utils/gui/images/green_edge.xpm
create mode 100644 src/utils/gui/images/green_person.xpm
create mode 100644 src/utils/gui/images/green_vehicle.xpm
create mode 100644 src/utils/gui/images/lock.xpm
create mode 100644 src/utils/gui/images/remove.xpm
create mode 100644 src/utils/gui/images/yellow_edge.xpm
create mode 100644 src/utils/gui/images/yellow_person.xpm
create mode 100644 src/utils/gui/images/yellow_vehicle.xpm
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoBestLanes.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoLeader.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoNextTLS.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoVehicleData.java
create mode 100755 tools/createVehTypeDistribution.py
create mode 100644 tools/output/tripinfoDiff.py
create mode 100755 tools/showDepartsAndArrivalsPerEdge.py
delete mode 100644 tools/traci/simulation.py
--
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