[sumo] branch master updated (88dafcd -> 1d01ba5)
Anton Gladky
gladk at moszumanska.debian.org
Sat Nov 30 18:43:09 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a change to branch master
in repository sumo.
from 88dafcd Minor update.
adds 24595ef Imported Upstream version 0.19.0+dfsg
new b8564b8 Merge tag 'upstream/0.19.0+dfsg'
new a2ba852 Refresh patch.
new 2998b66 Refres patch.
new 0dc4baf Set Standards-Version: 3.9.5. No changes.
new 1d01ba5 Update changelog.
The 5 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 | 9 +-
Makefile.in | 14 +-
bin/Makefile.in | 5 +-
build/msvc10/guisim/guisim.vcxproj | 4 +-
build/msvc10/sumo/sumo.vcxproj | 4 +-
build/msvc10/y_libmicrosim/y_libmicrosim.vcxproj | 8 +-
.../y_libmicrosim/y_libmicrosim.vcxproj.filters | 24 +-
.../z_libutils_common/z_libutils_common.vcxproj | 3 +-
.../z_libutils_common.vcxproj.filters | 5 +-
.../z_optional_libtraciserver.vcxproj | 5 +-
.../z_optional_libtraciserver.vcxproj.filters | 11 +-
build/msvc9/y_libmicrosim/y_libmicrosim.vcproj | 18 +-
.../z_libmicrosim_devices.vcproj | 16 +
.../z_libutils_common/z_libutils_common.vcproj | 4 +
.../z_optional_libtraciserver.vcproj | 9 +
build/package/sumo.spec | 2 +-
configure | 493 +++----
configure.ac | 152 +--
debian/changelog | 8 +
debian/control | 2 +-
debian/patches/add_missing_link.patch | 39 +-
debian/patches/fix_scripts_headers.patch | 49 +-
docs/examples/dfrouter/dfrouter.dfrocfg | 2 +-
docs/examples/dfrouter/input_tri.net.xml | 4 +-
.../duarouter/flows2routes/flows2routes.duarcfg | 2 +-
.../duarouter/flows2routes/input_net.net.xml | 4 +-
.../flows2routes_100s_interval.duarcfg | 2 +-
.../flows2routes_100s_interval/input_net.net.xml | 4 +-
.../flows2routes_100s_interval_ext.duarcfg | 2 +-
.../input_net.net.xml | 4 +-
.../flows2routes_200s_interval.duarcfg | 2 +-
.../flows2routes_200s_interval/input_net.net.xml | 4 +-
.../duarouter/trips2routes/input_net.net.xml | 4 +-
.../duarouter/trips2routes/trips2routes.duarcfg | 2 +-
.../straight_only_sinks/input_net.net.xml | 4 +-
.../straight_only_sinks.jtrrcfg | 2 +-
docs/examples/jtrrouter/turns/input_net.net.xml | 4 +-
.../examples/jtrrouter/turns/input_turns.turns.xml | 2 +-
docs/examples/jtrrouter/turns/turns.jtrrcfg | 2 +-
.../OSM/adlershof_dlr/adlershof_dlr.netccfg | 2 +-
.../cross3l_edge2edge_conns.netccfg | 2 +-
.../input_connections.con.xml | 2 +-
.../cross3l_edge2edge_conns/input_edges.edg.xml | 2 +-
.../cross3l_edge2edge_conns/input_nodes.nod.xml | 2 +-
.../cross3l_lane2lane_conns.netccfg | 2 +-
.../input_connections.con.xml | 2 +-
.../cross3l_lane2lane_conns/input_edges.edg.xml | 2 +-
.../cross3l_lane2lane_conns/input_nodes.nod.xml | 2 +-
.../cross3l_no_turnarounds.netccfg | 2 +-
.../cross3l_no_turnarounds/input_edges.edg.xml | 2 +-
.../cross3l_no_turnarounds/input_nodes.nod.xml | 2 +-
.../cross3l_prohibitions.netccfg | 2 +-
.../cross3l_prohibitions/input_connections.con.xml | 2 +-
.../cross3l_prohibitions/input_edges.edg.xml | 2 +-
.../cross3l_prohibitions/input_nodes.nod.xml | 2 +-
.../cross3l_unconstrained.netccfg | 2 +-
.../cross3l_unconstrained/input_edges.edg.xml | 2 +-
.../cross3l_unconstrained/input_nodes.nod.xml | 2 +-
.../netconvert/dlr-testtrack/dlr-testtrack.netccfg | 2 +-
.../dlr-testtrack/input_connections.con.xml | 2 +-
.../netconvert/dlr-testtrack/input_edges.edg.xml | 2 +-
.../netconvert/dlr-testtrack/input_nodes.nod.xml | 2 +-
docs/examples/netconvert/hokkaido/hokkaido.netccfg | 2 +-
.../netconvert/hokkaido/input_edges.edg.xml | 2 +-
.../netconvert/hokkaido/input_nodes.nod.xml | 2 +-
.../cross_notypes_kmh/cross_notypes_kmh.netccfg | 2 +-
.../cross_notypes_kmh/input_edges.edg.xml | 2 +-
.../cross_notypes_kmh/input_nodes.nod.xml | 2 +-
.../cross_notypes_kmh/input_types.typ.xml | 2 +-
.../cross_usingtypes_kmh.netccfg | 2 +-
.../cross_usingtypes_kmh/input_edges.edg.xml | 2 +-
.../cross_usingtypes_kmh/input_nodes.nod.xml | 2 +-
.../cross_usingtypes_kmh/input_types.typ.xml | 2 +-
.../types/cross_notypes/cross_notypes.netccfg | 2 +-
.../types/cross_notypes/input_edges.edg.xml | 2 +-
.../types/cross_notypes/input_nodes.nod.xml | 2 +-
.../types/cross_notypes/input_types.typ.xml | 2 +-
.../cross_usingtypes/cross_usingtypes.netccfg | 2 +-
.../types/cross_usingtypes/input_edges.edg.xml | 2 +-
.../types/cross_usingtypes/input_nodes.nod.xml | 2 +-
.../types/cross_usingtypes/input_types.typ.xml | 2 +-
docs/examples/sumo/busses/busses.sumocfg | 2 +-
docs/examples/sumo/busses/input_additional.add.xml | 4 +-
docs/examples/sumo/busses/input_routes.rou.xml | 4 +-
docs/examples/sumo/busses/net.net.xml | 4 +-
docs/examples/sumo/hokkaido/hokkaido.sumocfg | 2 +-
docs/examples/sumo/hokkaido/input_routes.rou.xml | 4 +-
docs/examples/sumo/hokkaido/net.net.xml | 4 +-
.../cross3ltl_inductloops.sumocfg | 2 +-
.../cross3ltl_inductloops/input_routes.rou.xml | 16 +-
.../sumo/output/cross3ltl_inductloops/net.net.xml | 4 +-
.../cross3ltl_meandata_constrained.sumocfg | 2 +-
.../input_additional.add.xml | 4 +-
.../input_routes.rou.xml | 16 +-
.../cross3ltl_meandata_constrained/net.net.xml | 4 +-
.../cross3ltl_meandata_edges.sumocfg | 2 +-
.../input_additional.add.xml | 4 +-
.../cross3ltl_meandata_edges/input_routes.rou.xml | 16 +-
.../output/cross3ltl_meandata_edges/net.net.xml | 4 +-
.../cross3ltl_meandata_lanes.sumocfg | 2 +-
.../input_additional.add.xml | 4 +-
.../cross3ltl_meandata_lanes/input_routes.rou.xml | 16 +-
.../output/cross3ltl_meandata_lanes/net.net.xml | 4 +-
.../cross3ltl_rawdump/cross3ltl_rawdump.sumocfg | 2 +-
.../output/cross3ltl_rawdump/input_routes.rou.xml | 16 +-
.../sumo/output/cross3ltl_rawdump/net.net.xml | 4 +-
.../cross3ltl_tripinfo/cross3ltl_tripinfo.sumocfg | 2 +-
.../output/cross3ltl_tripinfo/input_routes.rou.xml | 16 +-
.../sumo/output/cross3ltl_tripinfo/net.net.xml | 4 +-
.../cross3ltl_vehroutes.sumocfg | 2 +-
.../cross3ltl_vehroutes/input_routes.rou.xml | 16 +-
.../sumo/output/cross3ltl_vehroutes/net.net.xml | 4 +-
.../cross3ltl_vtypeprobe.sumocfg | 2 +-
.../cross3ltl_vtypeprobe/input_additional.add.xml | 2 +-
.../cross3ltl_vtypeprobe/input_routes.rou.xml | 16 +-
.../sumo/output/cross3ltl_vtypeprobe/net.net.xml | 4 +-
.../sumo/simple_nets/box/box1l/box1l.sumocfg | 2 +-
.../simple_nets/box/box1l/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/box/box1l/net.net.xml | 4 +-
.../sumo/simple_nets/box/box2l/box2l.sumocfg | 2 +-
.../simple_nets/box/box2l/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/box/box2l/net.net.xml | 4 +-
.../sumo/simple_nets/box/box3l/box3l.sumocfg | 2 +-
.../simple_nets/box/box3l/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/box/box3l/net.net.xml | 4 +-
.../sumo/simple_nets/box/box4l/box4l.sumocfg | 2 +-
.../simple_nets/box/box4l/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/box/box4l/net.net.xml | 4 +-
.../sumo/simple_nets/cross/cross1l/cross1l.sumocfg | 2 +-
.../simple_nets/cross/cross1l/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/cross/cross1l/net.net.xml | 4 +-
.../simple_nets/cross/cross1ltl/cross1ltl.sumocfg | 2 +-
.../cross/cross1ltl/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/cross/cross1ltl/net.net.xml | 4 +-
.../sumo/simple_nets/cross/cross3l/cross3l.sumocfg | 2 +-
.../simple_nets/cross/cross3l/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/cross/cross3l/net.net.xml | 4 +-
.../simple_nets/cross/cross3ltl/cross3ltl.sumocfg | 2 +-
.../cross/cross3ltl/input_routes.rou.xml | 4 +-
.../sumo/simple_nets/cross/cross3ltl/net.net.xml | 4 +-
.../variable_speed_signs/input_additional.add.xml | 4 +-
.../variable_speed_signs/input_additional2.add.xml | 8 +-
.../sumo/variable_speed_signs/input_routes.rou.xml | 4 +-
.../examples/sumo/variable_speed_signs/net.net.xml | 4 +-
.../variable_speed_signs.sumocfg | 2 +-
.../sumo/vehicle_stops/input_routes.rou.xml | 7 +-
docs/examples/sumo/vehicle_stops/net.net.xml | 4 +-
.../sumo/vehicle_stops/vehicle_stops.sumocfg | 2 +-
.../sumo/visualization/parade/input_routes.rou.xml | 48 +-
.../examples/sumo/visualization/parade/net.net.xml | 4 +-
.../sumo/visualization/parade/parade.sumocfg | 2 +-
docs/examples/tools/dua-iterate/input_net.net.xml | 4 +-
.../tools/dua-iterate/input_trips.trips.xml | 21 +-
docs/examples/tools/dua-iterate/routes.rou.xml | 2 +-
docs/tutorial/city_mobil/agentManager.py | 9 +-
docs/tutorial/city_mobil/constants.py | 9 +-
docs/tutorial/city_mobil/createNet.py | 9 +-
docs/tutorial/city_mobil/runner.py | 9 +-
docs/tutorial/city_mobil/simpleManager.py | 9 +-
docs/tutorial/city_mobil/statistics.py | 9 +-
docs/tutorial/city_mobil/vehicleControl.py | 9 +-
docs/tutorial/hello/data/hello.edg.xml | 2 +-
docs/tutorial/hello/data/hello.net.xml | 4 +-
docs/tutorial/hello/data/hello.nod.xml | 2 +-
docs/tutorial/hello/data/hello.rou.xml | 2 +-
docs/tutorial/hello/runner.py | 9 +-
docs/tutorial/osm_activitygen/eichstaett.net.xml | 4 +-
docs/tutorial/output_parsing/data/circular.add.xml | 2 +-
docs/tutorial/output_parsing/data/circular.edg.xml | 2 +-
docs/tutorial/output_parsing/data/circular.nod.xml | 2 +-
docs/tutorial/output_parsing/data/circular.rou.xml | 2 +-
docs/tutorial/output_parsing/data/circular.typ.xml | 2 +-
docs/tutorial/output_parsing/runner.py | 9 +-
docs/tutorial/quickstart/data/quickstart.con.xml | 2 +-
docs/tutorial/quickstart/data/quickstart.edg.xml | 2 +-
docs/tutorial/quickstart/data/quickstart.net.xml | 4 +-
docs/tutorial/quickstart/data/quickstart.nod.xml | 2 +-
docs/tutorial/quickstart/runner.py | 9 +-
docs/tutorial/san_pablo_dam/data/input_det.add.xml | 2 +-
docs/tutorial/san_pablo_dam/data/input_vss.add.xml | 2 +-
docs/tutorial/san_pablo_dam/data/spd-road.sumocfg | 1 -
docs/tutorial/san_pablo_dam/runner.py | 9 +-
docs/tutorial/traci_tls/data/cross.con.xml | 2 +-
docs/tutorial/traci_tls/data/cross.edg.xml | 2 +-
docs/tutorial/traci_tls/data/cross.net.xml | 4 +-
docs/tutorial/traci_tls/data/cross.nod.xml | 2 +-
docs/tutorial/traci_tls/embedded.py | 9 +-
docs/tutorial/traci_tls/runner.py | 9 +-
src/Makefile.am | 22 +-
src/Makefile.in | 43 +-
src/activitygen/AGActivityGen.cpp | 5 +-
src/activitygen/AGActivityGen.h | 10 +-
src/activitygen/AGActivityGenHandler.cpp | 35 +-
src/activitygen/AGActivityTripWriter.cpp | 21 +-
src/activitygen/AGActivityTripWriter.h | 21 +-
src/activitygen/Makefile.in | 5 +-
src/activitygen/activities/AGTrip.cpp | 11 +-
src/activitygen/activities/Makefile.in | 5 +-
src/activitygen/activitygen_main.cpp | 19 +-
src/activitygen/city/AGCity.cpp | 4 +-
src/activitygen/city/AGPerson.cpp | 14 +-
src/activitygen/city/Makefile.in | 5 +-
src/config.h | 12 +-
src/config.h.in | 6 -
src/dfrouter/Makefile.in | 5 +-
src/dfrouter/RODFDetFlowLoader.cpp | 4 +-
src/dfrouter/RODFDetector.cpp | 58 +-
src/dfrouter/RODFDetectorFlow.cpp | 8 +-
src/dfrouter/RODFFrame.cpp | 10 +-
src/duarouter/Makefile.in | 5 +-
src/duarouter/RODUAFrame.cpp | 19 +-
src/duarouter/duarouter_main.cpp | 4 +-
src/foreign/Makefile.in | 5 +-
src/foreign/additional.txt | 6 +
src/foreign/eulerspiral/Makefile.in | 5 +-
src/foreign/gl2ps/Makefile.in | 5 +-
src/foreign/mersenne/Makefile.in | 5 +-
src/foreign/nvwa/Makefile.in | 5 +-
src/foreign/polyfonts/Makefile.in | 5 +-
src/foreign/rtree/LayeredRTree.h | 6 +-
src/foreign/rtree/Makefile.in | 5 +-
src/foreign/rtree/RTree.h | 16 +-
src/foreign/rtree/SUMORTree.h | 8 +-
src/foreign/tcpip/Makefile.in | 5 +-
src/gui/GUIApplicationWindow.cpp | 98 +-
src/gui/GUIApplicationWindow.h | 15 +-
src/gui/GUIRunThread.cpp | 15 +-
src/gui/Makefile.in | 5 +-
src/gui/TraCIServerAPI_GUI.cpp | 8 +-
src/gui/TraCIServerAPI_GUI.h | 6 +-
src/gui/dialogs/Makefile.in | 5 +-
src/guinetload/GUITriggerBuilder.cpp | 7 +-
src/guinetload/GUITriggerBuilder.h | 4 +-
src/guinetload/Makefile.in | 5 +-
src/guisim/GUICalibrator.cpp | 7 +-
src/guisim/GUICalibrator.h | 5 +-
src/guisim/GUIEdge.cpp | 39 +-
src/guisim/GUIEdge.h | 4 +-
src/guisim/GUIInductLoop.cpp | 6 +-
src/guisim/GUIInductLoop.h | 5 +-
src/guisim/GUILane.cpp | 54 +-
src/guisim/GUINet.cpp | 7 +-
src/guisim/GUIVehicle.cpp | 67 +-
src/guisim/GUIVehicle.h | 4 +-
src/guisim/GUIVehicleControl.cpp | 4 +-
src/guisim/Makefile.in | 5 +-
src/jtrrouter/Makefile.in | 5 +-
src/microsim/MSAbstractLaneChangeModel.cpp | 32 +-
src/microsim/MSAbstractLaneChangeModel.h | 109 +-
src/microsim/MSBaseVehicle.cpp | 9 +-
src/microsim/MSBaseVehicle.h | 11 +-
src/microsim/MSEdge.cpp | 48 +-
src/microsim/MSEdge.h | 20 +-
src/microsim/MSFrame.cpp | 40 +-
src/microsim/MSGlobals.cpp | 3 +-
src/microsim/MSGlobals.h | 5 +-
src/microsim/MSInsertionControl.cpp | 31 +-
src/microsim/MSInsertionControl.h | 6 +-
src/microsim/MSInternalJunction.cpp | 5 +-
.../{MSLCM_DK2004.cpp => MSLCM_DK2008.cpp} | 127 +-
src/microsim/{MSLCM_DK2004.h => MSLCM_DK2008.h} | 108 +-
src/microsim/MSLCM_JE2013.cpp | 1115 ++++++++++++++++
src/microsim/MSLCM_JE2013.h | 196 +++
src/microsim/MSLCM_LC2013.cpp | 723 ++++++++++
src/microsim/MSLCM_LC2013.h | 200 +++
src/microsim/MSLane.cpp | 254 ++--
src/microsim/MSLane.h | 96 +-
src/microsim/MSLaneChanger.cpp | 130 +-
src/microsim/MSLaneChanger.h | 18 +-
src/microsim/MSLink.cpp | 122 +-
src/microsim/MSLink.h | 14 +-
src/microsim/MSLinkCont.cpp | 4 +-
src/microsim/MSMoveReminder.h | 7 +-
src/microsim/MSNet.cpp | 58 +-
src/microsim/MSNet.h | 33 +-
src/microsim/MSPerson.cpp | 65 +-
src/microsim/MSPersonControl.cpp | 10 +-
src/microsim/MSRightOfWayJunction.cpp | 4 +-
src/microsim/MSRoute.cpp | 51 +-
src/microsim/MSRoute.h | 37 +-
src/microsim/MSRouteHandler.cpp | 98 +-
src/microsim/MSStateHandler.cpp | 29 +-
src/microsim/MSStateHandler.h | 5 +-
src/microsim/MSVehicle.cpp | 420 ++++--
src/microsim/MSVehicle.h | 109 +-
src/microsim/MSVehicleControl.cpp | 30 +-
src/microsim/MSVehicleControl.h | 28 +-
src/microsim/MSVehicleTransfer.cpp | 27 +-
src/microsim/MSVehicleType.cpp | 7 +-
src/microsim/MSVehicleType.h | 11 +-
src/microsim/Makefile.am | 4 +-
src/microsim/Makefile.in | 16 +-
src/microsim/actions/Makefile.in | 5 +-
src/microsim/cfmodels/MSCFModel.cpp | 9 +-
src/microsim/cfmodels/MSCFModel.h | 19 +-
src/microsim/cfmodels/MSCFModel_Krauss.cpp | 15 +-
src/microsim/cfmodels/Makefile.in | 5 +-
src/microsim/devices/MSDevice.cpp | 30 +-
src/microsim/devices/MSDevice.h | 5 +-
src/microsim/devices/MSDevice_BTreceiver.cpp | 385 +++++-
src/microsim/devices/MSDevice_BTreceiver.h | 381 +++++-
src/microsim/devices/MSDevice_BTsender.cpp | 65 +-
src/microsim/devices/MSDevice_BTsender.h | 150 ++-
src/microsim/devices/MSDevice_Example.cpp | 4 +-
src/microsim/devices/MSDevice_Example.h | 12 +-
src/microsim/devices/MSDevice_HBEFA.cpp | 21 +-
src/microsim/devices/MSDevice_HBEFA.h | 5 +-
src/microsim/devices/MSDevice_Person.h | 6 +-
src/microsim/devices/MSDevice_Routing.cpp | 10 +-
src/microsim/devices/MSDevice_Routing.h | 12 +-
src/microsim/devices/MSDevice_Tripinfo.cpp | 31 +-
src/microsim/devices/MSDevice_Tripinfo.h | 29 +-
src/microsim/devices/MSDevice_Vehroutes.h | 8 +-
src/microsim/devices/Makefile.in | 5 +-
src/microsim/logging/Makefile.in | 5 +-
src/microsim/output/MSDetectorControl.cpp | 28 +-
src/microsim/output/MSDetectorControl.h | 14 +-
src/microsim/output/MSE2Collector.cpp | 4 +-
src/microsim/output/MSEmissionExport.cpp | 11 +-
src/microsim/output/MSEmissionExport.h | 2 +
src/microsim/output/MSFCDExport.cpp | 2 +
src/microsim/output/MSFCDExport.h | 2 +
src/microsim/output/MSFullExport.cpp | 17 +-
src/microsim/output/MSFullExport.h | 2 +
src/microsim/output/MSInductLoop.cpp | 24 +-
src/microsim/output/MSInductLoop.h | 19 +-
src/microsim/output/MSInstantInductLoop.cpp | 25 +-
src/microsim/output/MSMeanData.cpp | 6 +-
src/microsim/output/MSMeanData_HBEFA.cpp | 55 +-
src/microsim/output/MSMeanData_Harmonoise.cpp | 9 +-
src/microsim/output/MSMeanData_Net.cpp | 42 +-
src/microsim/output/MSQueueExport.cpp | 74 +-
src/microsim/output/MSQueueExport.h | 2 +
src/microsim/output/MSRouteProbe.cpp | 52 +-
src/microsim/output/MSRouteProbe.h | 17 +-
src/microsim/output/MSVTKExport.cpp | 116 +-
src/microsim/output/MSVTKExport.h | 2 +
src/microsim/output/Makefile.in | 5 +-
.../traffic_lights/MSSimpleTrafficLightLogic.cpp | 4 +-
src/microsim/traffic_lights/MSTLLogicControl.cpp | 25 +-
src/microsim/traffic_lights/MSTLLogicControl.h | 12 +-
src/microsim/traffic_lights/Makefile.in | 5 +-
src/microsim/trigger/MSCalibrator.cpp | 134 +-
src/microsim/trigger/MSCalibrator.h | 51 +-
src/microsim/trigger/Makefile.in | 5 +-
src/netbuild/Makefile.in | 5 +-
src/netbuild/NBEdge.cpp | 63 +-
src/netbuild/NBEdge.h | 17 +-
src/netbuild/NBEdgeCont.cpp | 42 +-
src/netbuild/NBEdgeCont.h | 25 +-
src/netbuild/NBFrame.cpp | 6 +-
src/netbuild/NBNetBuilder.cpp | 37 +-
src/netbuild/NBNetBuilder.h | 6 +-
src/netbuild/NBNode.cpp | 35 +-
src/netbuild/NBNode.h | 5 +-
src/netbuild/NBNodeCont.cpp | 3 +-
src/netbuild/NBOwnTLDef.cpp | 16 +-
src/netbuild/NBOwnTLDef.h | 13 +-
src/netbuild/NBTrafficLightDefinition.cpp | 6 +-
src/netbuild/NBTrafficLightDefinition.h | 7 +-
src/netbuild/NBTrafficLightLogic.h | 5 +-
src/netgen/Makefile.am | 14 +-
src/netgen/Makefile.in | 22 +-
src/netimport/Makefile.in | 5 +-
src/netimport/NIFrame.cpp | 20 +-
src/netimport/NIImporter_OpenDrive.cpp | 371 ++++--
src/netimport/NIImporter_OpenDrive.h | 108 +-
src/netimport/NIImporter_OpenStreetMap.cpp | 88 +-
src/netimport/NIImporter_OpenStreetMap.h | 8 +-
src/netimport/NILoader.cpp | 4 +-
src/netimport/NIVisumTL.cpp | 7 +-
src/netimport/NIXMLConnectionsHandler.cpp | 40 +-
src/netimport/NIXMLConnectionsHandler.h | 19 +-
src/netimport/vissim/Makefile.in | 5 +-
src/netimport/vissim/tempstructs/Makefile.in | 5 +-
.../vissim/tempstructs/NIVissimDisturbance.cpp | 12 +-
.../vissim/tempstructs/NIVissimNodeCluster.cpp | 17 +-
.../vissim/tempstructs/NIVissimNodeDef.cpp | 13 +-
.../vissim/tempstructs/NIVissimNodeDef_Poly.cpp | 9 +-
src/netimport/vissim/tempstructs/NIVissimTL.cpp | 14 +-
src/netimport/vissim/typeloader/Makefile.in | 5 +-
src/netload/Makefile.in | 5 +-
src/netload/NLDetectorBuilder.cpp | 4 +-
src/netload/NLHandler.cpp | 37 +-
src/netload/NLHandler.h | 7 +-
src/netload/NLTriggerBuilder.cpp | 24 +-
src/netload/NLTriggerBuilder.h | 7 +-
src/netwrite/Makefile.in | 5 +-
src/netwrite/NWFrame.cpp | 16 +-
src/netwrite/NWWriter_DlrNavteq.cpp | 12 +-
src/netwrite/NWWriter_OpenDrive.cpp | 7 +-
src/netwrite/NWWriter_SUMO.cpp | 184 ++-
src/netwrite/NWWriter_SUMO.h | 23 +-
src/netwrite/NWWriter_XML.cpp | 14 +-
src/od2trips/Makefile.in | 5 +-
src/polyconvert/Makefile.am | 13 +-
src/polyconvert/Makefile.in | 18 +-
src/polyconvert/polyconvert_main.cpp | 8 +-
src/router/Makefile.in | 5 +-
src/router/ROCostCalculator.cpp | 16 +-
src/router/ROCostCalculator.h | 8 +-
src/router/ROEdge.cpp | 6 +-
src/router/ROEdge.h | 10 +-
src/router/ROFrame.cpp | 10 +-
src/router/ROLoader.cpp | 30 +-
src/router/RONet.cpp | 33 +-
src/router/RONet.h | 38 +-
src/router/RONetHandler.cpp | 113 +-
src/router/RONetHandler.h | 9 +-
src/router/RORoute.cpp | 13 +-
src/router/RORoute.h | 25 +-
src/router/RORouteDef.cpp | 56 +-
src/router/RORouteDef.h | 6 +-
src/router/RORouteHandler.cpp | 65 +-
src/router/ROVehicle.cpp | 68 +-
src/router/ROVehicle.h | 25 +-
src/traci-server/Makefile.am | 3 +-
src/traci-server/Makefile.in | 10 +-
src/traci-server/TraCIConstants.h | 72 +-
src/traci-server/TraCIException.h | 5 +-
src/traci-server/TraCIServer.cpp | 389 ++----
src/traci-server/TraCIServer.h | 32 +-
...tector.cpp => TraCIServerAPI_ArealDetector.cpp} | 63 +-
...MeDetector.h => TraCIServerAPI_ArealDetector.h} | 27 +-
src/traci-server/TraCIServerAPI_Edge.cpp | 38 +-
src/traci-server/TraCIServerAPI_Edge.h | 12 +-
src/traci-server/TraCIServerAPI_InductionLoop.cpp | 16 +-
src/traci-server/TraCIServerAPI_InductionLoop.h | 8 +-
src/traci-server/TraCIServerAPI_Junction.cpp | 28 +-
src/traci-server/TraCIServerAPI_Junction.h | 10 +-
src/traci-server/TraCIServerAPI_Lane.cpp | 60 +-
src/traci-server/TraCIServerAPI_Lane.h | 46 +-
src/traci-server/TraCIServerAPI_MeMeDetector.cpp | 8 +-
src/traci-server/TraCIServerAPI_MeMeDetector.h | 4 +-
src/traci-server/TraCIServerAPI_POI.cpp | 16 +-
src/traci-server/TraCIServerAPI_POI.h | 12 +-
src/traci-server/TraCIServerAPI_Polygon.cpp | 16 +-
src/traci-server/TraCIServerAPI_Polygon.h | 12 +-
src/traci-server/TraCIServerAPI_Route.cpp | 10 +-
src/traci-server/TraCIServerAPI_Route.h | 6 +-
src/traci-server/TraCIServerAPI_Simulation.cpp | 168 ++-
src/traci-server/TraCIServerAPI_Simulation.h | 25 +-
src/traci-server/TraCIServerAPI_TLS.cpp | 25 +-
src/traci-server/TraCIServerAPI_TLS.h | 6 +-
src/traci-server/TraCIServerAPI_Vehicle.cpp | 105 +-
src/traci-server/TraCIServerAPI_Vehicle.h | 10 +-
src/traci-server/TraCIServerAPI_VehicleType.cpp | 10 +-
src/traci-server/TraCIServerAPI_VehicleType.h | 8 +-
src/traci_testclient/Makefile.in | 5 +-
src/traci_testclient/TraCITestClient.cpp | 90 +-
src/traci_testclient/TraCITestClient.h | 6 +-
src/traci_testclient/tracitestclient_main.cpp | 8 +-
src/utils/Makefile.in | 5 +-
src/utils/common/Makefile.am | 2 +-
src/utils/common/Makefile.in | 7 +-
.../TraCIRTree.h => utils/common/NamedRTree.h} | 86 +-
src/utils/common/RandomDistributor.h | 39 +-
src/utils/common/SUMOTime.h | 3 +-
src/utils/common/SUMOVTypeParameter.cpp | 5 +-
src/utils/common/SUMOVTypeParameter.h | 7 +-
src/utils/common/SUMOVehicleClass.cpp | 4 +-
src/utils/common/SUMOVehicleClass.h | 4 +-
src/utils/common/SUMOVehicleParameter.cpp | 2 +-
src/utils/common/SUMOVehicleParameter.h | 3 +-
src/utils/common/ToString.h | 32 +-
src/utils/distribution/Makefile.in | 5 +-
src/utils/foxtools/Makefile.in | 5 +-
src/utils/geom/GeoConvHelper.cpp | 59 +-
src/utils/geom/GeoConvHelper.h | 14 +-
src/utils/geom/GeomHelper.cpp | 55 +-
src/utils/geom/GeomHelper.h | 40 +-
src/utils/geom/Makefile.in | 5 +-
src/utils/geom/PositionVector.cpp | 11 +-
src/utils/geom/PositionVector.h | 4 +-
src/utils/gui/Makefile.in | 5 +-
src/utils/gui/div/GUIParameterTableWindow.cpp | 8 +-
src/utils/gui/div/Makefile.in | 5 +-
src/utils/gui/events/Makefile.in | 5 +-
src/utils/gui/globjects/Makefile.in | 5 +-
src/utils/gui/images/Makefile.in | 5 +-
.../gui/settings/GUIVisualizationSettings.cpp | 39 +-
src/utils/gui/settings/Makefile.in | 5 +-
src/utils/gui/tracker/Makefile.in | 5 +-
src/utils/gui/windows/GUIAppEnum.h | 4 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.cpp | 11 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.h | 5 +-
src/utils/gui/windows/GUISUMOAbstractView.cpp | 7 +-
src/utils/gui/windows/Makefile.in | 5 +-
src/utils/importio/Makefile.in | 5 +-
src/utils/iodevices/Makefile.in | 5 +-
src/utils/iodevices/OutputDevice.cpp | 4 +-
src/utils/options/Makefile.in | 5 +-
src/utils/options/OptionsCont.cpp | 4 +-
src/utils/shapes/Makefile.in | 5 +-
src/utils/shapes/PointOfInterest.h | 9 +-
src/utils/shapes/Polygon.h | 7 +-
src/utils/shapes/Shape.cpp | 3 +-
src/utils/shapes/Shape.h | 3 +-
src/utils/traci/Makefile.in | 5 +-
src/utils/traci/TraCIAPI.cpp | 12 +-
src/utils/traci/TraCIAPI.h | 21 +-
src/utils/xml/Makefile.in | 5 +-
src/utils/xml/SUMORouteHandler.cpp | 67 +-
src/utils/xml/SUMORouteHandler.h | 10 +-
src/utils/xml/SUMOVehicleParserHelper.cpp | 36 +-
src/utils/xml/SUMOVehicleParserHelper.h | 5 +-
src/utils/xml/SUMOXMLDefinitions.cpp | 13 +-
src/utils/xml/SUMOXMLDefinitions.h | 17 +-
src/windows_config.h | 4 +-
tools/10to11.py | 9 +-
tools/assign/Assignment.py | 11 +-
tools/assign/assign.py | 9 +-
tools/assign/cadytsIterate.py | 9 +-
tools/assign/costFunctionChecker.py | 9 +-
tools/assign/costMemory.py | 9 +-
tools/assign/dijkstra.py | 9 +-
tools/assign/duaIterate.py | 15 +-
tools/assign/duaIterate_analysis.py | 9 +-
tools/assign/elements.py | 9 +-
tools/assign/inputs.py | 9 +-
tools/assign/matrixDailyToHourly.py | 9 +-
tools/assign/network.py | 11 +-
tools/assign/networkStatistics.py | 9 +-
tools/assign/one-shot.py | 9 +-
tools/assign/outputs.py | 11 +-
tools/assign/routeChoices.py | 9 +-
tools/assign/run.py | 9 +-
tools/assign/statisticsElements.py | 9 +-
tools/assign/tables.py | 7 +-
tools/bin/traceExporter.py | 43 +-
tools/build/apply_astyle.py | 9 +-
tools/build/checkAuthors.py | 9 +-
tools/build/checkSvnProps.py | 23 +-
tools/build/dailyBuildMSVC.py | 23 +-
tools/build/dailyUpdateMakeGCC | 5 +-
tools/build/pythonPropsMSVC.py | 21 +-
tools/build/status.py | 2 +-
tools/build/version.py | 9 +-
tools/build/wix.py | 9 +-
.../traas}/.classpath | 14 +-
.../{traceExporter => contributed/traas}/.project | 34 +-
.../traas/.settings/org.eclipse.jdt.core.prefs | 11 +
tools/contributed/traas/build.xml | 68 +
.../traas/examples/java_client/Main.java | 28 +
tools/contributed/traas/examples/run.bat | 3 +
.../traas/examples/simulation/config.sumo.cfg | 12 +
.../traas/examples/simulation/detectors.xml | 4 +
.../traas/examples/simulation/example.net.xml | 109 ++
.../traas/examples/simulation/routes.xml | 6 +
.../traas/examples/simulation/settings.xml | 166 +++
.../traas/examples/simulation/vehicles.xml | 13 +
tools/contributed/traas/examples/ws_config.xml | 8 +
tools/contributed/traas/license.txt | 674 ++++++++++
.../src/de/tudresden/sumo/cmd/ArealDetector.java | 68 +
.../traas/src/de/tudresden/sumo/cmd/Edge.java | 323 +++++
.../traas/src/de/tudresden/sumo/cmd/Gui.java | 198 +++
.../src/de/tudresden/sumo/cmd/Inductionloop.java | 172 +++
.../traas/src/de/tudresden/sumo/cmd/Junction.java | 73 +
.../traas/src/de/tudresden/sumo/cmd/Lane.java | 409 ++++++
.../src/de/tudresden/sumo/cmd/Multientryexit.java | 108 ++
.../traas/src/de/tudresden/sumo/cmd/Poi.java | 173 +++
.../traas/src/de/tudresden/sumo/cmd/Polygon.java | 174 +++
.../traas/src/de/tudresden/sumo/cmd/Route.java | 83 ++
.../src/de/tudresden/sumo/cmd/Simulation.java | 274 ++++
.../src/de/tudresden/sumo/cmd/Trafficlights.java | 202 +++
.../traas/src/de/tudresden/sumo/cmd/Vehicle.java | 711 ++++++++++
.../src/de/tudresden/sumo/cmd/Vehicletype.java | 292 ++++
.../src/de/tudresden/sumo/config/Constants.java | 805 +++++++++++
.../de/tudresden/sumo/util/CommandProcessor.java | 256 ++++
.../src/de/tudresden/sumo/util/ConvertHelper.java | 201 +++
.../traas/src/de/tudresden/sumo/util/Query.java | 145 ++
.../src/de/tudresden/sumo/util/StringList.java | 293 ++++
.../traas/src/de/tudresden/sumo/util/Sumo.java | 161 +++
.../src/de/tudresden/sumo/util/SumoCommand.java | 347 +++++
.../traas/src/de/tudresden/ws/Service.java | 50 +
.../traas/src/de/tudresden/ws/Service_Impl.java | 150 +++
.../traas/src/de/tudresden/ws/ShutdownHook.java | 56 +
.../traas/src/de/tudresden/ws/Traci.java | 1392 ++++++++++++++++++++
.../traas/src/de/tudresden/ws/WebService.java | 69 +
.../traas/src/de/tudresden/ws/conf/Config.java | 131 ++
.../de/tudresden/ws/container/SumoBoundingBox.java | 53 +
.../src/de/tudresden/ws/container/SumoColor.java | 48 +
.../de/tudresden/ws/container/SumoGeometry.java | 43 +
.../src/de/tudresden/ws/container/SumoLink.java | 47 +
.../de/tudresden/ws/container/SumoLinkList.java | 160 +++
.../de/tudresden/ws/container/SumoPosition2D.java | 43 +
.../de/tudresden/ws/container/SumoStringList.java | 162 +++
.../de/tudresden/ws/container/SumoTLSLogic.java | 61 +
.../de/tudresden/ws/container/SumoTLSPhase.java | 61 +
.../traas/src/de/tudresden/ws/log/Log.java | 38 +
.../traas/src/de/tudresden/ws/log/Log_txt.java | 73 +
.../traas/src/de/uniluebeck/itm/tcpip/Storage.java | 542 ++++++++
.../src/it/polito/appeal/traci/CloseQuery.java | 41 +
.../polito/appeal/traci/SumoTraciConnection.java | 345 +++++
.../src/it/polito/appeal/traci/TraCIException.java | 53 +
.../it/polito/appeal/traci/protocol/Command.java | 126 ++
.../appeal/traci/protocol/RequestMessage.java | 112 ++
.../appeal/traci/protocol/ResponseContainer.java | 90 ++
.../appeal/traci/protocol/ResponseMessage.java | 126 ++
.../appeal/traci/protocol/StatusResponse.java | 77 ++
tools/contributed/traci4j/README.md | 63 +
tools/contributed/traci4j/README.mediawiki | 146 --
tools/contributed/traci4j/build.xml | 8 +-
.../appeal/traci/examples/GetVehicleInfo.java | 2 +-
.../src/java-gen/it/polito/appeal/traci/Edge.java | 656 ++++-----
.../it/polito/appeal/traci/InductionLoop.java | 455 ++++---
.../src/java-gen/it/polito/appeal/traci/Lane.java | 947 +++++++------
.../it/polito/appeal/traci/MeMeDetector.java | 347 ++---
.../src/java-gen/it/polito/appeal/traci/POI.java | 497 ++++---
.../src/java-gen/it/polito/appeal/traci/Route.java | 223 ++--
.../it/polito/appeal/traci/TrafficLight.java | 751 ++++++-----
.../java-gen/it/polito/appeal/traci/Vehicle.java | 1354 +++++++++++--------
.../it/polito/appeal/traci/VehicleType.java | 443 +++++--
.../it/polito/appeal/traci/ChangeAccelQuery.java | 43 +
.../it/polito/appeal/traci/ChangeColorQuery.java | 6 +-
.../it/polito/appeal/traci/ChangeDecelQuery.java | 43 +
...geColorQuery.java => ChangeLaneIndexQuery.java} | 38 +-
.../it/polito/appeal/traci/ChangeMinGapQuery.java | 43 +
...ChangeColorQuery.java => ChangeSpeedQuery.java} | 30 +-
.../appeal/traci/LaneIndexQueryParameter.java | 49 +
tools/contributed/traci4j/src/xml/queries.xml | 52 +-
.../traci4j/src/xml/traciObjects/POI.xml | 1 +
.../traci4j/src/xml/traciObjects/Vehicle.xml | 52 +-
.../traci4j/src/xml/traciObjects/VehicleType.xml | 73 +
.../contributed/traci4j/src/xslt/traciObject.xslt | 61 +
.../polito/appeal/traci/test/TraCIServerTest.java | 8 +-
.../it/polito/appeal/traci/test/TraCITest.java | 119 +-
tools/detector/aggregateFlows.py | 26 +-
tools/detector/deleteUnusedDetectors.py | 9 +-
tools/detector/detector.py | 9 +-
tools/detector/flowFromRoutes.py | 18 +-
tools/detector/flowrouter.py | 46 +-
tools/district/countConnectionsInDistricts.py | 9 +-
tools/district/districtMapper.py | 165 +--
tools/district/edgesInDistricts.py | 207 +--
tools/{build => docs}/buildHTMLDocs.py | 81 +-
tools/docs/configTemplateToWiki.py | 96 ++
tools/{build => docs}/mirrorWiki.py | 13 +-
tools/game/patchTrafficLights.py | 9 +-
tools/game/runner.py | 9 +-
tools/import/osm/osmBuild.py | 9 +-
tools/import/osm/osmGet.py | 9 +-
tools/import/osm/osmPopulationExtractor.py | 9 +-
tools/import/vissim/vissim_parseBusStops.py | 9 +-
tools/import/vissim/vissim_parseRoutes.py | 9 +-
tools/import/visum/visum_convertEdgeTypes.py | 9 +-
tools/import/visum/visum_convertRoutes.py | 216 +--
tools/import/visum/visum_convertTurnPercentages.py | 9 +-
tools/import/visum/visum_parseZaehlstelle.py | 9 +-
tools/lib/testUtil.py | 9 +-
tools/net/0103to0110.py | 9 +-
tools/net/0123to0130.py | 9 +-
tools/net/OrderedMultiSet.py | 9 +-
tools/net/batch0103to0110.py | 9 +-
tools/net/createRoundaboutConnections.py | 9 +-
tools/net/netcheck.py | 9 +-
tools/net/netdiff.py | 9 +-
tools/net/netduplicate.py | 9 +-
tools/net/netextract.py | 9 +-
tools/net/netextract_subPart.py | 9 +-
tools/net/netmatch.py | 97 ++
tools/net/netshiftadaptor.py | 62 +-
tools/net/netstats.py | 9 +-
tools/net/network_statistics.py | 7 +-
tools/net/odConnectionsCheck.py | 9 +-
tools/net/patchNetFiles.py | 9 +-
tools/net/prepareVISUM.py | 9 +-
tools/net/reprojectpolys.py | 9 +-
tools/net/visum_mapDistricts.py | 9 +-
tools/net/xmlconnections_mapEdges.py | 9 +-
tools/net/xmledges_applyOffset.py | 9 +-
tools/net/xmlnodes_applyOffset.py | 9 +-
tools/output/analyze_teleports.py | 9 +-
tools/output/generateITetrisIntersectionMetrics.py | 9 +-
tools/output/generateITetrisNetworkMetrics.py | 9 +-
tools/output/generateTLSE1Detectors.py | 9 +-
tools/output/generateTLSE2Detectors.py | 9 +-
tools/output/generateTLSE3Detectors.py | 9 +-
tools/output/netdumpdiff.py | 9 +-
tools/output/netdumpmean.py | 9 +-
tools/output/timingStats.py | 9 +-
tools/output/vehrouteDiff.py | 9 +-
.../TaxiFCD_Krieg/src/analysis/CompareVelocitys.py | 7 +-
.../TaxiFCD_Krieg/src/analysis/FetchData.py | 7 +-
tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py | 7 +-
.../TaxiFCD_Krieg/src/analysis/Traveltime.py | 7 +-
.../TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py | 7 +-
.../TaxiFCD_Krieg/src/analysis/VelocityCurve.py | 7 +-
.../src/analysis/VelocityOverRoute.py | 7 +-
.../TaxiFCD_Krieg/src/analysis/VelocityOverTime.py | 7 +-
.../TaxiFCD_Krieg/src/analysis/__init__.py | 0
.../projects/TaxiFCD_Krieg/src/backup/__init__.py | 0
.../TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py | 7 +-
.../src/fcdQuality/ParamEffectsOLD.py | 7 +-
.../src/fcdQuality/ParamEffectsProcessedFCD.py | 7 +-
.../TaxiFCD_Krieg/src/fcdQuality/__init__.py | 0
.../src/fcdToRoutes/FCDvsCompleteRoute.py | 7 +-
.../src/fcdToRoutes/GenerateTaxiRoutes.py | 7 +-
.../src/fcdToRoutes/GenerateTaxiRoutesMain.py | 7 +-
.../src/fcdToRoutes/My_mpl_dump_onNet.py | 9 +-
.../TaxiFCD_Krieg/src/fcdToRoutes/__init__.py | 0
.../src/fcdToRoutes/differentDepartRoutes.py | 7 +-
.../TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py | 7 +-
.../src/taxiQuantity/QuantityOverDay.py | 7 +-
.../src/taxiQuantity/SeparateVLSArea.py | 7 +-
.../TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py | 7 +-
tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py | 7 +-
tools/projects/TaxiFCD_Krieg/src/util/Path.py | 7 +-
.../projects/TaxiFCD_Krieg/src/util/ProgressBar.py | 7 +-
tools/projects/TaxiFCD_Krieg/src/util/Reader.py | 7 +-
tools/projects/TaxiFCD_Krieg/src/util/__init__.py | 0
tools/removeSVN.py | 9 +-
tools/route/cutRoutes.py | 9 +-
tools/route/extract_route_edges.py | 9 +-
tools/route/findUTurns.py | 9 +-
tools/route/route2alts.py | 9 +-
tools/route/route2poly.py | 9 +-
tools/route/route_1htoDay.py | 9 +-
tools/route/route_departOffset.py | 9 +-
tools/route/routecheck.py | 9 +-
tools/route/routecompare.py | 9 +-
tools/route/routes2OD.py | 9 +-
tools/route/routes_Join.py | 9 +-
tools/route/sort_routes.py | 9 +-
tools/route/tracegenerator.py | 81 ++
tools/route/tracemapper.py | 58 +
tools/route/vehicle2flow.py | 9 +-
tools/shapes/CSV2polyconvertXML.py | 7 +-
tools/shapes/circlePolygon.py | 9 +-
tools/shapes/poi_alongRoads.py | 7 +-
tools/shapes/poi_atTLS.py | 9 +-
tools/shapes/pois2inductionLoops.py | 9 +-
tools/sumolib/__init__.py | 13 +-
tools/sumolib/color.py | 9 +-
tools/sumolib/files/__init__.py | 9 +-
tools/sumolib/geomhelper.py | 39 +-
tools/sumolib/miscutils.py | 13 +-
tools/sumolib/net/__init__.py | 104 +-
tools/sumolib/net/connection.py | 9 +-
tools/sumolib/net/edge.py | 50 +-
tools/sumolib/net/lane.py | 9 +-
tools/sumolib/net/node.py | 9 +-
tools/sumolib/net/roundabout.py | 9 +-
tools/sumolib/options.py | 9 +-
tools/sumolib/output/__init__.py | 93 +-
tools/sumolib/output/convert/__init__.py | 12 +-
tools/sumolib/output/convert/gpsdat.py | 17 +-
tools/sumolib/output/convert/ns2.py | 34 +-
tools/sumolib/output/convert/omnet.py | 32 +-
tools/sumolib/output/convert/phem.py | 31 +-
tools/sumolib/output/convert/shawn.py | 26 +-
tools/sumolib/route.py | 62 +
tools/sumolib/sensors/__init__.py | 9 +-
tools/sumolib/sensors/inductive_loop.py | 9 +-
tools/sumolib/shapes/__init__.py | 9 +-
tools/sumolib/shapes/poi.py | 9 +-
tools/sumolib/shapes/polygon.py | 9 +-
tools/tls/tls_check.py | 9 +-
tools/tls/tls_csv2SUMO.py | 9 +-
tools/traceExporter/Makefile.am | 5 -
tools/traceExporter/manifest.mf | 4 -
tools/traceExporter/src/Main.java | 46 -
tools/traceExporter/src/ansim/AnsimWriter.java | 85 --
tools/traceExporter/src/ansim/Converter.java | 69 -
tools/traceExporter/src/ansim/Edge.java | 39 -
tools/traceExporter/src/ansim/NetReader.java | 77 --
tools/traceExporter/src/ansim/Parameter.java | 24 -
tools/traceExporter/src/ansim/Parser.java | 78 --
tools/traceExporter/src/ansim/TraceReader.java | 165 ---
tools/traceExporter/src/ansim/Vehicle.java | 24 -
tools/traceExporter/src/ns2/ActivityWriter.java | 57 -
tools/traceExporter/src/ns2/ConfigWriter.java | 115 --
tools/traceExporter/src/ns2/Converter.java | 95 --
tools/traceExporter/src/ns2/Edge.java | 38 -
tools/traceExporter/src/ns2/IdRandomizer.java | 33 -
tools/traceExporter/src/ns2/Junction.java | 25 -
tools/traceExporter/src/ns2/Lane.java | 55 -
tools/traceExporter/src/ns2/MobilityWriter.java | 185 ---
tools/traceExporter/src/ns2/NetReader.java | 129 --
tools/traceExporter/src/ns2/NetTranslater.java | 55 -
tools/traceExporter/src/ns2/Parameter.java | 40 -
tools/traceExporter/src/ns2/Parser.java | 174 ---
tools/traceExporter/src/ns2/VehicleFilter.java | 57 -
tools/traceExporter/src/ns2/VehicleReader.java | 79 --
tools/traci/__init__.py | 58 +-
tools/traci/{multientryexit.py => areal.py} | 64 +-
tools/traci/constants.py | 79 +-
tools/traci/edge.py | 22 +-
tools/traci/gui.py | 12 +-
tools/traci/inductionloop.py | 42 +-
tools/traci/junction.py | 31 +-
tools/traci/lane.py | 44 +-
tools/traci/multientryexit.py | 30 +-
tools/traci/poi.py | 40 +-
tools/traci/polygon.py | 38 +-
tools/traci/rebuildConstants.py | 17 +-
tools/traci/route.py | 20 +-
tools/traci/simulation.py | 129 +-
tools/traci/trafficlights.py | 55 +-
tools/traci/vehicle.py | 197 ++-
tools/traci/vehicletype.py | 102 +-
tools/trigger/csv2vss.py | 9 +-
tools/trip/generateTripsXml.py | 11 +-
tools/trip/randomTrips.py | 11 +-
tools/trip/route2trips.py | 11 +-
tools/visualization/helpers.py | 170 +++
tools/visualization/mpl_dump_onNet.py | 9 +-
tools/visualization/mpl_dump_timeline.py | 9 +-
tools/visualization/mpl_dump_twoAgainst.py | 9 +-
tools/visualization/mpl_tripinfos_twoAgainst.py | 9 +-
tools/visualization/plot_dump_net.py | 143 ++
tools/visualization/plot_summary.py | 61 +
tools/visualization/plot_trafficLights.py | 79 ++
tools/visualization/plot_tripinfo_distributions.py | 85 ++
tools/xml/addSchema.py | 9 +-
tools/xml/binary2plain.py | 9 +-
tools/xml/configTemplateToWiki.py | 51 -
tools/xml/rebuildSchemata.py | 9 +-
tools/xml/schemaCheck.py | 13 +-
tools_filelist | 115 +-
unittest/Makefile.in | 5 +-
unittest/src/Makefile.am | 12 +-
unittest/src/Makefile.in | 12 +-
unittest/src/microsim/Makefile.in | 5 +-
unittest/src/netbuild/Makefile.in | 5 +-
unittest/src/utils/Makefile.in | 5 +-
unittest/src/utils/common/Makefile.in | 5 +-
unittest/src/utils/geom/Makefile.in | 5 +-
unittest/src/utils/iodevices/Makefile.in | 5 +-
829 files changed, 26900 insertions(+), 9869 deletions(-)
rename src/microsim/{MSLCM_DK2004.cpp => MSLCM_DK2008.cpp} (89%)
rename src/microsim/{MSLCM_DK2004.h => MSLCM_DK2008.h} (74%)
create mode 100644 src/microsim/MSLCM_JE2013.cpp
create mode 100644 src/microsim/MSLCM_JE2013.h
create mode 100644 src/microsim/MSLCM_LC2013.cpp
create mode 100644 src/microsim/MSLCM_LC2013.h
copy src/traci-server/{TraCIServerAPI_MeMeDetector.cpp => TraCIServerAPI_ArealDetector.cpp} (52%)
copy src/traci-server/{TraCIServerAPI_MeMeDetector.h => TraCIServerAPI_ArealDetector.h} (73%)
rename src/{traci-server/TraCIRTree.h => utils/common/NamedRTree.h} (61%)
rename tools/{traceExporter => contributed/traas}/.classpath (66%)
rename tools/{traceExporter => contributed/traas}/.project (86%)
create mode 100644 tools/contributed/traas/.settings/org.eclipse.jdt.core.prefs
create mode 100644 tools/contributed/traas/build.xml
create mode 100644 tools/contributed/traas/examples/java_client/Main.java
create mode 100644 tools/contributed/traas/examples/run.bat
create mode 100644 tools/contributed/traas/examples/simulation/config.sumo.cfg
create mode 100644 tools/contributed/traas/examples/simulation/detectors.xml
create mode 100644 tools/contributed/traas/examples/simulation/example.net.xml
create mode 100644 tools/contributed/traas/examples/simulation/routes.xml
create mode 100644 tools/contributed/traas/examples/simulation/settings.xml
create mode 100644 tools/contributed/traas/examples/simulation/vehicles.xml
create mode 100644 tools/contributed/traas/examples/ws_config.xml
create mode 100644 tools/contributed/traas/license.txt
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/ArealDetector.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Edge.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Gui.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Inductionloop.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Junction.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Lane.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Multientryexit.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Poi.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Polygon.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Route.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Simulation.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Trafficlights.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Vehicle.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Vehicletype.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/config/Constants.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/util/CommandProcessor.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/util/ConvertHelper.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/util/Query.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/util/StringList.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/util/Sumo.java
create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/util/SumoCommand.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/Service.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/Service_Impl.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/ShutdownHook.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/Traci.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/WebService.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/conf/Config.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoBoundingBox.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoColor.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoGeometry.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoLink.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoLinkList.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoPosition2D.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoStringList.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoTLSLogic.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/container/SumoTLSPhase.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/log/Log.java
create mode 100644 tools/contributed/traas/src/de/tudresden/ws/log/Log_txt.java
create mode 100644 tools/contributed/traas/src/de/uniluebeck/itm/tcpip/Storage.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/CloseQuery.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/SumoTraciConnection.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/TraCIException.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/protocol/Command.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/protocol/RequestMessage.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/protocol/ResponseContainer.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/protocol/ResponseMessage.java
create mode 100644 tools/contributed/traas/src/it/polito/appeal/traci/protocol/StatusResponse.java
create mode 100644 tools/contributed/traci4j/README.md
delete mode 100644 tools/contributed/traci4j/README.mediawiki
create mode 100644 tools/contributed/traci4j/src/java/it/polito/appeal/traci/ChangeAccelQuery.java
create mode 100644 tools/contributed/traci4j/src/java/it/polito/appeal/traci/ChangeDecelQuery.java
copy tools/contributed/traci4j/src/java/it/polito/appeal/traci/{ChangeColorQuery.java => ChangeLaneIndexQuery.java} (54%)
create mode 100644 tools/contributed/traci4j/src/java/it/polito/appeal/traci/ChangeMinGapQuery.java
copy tools/contributed/traci4j/src/java/it/polito/appeal/traci/{ChangeColorQuery.java => ChangeSpeedQuery.java} (54%)
create mode 100644 tools/contributed/traci4j/src/java/it/polito/appeal/traci/LaneIndexQueryParameter.java
rename tools/{build => docs}/buildHTMLDocs.py (74%)
create mode 100755 tools/docs/configTemplateToWiki.py
rename tools/{build => docs}/mirrorWiki.py (90%)
create mode 100755 tools/net/netmatch.py
delete mode 100755 tools/projects/TaxiFCD_Krieg/src/analysis/__init__.py
delete mode 100755 tools/projects/TaxiFCD_Krieg/src/backup/__init__.py
delete mode 100755 tools/projects/TaxiFCD_Krieg/src/fcdQuality/__init__.py
delete mode 100755 tools/projects/TaxiFCD_Krieg/src/fcdToRoutes/__init__.py
delete mode 100755 tools/projects/TaxiFCD_Krieg/src/util/__init__.py
create mode 100755 tools/route/tracegenerator.py
create mode 100755 tools/route/tracemapper.py
create mode 100644 tools/sumolib/route.py
delete mode 100644 tools/traceExporter/Makefile.am
delete mode 100644 tools/traceExporter/manifest.mf
delete mode 100644 tools/traceExporter/src/Main.java
delete mode 100644 tools/traceExporter/src/ansim/AnsimWriter.java
delete mode 100644 tools/traceExporter/src/ansim/Converter.java
delete mode 100644 tools/traceExporter/src/ansim/Edge.java
delete mode 100644 tools/traceExporter/src/ansim/NetReader.java
delete mode 100644 tools/traceExporter/src/ansim/Parameter.java
delete mode 100644 tools/traceExporter/src/ansim/Parser.java
delete mode 100644 tools/traceExporter/src/ansim/TraceReader.java
delete mode 100644 tools/traceExporter/src/ansim/Vehicle.java
delete mode 100644 tools/traceExporter/src/ns2/ActivityWriter.java
delete mode 100644 tools/traceExporter/src/ns2/ConfigWriter.java
delete mode 100644 tools/traceExporter/src/ns2/Converter.java
delete mode 100644 tools/traceExporter/src/ns2/Edge.java
delete mode 100644 tools/traceExporter/src/ns2/IdRandomizer.java
delete mode 100644 tools/traceExporter/src/ns2/Junction.java
delete mode 100644 tools/traceExporter/src/ns2/Lane.java
delete mode 100644 tools/traceExporter/src/ns2/MobilityWriter.java
delete mode 100644 tools/traceExporter/src/ns2/NetReader.java
delete mode 100644 tools/traceExporter/src/ns2/NetTranslater.java
delete mode 100644 tools/traceExporter/src/ns2/Parameter.java
delete mode 100644 tools/traceExporter/src/ns2/Parser.java
delete mode 100644 tools/traceExporter/src/ns2/VehicleFilter.java
delete mode 100644 tools/traceExporter/src/ns2/VehicleReader.java
copy tools/traci/{multientryexit.py => areal.py} (51%)
create mode 100755 tools/visualization/helpers.py
create mode 100755 tools/visualization/plot_dump_net.py
create mode 100755 tools/visualization/plot_summary.py
create mode 100755 tools/visualization/plot_trafficLights.py
create mode 100755 tools/visualization/plot_tripinfo_distributions.py
delete mode 100755 tools/xml/configTemplateToWiki.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