[sumo] 02/10: Merge tag 'upstream/0.22.0+dfsg' into experimental
Anton Gladky
gladk at moszumanska.debian.org
Thu Nov 20 22:26:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch experimental
in repository sumo.
commit 4976d34fc953193bc716ada786950373d1a69f6e
Merge: 08bef65 01c89e5
Author: Anton Gladky <gladk at debian.org>
Date: Thu Nov 20 21:44:14 2014 +0100
Merge tag 'upstream/0.22.0+dfsg' into experimental
Upstream version 0.22.0+dfsg
AUTHORS | 6 +-
Makefile.am | 2 +-
Makefile.in | 5 +-
bin/Makefile.am | 29 +-
bin/Makefile.in | 29 +-
configure | 424 +-
configure.ac | 70 +-
data/typemap/osmNetconvert.typ.xml | 50 +-
data/typemap/osmNetconvertPedestrians.typ.xml | 34 +-
data/typemap/osmNetconvertUrbanDe.typ.xml | 86 +-
data/xsd/baseTypes.xsd | 23 +-
data/xsd/duarouterConfiguration.xsd | 2 +
data/xsd/edges_file.xsd | 13 +-
data/xsd/jtrrouterConfiguration.xsd | 2 +
data/xsd/marouterConfiguration.xsd | 1 +
data/xsd/netstate_file.xsd | 3 +-
data/xsd/routeTypes.xsd | 82 +-
data/xsd/routes_file.xsd | 2 +-
data/xsd/sumoConfiguration.xsd | 7 +
data/xsd/tripinfo_file.xsd | 7 +-
docs/examples/dfrouter/dfrouter.dfrocfg | 2 +-
docs/examples/dfrouter/input_tri.net.xml | 12 +-
.../duarouter/flows2routes/flows2routes.duarcfg | 2 +-
.../duarouter/flows2routes/input_net.net.xml | 12 +-
.../flows2routes_100s_interval.duarcfg | 2 +-
.../flows2routes_100s_interval/input_net.net.xml | 12 +-
.../flows2routes_100s_interval_ext.duarcfg | 2 +-
.../input_net.net.xml | 12 +-
.../flows2routes_200s_interval.duarcfg | 2 +-
.../flows2routes_200s_interval/input_net.net.xml | 12 +-
.../duarouter/trips2routes/input_net.net.xml | 12 +-
.../duarouter/trips2routes/trips2routes.duarcfg | 2 +-
.../straight_only_sinks/input_net.net.xml | 12 +-
.../straight_only_sinks.jtrrcfg | 2 +-
docs/examples/jtrrouter/turns/input_net.net.xml | 12 +-
.../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 | 2 +-
docs/examples/sumo/busses/input_routes.rou.xml | 2 +-
docs/examples/sumo/busses/net.net.xml | 8 +-
docs/examples/sumo/hokkaido/hokkaido.sumocfg | 2 +-
docs/examples/sumo/hokkaido/input_routes.rou.xml | 2 +-
docs/examples/sumo/hokkaido/net.net.xml | 12 +-
.../cross3ltl_emission/cross3ltl_emission.sumocfg | 2 +-
.../output/cross3ltl_emission/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_emission/net.net.xml | 12 +-
.../output/cross3ltl_fcd/cross3ltl_fcd.sumocfg | 2 +-
.../sumo/output/cross3ltl_fcd/input_routes.rou.xml | 2 +-
.../examples/sumo/output/cross3ltl_fcd/net.net.xml | 12 +-
.../output/cross3ltl_full/cross3ltl_full.sumocfg | 2 +-
.../output/cross3ltl_full/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_full/net.net.xml | 12 +-
.../cross3ltl_inductloops.sumocfg | 2 +-
.../cross3ltl_inductloops/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_inductloops/net.net.xml | 12 +-
.../cross3ltl_meandata_constrained.sumocfg | 2 +-
.../input_additional.add.xml | 2 +-
.../input_routes.rou.xml | 2 +-
.../cross3ltl_meandata_constrained/net.net.xml | 12 +-
.../cross3ltl_meandata_edges.sumocfg | 2 +-
.../input_additional.add.xml | 2 +-
.../cross3ltl_meandata_edges/input_routes.rou.xml | 2 +-
.../output/cross3ltl_meandata_edges/net.net.xml | 12 +-
.../cross3ltl_meandata_lanes.sumocfg | 2 +-
.../input_additional.add.xml | 2 +-
.../cross3ltl_meandata_lanes/input_routes.rou.xml | 2 +-
.../output/cross3ltl_meandata_lanes/net.net.xml | 12 +-
.../output/cross3ltl_queue/cross3ltl_queue.sumocfg | 2 +-
.../output/cross3ltl_queue/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_queue/net.net.xml | 12 +-
.../cross3ltl_rawdump/cross3ltl_rawdump.sumocfg | 2 +-
.../output/cross3ltl_rawdump/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_rawdump/net.net.xml | 12 +-
.../cross3ltl_summary/cross3ltl_summary.sumocfg | 2 +-
.../output/cross3ltl_summary/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_summary/net.net.xml | 12 +-
.../cross3ltl_tripinfo/cross3ltl_tripinfo.sumocfg | 2 +-
.../output/cross3ltl_tripinfo/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_tripinfo/net.net.xml | 12 +-
.../cross3ltl_vehroutes.sumocfg | 2 +-
.../cross3ltl_vehroutes/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_vehroutes/net.net.xml | 12 +-
.../cross3ltl_vtypeprobe.sumocfg | 2 +-
.../cross3ltl_vtypeprobe/input_additional.add.xml | 2 +-
.../cross3ltl_vtypeprobe/input_routes.rou.xml | 2 +-
.../sumo/output/cross3ltl_vtypeprobe/net.net.xml | 12 +-
.../sumo/simple_nets/box/box1l/box1l.sumocfg | 2 +-
.../simple_nets/box/box1l/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/box/box1l/net.net.xml | 12 +-
.../sumo/simple_nets/box/box2l/box2l.sumocfg | 2 +-
.../simple_nets/box/box2l/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/box/box2l/net.net.xml | 16 +-
.../sumo/simple_nets/box/box3l/box3l.sumocfg | 2 +-
.../simple_nets/box/box3l/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/box/box3l/net.net.xml | 12 +-
.../sumo/simple_nets/box/box4l/box4l.sumocfg | 2 +-
.../simple_nets/box/box4l/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/box/box4l/net.net.xml | 12 +-
.../sumo/simple_nets/cross/cross1l/cross1l.sumocfg | 2 +-
.../simple_nets/cross/cross1l/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/cross/cross1l/net.net.xml | 12 +-
.../simple_nets/cross/cross1ltl/cross1ltl.sumocfg | 2 +-
.../cross/cross1ltl/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/cross/cross1ltl/net.net.xml | 12 +-
.../sumo/simple_nets/cross/cross3l/cross3l.sumocfg | 2 +-
.../simple_nets/cross/cross3l/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/cross/cross3l/net.net.xml | 12 +-
.../simple_nets/cross/cross3ltl/cross3ltl.sumocfg | 2 +-
.../cross/cross3ltl/input_routes.rou.xml | 2 +-
.../sumo/simple_nets/cross/cross3ltl/net.net.xml | 12 +-
.../variable_speed_signs/input_additional.add.xml | 2 +-
.../variable_speed_signs/input_additional2.add.xml | 2 +-
.../sumo/variable_speed_signs/input_routes.rou.xml | 2 +-
.../examples/sumo/variable_speed_signs/net.net.xml | 12 +-
.../variable_speed_signs.sumocfg | 2 +-
.../sumo/vehicle_stops/input_routes.rou.xml | 2 +-
docs/examples/sumo/vehicle_stops/net.net.xml | 12 +-
.../sumo/vehicle_stops/vehicle_stops.sumocfg | 2 +-
.../sumo/visualization/parade/input_routes.rou.xml | 2 +-
.../examples/sumo/visualization/parade/net.net.xml | 12 +-
.../sumo/visualization/parade/parade.sumocfg | 2 +-
docs/examples/tools/dua-iterate/dua-iterate.bat | 1 +
docs/examples/tools/dua-iterate/dua-iterate.sh | 1 +
docs/examples/tools/dua-iterate/input_net.net.xml | 12 +-
docs/examples/tools/dua-iterate/routes.rou.xml | 2 +-
docs/examples/tools/flowrouter/flowrouter.bat | 1 +
docs/examples/tools/flowrouter/flowrouter.sh | 1 +
.../tools/flowrouter/input_detectors.det.xml | 38 +
docs/examples/tools/flowrouter/input_flows.txt | 36 +
docs/examples/tools/flowrouter/input_net.net.xml | 381 ++
docs/examples/tools/traceExporter/fcd.xml | 497 ++
.../tools/traceExporter/input_routes.rou.xml | 9 +
.../traceExporter}/net.net.xml | 148 +-
.../examples/tools/traceExporter/traceExporter.bat | 1 +
docs/examples/tools/traceExporter/traceExporter.sh | 1 +
docs/tutorial/city_mobil/agentManager.py | 4 +-
docs/tutorial/city_mobil/constants.py | 4 +-
docs/tutorial/city_mobil/createNet.py | 4 +-
docs/tutorial/city_mobil/runner.py | 4 +-
docs/tutorial/city_mobil/simpleManager.py | 4 +-
docs/tutorial/city_mobil/statistics.py | 4 +-
docs/tutorial/city_mobil/vehicleControl.py | 4 +-
docs/tutorial/hello/data/hello.edg.xml | 2 +-
docs/tutorial/hello/data/hello.net.xml | 12 +-
docs/tutorial/hello/data/hello.netccfg | 2 +-
docs/tutorial/hello/data/hello.nod.xml | 2 +-
docs/tutorial/hello/data/hello.rou.xml | 2 +-
docs/tutorial/hello/data/hello.sumocfg | 2 +-
docs/tutorial/hello/runner.py | 4 +-
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.netccfg | 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 +-
.../output_parsing/data/output_file.sumocfg | 2 +-
.../output_parsing/data/output_socket.sumocfg | 2 +-
docs/tutorial/output_parsing/runner.py | 4 +-
docs/tutorial/quickstart/data/quickstart.con.xml | 2 +-
docs/tutorial/quickstart/data/quickstart.edg.xml | 2 +-
docs/tutorial/quickstart/data/quickstart.net.xml | 18 +-
docs/tutorial/quickstart/data/quickstart.netccfg | 2 +-
docs/tutorial/quickstart/data/quickstart.nod.xml | 2 +-
docs/tutorial/quickstart/data/quickstart.sumocfg | 2 +-
docs/tutorial/quickstart/runner.py | 4 +-
docs/tutorial/san_pablo_dam/data/analyzeData.py | 4 +-
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 | 2 +-
docs/tutorial/san_pablo_dam/runner.py | 4 +-
docs/tutorial/san_pablo_dam/validate.py | 4 +-
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 | 14 +-
docs/tutorial/traci_tls/data/cross.netccfg | 2 +-
docs/tutorial/traci_tls/data/cross.nod.xml | 2 +-
docs/tutorial/traci_tls/data/cross.sumocfg | 2 +-
docs/tutorial/traci_tls/embedded.py | 4 +-
docs/tutorial/traci_tls/runner.py | 4 +-
src/Makefile.am | 9 +-
src/Makefile.in | 41 +-
src/activitygen/AGActivityGen.cpp | 4 +-
src/activitygen/AGActivityGen.h | 4 +-
src/activitygen/AGActivityGenHandler.cpp | 4 +-
src/activitygen/AGActivityGenHandler.h | 4 +-
src/activitygen/AGActivityTripWriter.cpp | 4 +-
src/activitygen/AGActivityTripWriter.h | 4 +-
src/activitygen/AGFrame.cpp | 10 +-
src/activitygen/AGFrame.h | 4 +-
src/activitygen/Makefile.am | 3 +-
src/activitygen/Makefile.in | 12 +-
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 | 18 +-
src/activitygen/activities/AGTrip.h | 14 +-
src/activitygen/activities/AGWorkAndSchool.cpp | 4 +-
src/activitygen/activities/AGWorkAndSchool.h | 4 +-
src/activitygen/activities/Makefile.in | 3 +-
src/activitygen/activitygen_main.cpp | 13 +-
src/activitygen/city/AGAdult.cpp | 4 +-
src/activitygen/city/AGAdult.h | 4 +-
src/activitygen/city/AGBus.cpp | 6 +-
src/activitygen/city/AGBus.h | 6 +-
src/activitygen/city/AGBusLine.cpp | 4 +-
src/activitygen/city/AGBusLine.h | 4 +-
src/activitygen/city/AGCar.cpp | 4 +-
src/activitygen/city/AGCar.h | 4 +-
src/activitygen/city/AGChild.cpp | 6 +-
src/activitygen/city/AGChild.h | 6 +-
src/activitygen/city/AGCity.cpp | 4 +-
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 | 5 +-
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 | 6 +-
src/activitygen/city/AGSchool.h | 6 +-
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 | 4 +-
src/activitygen/city/AGWorkPosition.h | 4 +-
src/activitygen/city/Makefile.in | 3 +-
src/config.h | 19 +-
src/config.h.in | 3 +
src/dfrouter/Makefile.am | 3 +-
src/dfrouter/Makefile.in | 12 +-
src/dfrouter/RODFDetFlowLoader.cpp | 4 +-
src/dfrouter/RODFDetFlowLoader.h | 4 +-
src/dfrouter/RODFDetector.cpp | 20 +-
src/dfrouter/RODFDetector.h | 4 +-
src/dfrouter/RODFDetectorFlow.cpp | 4 +-
src/dfrouter/RODFDetectorFlow.h | 4 +-
src/dfrouter/RODFDetectorHandler.cpp | 4 +-
src/dfrouter/RODFDetectorHandler.h | 4 +-
src/dfrouter/RODFEdge.cpp | 4 +-
src/dfrouter/RODFEdge.h | 4 +-
src/dfrouter/RODFEdgeBuilder.cpp | 4 +-
src/dfrouter/RODFEdgeBuilder.h | 4 +-
src/dfrouter/RODFFrame.cpp | 4 +-
src/dfrouter/RODFFrame.h | 4 +-
src/dfrouter/RODFNet.cpp | 8 +-
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 | 6 +-
src/duarouter/Makefile.am | 3 +-
src/duarouter/Makefile.in | 12 +-
src/duarouter/RODUAEdgeBuilder.cpp | 4 +-
src/duarouter/RODUAEdgeBuilder.h | 4 +-
src/duarouter/RODUAFrame.cpp | 6 +-
src/duarouter/RODUAFrame.h | 4 +-
src/duarouter/duarouter_main.cpp | 98 +-
src/foreign/Makefile.in | 3 +-
src/foreign/eulerspiral/Makefile.in | 3 +-
src/foreign/eulerspiral/euler.h | 3 +-
src/foreign/gl2ps/Makefile.am | 4 -
src/foreign/gl2ps/Makefile.in | 597 --
src/foreign/gl2ps/gl2ps.c | 6136 --------------------
src/foreign/gl2ps/gl2ps.h | 209 -
src/foreign/mersenne/Makefile.in | 3 +-
src/foreign/nvwa/Makefile.in | 3 +-
src/foreign/polyfonts/Makefile.in | 3 +-
src/foreign/rtree/LayeredRTree.h | 8 +-
src/foreign/rtree/Makefile.in | 3 +-
src/foreign/rtree/SUMORTree.h | 8 +-
src/foreign/tcpip/Makefile.in | 3 +-
src/foreign/tcpip/socket.cpp | 2 +-
src/foreign/tcpip/socket.h | 2 +-
src/foreign/tcpip/storage.cpp | 2 +-
src/foreign/tcpip/storage.h | 2 +-
src/gui/GUIApplicationWindow.cpp | 33 +-
src/gui/GUIApplicationWindow.h | 8 +-
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 | 83 +-
src/gui/GUILoadThread.h | 18 +-
src/gui/GUIManipulator.cpp | 4 +-
src/gui/GUIManipulator.h | 4 +-
src/gui/GUIRunThread.cpp | 8 +-
src/gui/GUIRunThread.h | 9 +-
src/gui/GUISUMOViewParent.cpp | 14 +-
src/gui/GUISUMOViewParent.h | 4 +-
src/gui/GUITLLogicPhasesTrackerWindow.cpp | 17 +-
src/gui/GUITLLogicPhasesTrackerWindow.h | 7 +-
src/gui/GUIViewTraffic.cpp | 5 +-
src/gui/GUIViewTraffic.h | 4 +-
src/gui/Makefile.in | 3 +-
src/gui/TraCIServerAPI_GUI.cpp | 4 +-
src/gui/TraCIServerAPI_GUI.h | 4 +-
src/gui/dialogs/GUIDialog_AboutSUMO.cpp | 11 +-
src/gui/dialogs/GUIDialog_AboutSUMO.h | 4 +-
src/gui/dialogs/GUIDialog_AppSettings.cpp | 4 +-
src/gui/dialogs/GUIDialog_AppSettings.h | 4 +-
src/gui/dialogs/GUIDialog_Breakpoints.cpp | 4 +-
src/gui/dialogs/GUIDialog_Breakpoints.h | 4 +-
src/gui/dialogs/Makefile.in | 3 +-
src/guinetload/GUIDetectorBuilder.cpp | 4 +-
src/guinetload/GUIDetectorBuilder.h | 4 +-
src/guinetload/GUIEdgeControlBuilder.cpp | 9 +-
src/guinetload/GUIEdgeControlBuilder.h | 7 +-
src/guinetload/GUITriggerBuilder.cpp | 4 +-
src/guinetload/GUITriggerBuilder.h | 4 +-
src/guinetload/Makefile.in | 3 +-
src/guisim/GUIBusStop.cpp | 19 +-
src/guisim/GUIBusStop.h | 4 +-
src/guisim/GUICalibrator.cpp | 9 +-
src/guisim/GUICalibrator.h | 4 +-
src/guisim/GUIDetectorWrapper.cpp | 4 +-
src/guisim/GUIDetectorWrapper.h | 4 +-
src/guisim/GUIE3Collector.cpp | 13 +-
src/guisim/GUIE3Collector.h | 4 +-
src/guisim/GUIEdge.cpp | 265 +-
src/guisim/GUIEdge.h | 15 +-
src/guisim/GUIEventControl.cpp | 4 +-
src/guisim/GUIEventControl.h | 4 +-
src/guisim/GUIInductLoop.cpp | 12 +-
src/guisim/GUIInductLoop.h | 4 +-
src/guisim/GUIInstantInductLoop.cpp | 12 +-
src/guisim/GUIInstantInductLoop.h | 4 +-
src/guisim/GUIJunctionWrapper.cpp | 52 +-
src/guisim/GUIJunctionWrapper.h | 7 +-
src/guisim/GUILane.cpp | 182 +-
src/guisim/GUILane.h | 13 +-
src/guisim/GUILaneSpeedTrigger.cpp | 7 +-
src/guisim/GUILaneSpeedTrigger.h | 4 +-
src/guisim/GUINet.cpp | 4 +-
src/guisim/GUINet.h | 4 +-
src/guisim/GUIPerson.cpp | 16 +-
src/guisim/GUIPerson.h | 7 +-
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 | 11 +-
src/guisim/GUITriggeredRerouter.h | 4 +-
src/guisim/GUIVehicle.cpp | 109 +-
src/guisim/GUIVehicle.h | 11 +-
src/guisim/GUIVehicleControl.cpp | 16 +-
src/guisim/GUIVehicleControl.h | 11 +-
src/guisim/GUI_E2_ZS_Collector.cpp | 12 +-
src/guisim/GUI_E2_ZS_Collector.h | 4 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.cpp | 4 +-
src/guisim/GUI_E2_ZS_CollectorOverLanes.h | 4 +-
src/guisim/Makefile.in | 3 +-
src/guisim_main.cpp | 6 +-
src/jtrrouter/Makefile.am | 4 +-
src/jtrrouter/Makefile.in | 12 +-
src/jtrrouter/ROJTREdge.cpp | 26 +-
src/jtrrouter/ROJTREdge.h | 17 +-
src/jtrrouter/ROJTREdgeBuilder.cpp | 4 +-
src/jtrrouter/ROJTREdgeBuilder.h | 4 +-
src/jtrrouter/ROJTRFrame.cpp | 12 +-
src/jtrrouter/ROJTRFrame.h | 4 +-
src/jtrrouter/ROJTRRouter.cpp | 32 +-
src/jtrrouter/ROJTRRouter.h | 16 +-
src/jtrrouter/ROJTRTurnDefLoader.cpp | 10 +-
src/jtrrouter/ROJTRTurnDefLoader.h | 6 +-
src/jtrrouter/jtrrouter_main.cpp | 19 +-
src/marouter/Makefile.am | 32 +
src/{jtrrouter => marouter}/Makefile.in | 80 +-
src/marouter/ROMAAssignments.cpp | 288 +
src/marouter/ROMAAssignments.h | 139 +
src/{router/RONode.cpp => marouter/ROMAEdge.cpp} | 30 +-
src/{dfrouter/RODFEdge.h => marouter/ROMAEdge.h} | 66 +-
.../ROMAEdgeBuilder.cpp} | 23 +-
.../ROMAEdgeBuilder.h} | 23 +-
src/marouter/ROMAFrame.cpp | 288 +
.../RODUAFrame.h => marouter/ROMAFrame.h} | 17 +-
src/marouter/marouter_main.cpp | 406 ++
src/microsim/MSAbstractLaneChangeModel.cpp | 24 +-
src/microsim/MSAbstractLaneChangeModel.h | 27 +-
src/microsim/MSBaseVehicle.cpp | 50 +-
src/microsim/MSBaseVehicle.h | 38 +-
src/microsim/MSBitSetLogic.h | 4 +-
src/microsim/MSEdge.cpp | 150 +-
src/microsim/MSEdge.h | 105 +-
src/microsim/MSEdgeControl.cpp | 4 +-
src/microsim/MSEdgeControl.h | 4 +-
src/microsim/MSEdgeWeightsStorage.cpp | 4 +-
src/microsim/MSEdgeWeightsStorage.h | 4 +-
src/microsim/MSEventControl.cpp | 4 +-
src/microsim/MSEventControl.h | 4 +-
src/microsim/MSFrame.cpp | 26 +-
src/microsim/MSFrame.h | 4 +-
src/microsim/MSGlobals.cpp | 5 +-
src/microsim/MSGlobals.h | 7 +-
src/microsim/MSInsertionControl.cpp | 144 +-
src/microsim/MSInsertionControl.h | 28 +-
src/microsim/MSInternalJunction.cpp | 7 +-
src/microsim/MSInternalJunction.h | 6 +-
src/microsim/MSJunction.cpp | 8 +-
src/microsim/MSJunction.h | 18 +-
src/microsim/MSJunctionControl.cpp | 4 +-
src/microsim/MSJunctionControl.h | 4 +-
src/microsim/MSJunctionLogic.cpp | 4 +-
src/microsim/MSJunctionLogic.h | 4 +-
src/microsim/MSLCM_DK2008.cpp | 14 +-
src/microsim/MSLCM_DK2008.h | 6 +-
src/microsim/MSLCM_JE2013.cpp | 76 +-
src/microsim/MSLCM_JE2013.h | 6 +-
src/microsim/MSLCM_LC2013.cpp | 28 +-
src/microsim/MSLCM_LC2013.h | 6 +-
src/microsim/MSLane.cpp | 337 +-
src/microsim/MSLane.h | 68 +-
src/microsim/MSLaneChanger.cpp | 49 +-
src/microsim/MSLaneChanger.h | 6 +-
src/microsim/MSLink.cpp | 15 +-
src/microsim/MSLink.h | 21 +-
src/microsim/MSLinkCont.cpp | 4 +-
src/microsim/MSLinkCont.h | 4 +-
src/microsim/MSLogicJunction.cpp | 7 +-
src/microsim/MSLogicJunction.h | 9 +-
src/microsim/MSMoveReminder.cpp | 4 +-
src/microsim/MSMoveReminder.h | 4 +-
src/microsim/MSNet.cpp | 39 +-
src/microsim/MSNet.h | 55 +-
src/microsim/MSNoLogicJunction.cpp | 7 +-
src/microsim/MSNoLogicJunction.h | 6 +-
src/microsim/MSPModel.cpp | 4 +-
src/microsim/MSPModel.h | 4 +-
src/microsim/MSPModel_NonInteracting.cpp | 8 +-
src/microsim/MSPModel_NonInteracting.h | 4 +-
src/microsim/MSPModel_Striping.cpp | 94 +-
src/microsim/MSPModel_Striping.h | 18 +-
src/microsim/MSPerson.cpp | 12 +-
src/microsim/MSPerson.h | 4 +-
src/microsim/MSPersonControl.cpp | 4 +-
src/microsim/MSPersonControl.h | 4 +-
src/microsim/MSRightOfWayJunction.cpp | 7 +-
src/microsim/MSRightOfWayJunction.h | 6 +-
src/microsim/MSRoute.cpp | 35 +-
src/microsim/MSRoute.h | 30 +-
src/microsim/MSRouteHandler.cpp | 84 +-
src/microsim/MSRouteHandler.h | 11 +-
src/microsim/MSStateHandler.cpp | 11 +-
src/microsim/MSStateHandler.h | 4 +-
src/microsim/MSVehicle.cpp | 199 +-
src/microsim/MSVehicle.h | 34 +-
src/microsim/MSVehicleContainer.cpp | 12 +-
src/microsim/MSVehicleContainer.h | 8 +-
src/microsim/MSVehicleControl.cpp | 38 +-
src/microsim/MSVehicleControl.h | 27 +-
src/microsim/MSVehicleTransfer.cpp | 7 +-
src/microsim/MSVehicleTransfer.h | 4 +-
src/microsim/MSVehicleType.cpp | 8 +-
src/microsim/MSVehicleType.h | 8 +-
src/microsim/Makefile.in | 3 +-
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 | 6 +-
src/microsim/actions/Command_SaveTLSState.h | 4 +-
.../actions/Command_SaveTLSSwitchStates.cpp | 6 +-
src/microsim/actions/Command_SaveTLSSwitchStates.h | 4 +-
src/microsim/actions/Command_SaveTLSSwitches.cpp | 6 +-
src/microsim/actions/Command_SaveTLSSwitches.h | 4 +-
src/microsim/actions/Makefile.in | 3 +-
src/microsim/cfmodels/MSCFModel.cpp | 68 +-
src/microsim/cfmodels/MSCFModel.h | 63 +-
src/microsim/cfmodels/MSCFModel_Daniel1.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_Daniel1.h | 4 +-
src/microsim/cfmodels/MSCFModel_IDM.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_IDM.h | 4 +-
src/microsim/cfmodels/MSCFModel_Kerner.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_Kerner.h | 7 +-
src/microsim/cfmodels/MSCFModel_Krauss.cpp | 63 +-
src/microsim/cfmodels/MSCFModel_Krauss.h | 37 +-
src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp | 25 +-
src/microsim/cfmodels/MSCFModel_KraussOrig1.h | 24 +-
src/microsim/cfmodels/MSCFModel_KraussPS.cpp | 9 +-
src/microsim/cfmodels/MSCFModel_KraussPS.h | 4 +-
src/microsim/cfmodels/MSCFModel_PWag2009.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_PWag2009.h | 4 +-
src/microsim/cfmodels/MSCFModel_SmartSK.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_SmartSK.h | 4 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.cpp | 4 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.h | 4 +-
src/microsim/cfmodels/Makefile.in | 3 +-
src/microsim/devices/MSDevice.cpp | 4 +-
src/microsim/devices/MSDevice.h | 4 +-
src/microsim/devices/MSDevice_BTreceiver.cpp | 149 +-
src/microsim/devices/MSDevice_BTreceiver.h | 86 +-
src/microsim/devices/MSDevice_BTsender.cpp | 18 +-
src/microsim/devices/MSDevice_BTsender.h | 14 +-
src/microsim/devices/MSDevice_Emissions.cpp | 4 +-
src/microsim/devices/MSDevice_Emissions.h | 4 +-
src/microsim/devices/MSDevice_Example.cpp | 6 +-
src/microsim/devices/MSDevice_Example.h | 4 +-
src/microsim/devices/MSDevice_Person.cpp | 4 +-
src/microsim/devices/MSDevice_Person.h | 4 +-
src/microsim/devices/MSDevice_Routing.cpp | 252 +-
src/microsim/devices/MSDevice_Routing.h | 113 +-
src/microsim/devices/MSDevice_Tripinfo.cpp | 99 +-
src/microsim/devices/MSDevice_Tripinfo.h | 12 +-
src/microsim/devices/MSDevice_Vehroutes.cpp | 71 +-
src/microsim/devices/MSDevice_Vehroutes.h | 12 +-
src/microsim/devices/Makefile.in | 3 +-
src/microsim/logging/CastingFunctionBinding.h | 25 +-
src/microsim/logging/FuncBinding_IntParam.h | 4 +-
src/microsim/logging/FuncBinding_StringParam.h | 4 +-
src/microsim/logging/FunctionBinding.h | 23 +-
src/microsim/logging/Makefile.in | 3 +-
src/microsim/output/MSAmitranTrajectories.cpp | 4 +-
src/microsim/output/MSAmitranTrajectories.h | 4 +-
src/microsim/output/MSCrossSection.h | 4 +-
src/microsim/output/MSDetectorControl.cpp | 4 +-
src/microsim/output/MSDetectorControl.h | 4 +-
src/microsim/output/MSDetectorFileOutput.h | 4 +-
src/microsim/output/MSE2Collector.cpp | 56 +-
src/microsim/output/MSE2Collector.h | 10 +-
src/microsim/output/MSE3Collector.cpp | 110 +-
src/microsim/output/MSE3Collector.h | 31 +-
src/microsim/output/MSEmissionExport.cpp | 4 +-
src/microsim/output/MSEmissionExport.h | 4 +-
src/microsim/output/MSFCDExport.cpp | 49 +-
src/microsim/output/MSFCDExport.h | 4 +-
src/microsim/output/MSFullExport.cpp | 4 +-
src/microsim/output/MSFullExport.h | 4 +-
src/microsim/output/MSInductLoop.cpp | 14 +-
src/microsim/output/MSInductLoop.h | 4 +-
src/microsim/output/MSInstantInductLoop.cpp | 4 +-
src/microsim/output/MSInstantInductLoop.h | 4 +-
src/microsim/output/MSMeanData.cpp | 6 +-
src/microsim/output/MSMeanData.h | 4 +-
src/microsim/output/MSMeanData_Amitran.cpp | 6 +-
src/microsim/output/MSMeanData_Amitran.h | 4 +-
src/microsim/output/MSMeanData_Emissions.cpp | 4 +-
src/microsim/output/MSMeanData_Emissions.h | 4 +-
src/microsim/output/MSMeanData_Harmonoise.cpp | 4 +-
src/microsim/output/MSMeanData_Harmonoise.h | 4 +-
src/microsim/output/MSMeanData_Net.cpp | 4 +-
src/microsim/output/MSMeanData_Net.h | 4 +-
src/microsim/output/MSQueueExport.cpp | 4 +-
src/microsim/output/MSQueueExport.h | 4 +-
src/microsim/output/MSRouteProbe.cpp | 4 +-
src/microsim/output/MSRouteProbe.h | 4 +-
src/microsim/output/MSVTKExport.cpp | 4 +-
src/microsim/output/MSVTKExport.h | 4 +-
src/microsim/output/MSVTypeProbe.cpp | 6 +-
src/microsim/output/MSVTypeProbe.h | 4 +-
src/microsim/output/MSXMLRawOut.cpp | 4 +-
src/microsim/output/MSXMLRawOut.h | 4 +-
.../output/MS_E2_ZS_CollectorOverLanes.cpp | 4 +-
src/microsim/output/MS_E2_ZS_CollectorOverLanes.h | 4 +-
src/microsim/output/Makefile.in | 3 +-
.../traffic_lights/MSActuatedTrafficLightLogic.cpp | 72 +-
.../traffic_lights/MSActuatedTrafficLightLogic.h | 24 +-
.../MSAgentbasedTrafficLightLogic.cpp | 4 +-
.../traffic_lights/MSAgentbasedTrafficLightLogic.h | 4 +-
.../traffic_lights/MSOffTrafficLightLogic.cpp | 4 +-
.../traffic_lights/MSOffTrafficLightLogic.h | 4 +-
src/microsim/traffic_lights/MSPhaseDefinition.h | 4 +-
.../traffic_lights/MSSimpleTrafficLightLogic.cpp | 6 +-
.../traffic_lights/MSSimpleTrafficLightLogic.h | 4 +-
src/microsim/traffic_lights/MSTLLogicControl.cpp | 6 +-
src/microsim/traffic_lights/MSTLLogicControl.h | 4 +-
.../traffic_lights/MSTrafficLightLogic.cpp | 6 +-
src/microsim/traffic_lights/MSTrafficLightLogic.h | 4 +-
src/microsim/traffic_lights/Makefile.in | 3 +-
src/microsim/trigger/MSBusStop.cpp | 6 +-
src/microsim/trigger/MSBusStop.h | 4 +-
src/microsim/trigger/MSCalibrator.cpp | 10 +-
src/microsim/trigger/MSCalibrator.h | 4 +-
src/microsim/trigger/MSLaneSpeedTrigger.cpp | 6 +-
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 | 10 +-
src/microsim/trigger/MSTriggeredRerouter.h | 4 +-
src/microsim/trigger/Makefile.in | 3 +-
src/netbuild/Makefile.am | 1 +
src/netbuild/Makefile.in | 13 +-
src/netbuild/NBAlgorithms.cpp | 35 +-
src/netbuild/NBAlgorithms.h | 7 +-
src/netbuild/NBAlgorithms_Ramps.cpp | 4 +-
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 | 10 +-
src/netbuild/NBContHelper.cpp | 4 +-
src/netbuild/NBContHelper.h | 4 +-
src/netbuild/NBDistribution.cpp | 4 +-
src/netbuild/NBDistribution.h | 4 +-
src/netbuild/NBDistrict.cpp | 4 +-
src/netbuild/NBDistrict.h | 4 +-
src/netbuild/NBDistrictCont.cpp | 4 +-
src/netbuild/NBDistrictCont.h | 4 +-
src/netbuild/NBEdge.cpp | 4 +-
src/netbuild/NBEdge.h | 4 +-
src/netbuild/NBEdgeCont.cpp | 92 +-
src/netbuild/NBEdgeCont.h | 27 +-
src/netbuild/NBFrame.cpp | 4 +-
src/netbuild/NBFrame.h | 4 +-
src/netbuild/NBHeightMapper.cpp | 286 +
src/netbuild/NBHeightMapper.h | 192 +
src/netbuild/NBHelpers.cpp | 4 +-
src/netbuild/NBHelpers.h | 4 +-
src/netbuild/NBJoinedEdgesMap.cpp | 4 +-
src/netbuild/NBJoinedEdgesMap.h | 4 +-
src/netbuild/NBLinkPossibilityMatrix.h | 4 +-
src/netbuild/NBLoadedSUMOTLDef.cpp | 4 +-
src/netbuild/NBLoadedSUMOTLDef.h | 4 +-
src/netbuild/NBLoadedTLDef.cpp | 4 +-
src/netbuild/NBLoadedTLDef.h | 4 +-
src/netbuild/NBNetBuilder.cpp | 45 +-
src/netbuild/NBNetBuilder.h | 28 +-
src/netbuild/NBNode.cpp | 21 +-
src/netbuild/NBNode.h | 7 +-
src/netbuild/NBNodeCont.cpp | 58 +-
src/netbuild/NBNodeCont.h | 11 +-
src/netbuild/NBNodeShapeComputer.cpp | 22 +-
src/netbuild/NBNodeShapeComputer.h | 16 +-
src/netbuild/NBOwnTLDef.cpp | 4 +-
src/netbuild/NBOwnTLDef.h | 4 +-
src/netbuild/NBRequest.cpp | 8 +-
src/netbuild/NBRequest.h | 4 +-
src/netbuild/NBSign.cpp | 4 +-
src/netbuild/NBSign.h | 4 +-
src/netbuild/NBTrafficLightDefinition.cpp | 4 +-
src/netbuild/NBTrafficLightDefinition.h | 4 +-
src/netbuild/NBTrafficLightLogic.cpp | 7 +-
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 | 6 +-
src/netgen/Makefile.am | 5 -
src/netgen/Makefile.in | 9 +-
src/netgen/NGEdge.cpp | 4 +-
src/netgen/NGEdge.h | 4 +-
src/netgen/NGFrame.cpp | 4 +-
src/netgen/NGFrame.h | 4 +-
src/netgen/NGNet.cpp | 4 +-
src/netgen/NGNet.h | 4 +-
src/netgen/NGNode.cpp | 4 +-
src/netgen/NGNode.h | 4 +-
src/netgen/NGRandomNetBuilder.cpp | 4 +-
src/netgen/NGRandomNetBuilder.h | 4 +-
src/netgen/netgen_main.cpp | 6 +-
src/netimport/Makefile.in | 3 +-
src/netimport/NIFrame.cpp | 11 +-
src/netimport/NIFrame.h | 4 +-
src/netimport/NIImporter_ArcView.cpp | 4 +-
src/netimport/NIImporter_ArcView.h | 4 +-
src/netimport/NIImporter_DlrNavteq.cpp | 4 +-
src/netimport/NIImporter_DlrNavteq.h | 4 +-
src/netimport/NIImporter_ITSUMO.cpp | 4 +-
src/netimport/NIImporter_ITSUMO.h | 4 +-
src/netimport/NIImporter_MATSim.cpp | 4 +-
src/netimport/NIImporter_MATSim.h | 4 +-
src/netimport/NIImporter_OpenDrive.cpp | 4 +-
src/netimport/NIImporter_OpenDrive.h | 4 +-
src/netimport/NIImporter_OpenStreetMap.cpp | 6 +-
src/netimport/NIImporter_OpenStreetMap.h | 16 +-
src/netimport/NIImporter_RobocupRescue.cpp | 4 +-
src/netimport/NIImporter_RobocupRescue.h | 4 +-
src/netimport/NIImporter_SUMO.cpp | 34 +-
src/netimport/NIImporter_SUMO.h | 13 +-
src/netimport/NIImporter_VISUM.cpp | 4 +-
src/netimport/NIImporter_VISUM.h | 4 +-
src/netimport/NILoader.cpp | 13 +-
src/netimport/NILoader.h | 4 +-
src/netimport/NINavTeqHelper.cpp | 4 +-
src/netimport/NINavTeqHelper.h | 4 +-
src/netimport/NIVisumTL.cpp | 4 +-
src/netimport/NIVisumTL.h | 4 +-
src/netimport/NIXMLConnectionsHandler.cpp | 11 +-
src/netimport/NIXMLConnectionsHandler.h | 4 +-
src/netimport/NIXMLEdgesHandler.cpp | 50 +-
src/netimport/NIXMLEdgesHandler.h | 17 +-
src/netimport/NIXMLNodesHandler.cpp | 4 +-
src/netimport/NIXMLNodesHandler.h | 4 +-
src/netimport/NIXMLTrafficLightsHandler.cpp | 4 +-
src/netimport/NIXMLTrafficLightsHandler.h | 4 +-
src/netimport/NIXMLTypesHandler.cpp | 4 +-
src/netimport/NIXMLTypesHandler.h | 4 +-
src/netimport/vissim/Makefile.in | 3 +-
src/netimport/vissim/NIImporter_Vissim.cpp | 4 +-
src/netimport/vissim/NIImporter_Vissim.h | 4 +-
src/netimport/vissim/NIVissimElements.h | 4 +-
src/netimport/vissim/tempstructs/Makefile.in | 3 +-
.../vissim/tempstructs/NIVissimAbstractEdge.cpp | 4 +-
.../vissim/tempstructs/NIVissimAbstractEdge.h | 4 +-
.../tempstructs/NIVissimBoundedClusterObject.cpp | 4 +-
.../tempstructs/NIVissimBoundedClusterObject.h | 4 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.cpp | 9 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.h | 7 +-
.../vissim/tempstructs/NIVissimClosedLanesVector.h | 4 +-
.../vissim/tempstructs/NIVissimClosures.cpp | 4 +-
.../vissim/tempstructs/NIVissimClosures.h | 4 +-
.../vissim/tempstructs/NIVissimConnection.cpp | 37 +-
.../vissim/tempstructs/NIVissimConnection.h | 21 +-
.../tempstructs/NIVissimConnectionCluster.cpp | 4 +-
.../vissim/tempstructs/NIVissimConnectionCluster.h | 4 +-
.../tempstructs/NIVissimDistrictConnection.cpp | 4 +-
.../tempstructs/NIVissimDistrictConnection.h | 4 +-
.../vissim/tempstructs/NIVissimDisturbance.cpp | 20 +-
.../vissim/tempstructs/NIVissimDisturbance.h | 13 +-
src/netimport/vissim/tempstructs/NIVissimEdge.cpp | 4 +-
src/netimport/vissim/tempstructs/NIVissimEdge.h | 4 +-
.../vissim/tempstructs/NIVissimEdgePosMap.cpp | 4 +-
.../vissim/tempstructs/NIVissimEdgePosMap.h | 4 +-
.../tempstructs/NIVissimExtendedEdgePoint.cpp | 4 +-
.../vissim/tempstructs/NIVissimExtendedEdgePoint.h | 4 +-
.../tempstructs/NIVissimExtendedEdgePointVector.h | 4 +-
.../vissim/tempstructs/NIVissimNodeCluster.cpp | 4 +-
.../vissim/tempstructs/NIVissimNodeCluster.h | 4 +-
.../vissim/tempstructs/NIVissimNodeDef.cpp | 7 +-
src/netimport/vissim/tempstructs/NIVissimNodeDef.h | 8 +-
.../vissim/tempstructs/NIVissimNodeDef_Edges.cpp | 7 +-
.../vissim/tempstructs/NIVissimNodeDef_Edges.h | 6 +-
.../vissim/tempstructs/NIVissimNodeDef_Poly.cpp | 7 +-
.../vissim/tempstructs/NIVissimNodeDef_Poly.h | 6 +-
.../tempstructs/NIVissimNodeParticipatingEdge.cpp | 4 +-
.../tempstructs/NIVissimNodeParticipatingEdge.h | 4 +-
.../NIVissimNodeParticipatingEdgeVector.h | 4 +-
.../vissim/tempstructs/NIVissimSource.cpp | 18 +-
src/netimport/vissim/tempstructs/NIVissimSource.h | 15 +-
src/netimport/vissim/tempstructs/NIVissimTL.cpp | 12 +-
src/netimport/vissim/tempstructs/NIVissimTL.h | 22 +-
.../tempstructs/NIVissimTrafficDescription.cpp | 10 +-
.../tempstructs/NIVissimTrafficDescription.h | 7 +-
.../vissim/tempstructs/NIVissimVehTypeClass.cpp | 4 +-
.../vissim/tempstructs/NIVissimVehTypeClass.h | 4 +-
.../vissim/tempstructs/NIVissimVehicleClass.cpp | 10 +-
.../vissim/tempstructs/NIVissimVehicleClass.h | 8 +-
.../tempstructs/NIVissimVehicleClassVector.h | 4 +-
.../vissim/tempstructs/NIVissimVehicleType.cpp | 21 +-
.../vissim/tempstructs/NIVissimVehicleType.h | 15 +-
src/netimport/vissim/typeloader/Makefile.in | 3 +-
...issimSingleTypeParser_Auswertungsdefinition.cpp | 4 +-
...IVissimSingleTypeParser_Auswertungsdefinition.h | 4 +-
...NIVissimSingleTypeParser_Detektordefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Detektordefinition.h | 4 +-
.../typeloader/NIVissimSingleTypeParser_DynUml.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_DynUml.h | 4 +-
...IVissimSingleTypeParser_Einheitendefinition.cpp | 4 +-
.../NIVissimSingleTypeParser_Einheitendefinition.h | 4 +-
.../NIVissimSingleTypeParser_Emission.cpp | 4 +-
.../typeloader/NIVissimSingleTypeParser_Emission.h | 4 +-
...IVissimSingleTypeParser_Fahrtverlaufdateien.cpp | 4 +-
.../NIVissimSingleTypeParser_Fahrtverlaufdateien.h | 4 +-
...simSingleTypeParser_Fahrverhaltendefinition.cpp | 4 +-
...issimSingleTypeParser_Fahrverhaltendefinition.h | 4 +-
...mSingleTypeParser_Fahrzeugklassendefinition.cpp | 4 +-
...simSingleTypeParser_Fahrzeugklassendefinition.h | 4 +-
...issimSingleTypeParser_Fahrzeugtypdefinition.cpp | 7 +-
...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 | 10 +-
...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 | 10 +-
...IVissimSingleTypeParser_Signalgeberdefinition.h | 4 +-
...simSingleTypeParser_Signalgruppendefinition.cpp | 6 +-
...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 | 8 +-
.../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 | 17 +-
...IVissimSingleTypeParser_Verbindungsdefinition.h | 4 +-
...peParser_Verkehrszusammensetzungsdefinition.cpp | 6 +-
...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 | 14 +-
.../NIVissimSingleTypeParser_Zuflussdefinition.h | 4 +-
...SingleTypeParser_Zusammensetzungsdefinition.cpp | 4 +-
...imSingleTypeParser_Zusammensetzungsdefinition.h | 4 +-
.../NIVissimSingleTypeParser__XKurvedefinition.cpp | 4 +-
.../NIVissimSingleTypeParser__XKurvedefinition.h | 4 +-
...simSingleTypeParser__XVerteilungsdefinition.cpp | 4 +-
...issimSingleTypeParser__XVerteilungsdefinition.h | 4 +-
src/netload/Makefile.in | 3 +-
src/netload/NLBuilder.cpp | 4 +-
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 | 19 +-
src/netload/NLEdgeControlBuilder.h | 9 +-
src/netload/NLHandler.cpp | 33 +-
src/netload/NLHandler.h | 4 +-
src/netload/NLJunctionControlBuilder.cpp | 14 +-
src/netload/NLJunctionControlBuilder.h | 9 +-
src/netload/NLTriggerBuilder.cpp | 10 +-
src/netload/NLTriggerBuilder.h | 6 +-
src/netwrite/Makefile.in | 3 +-
src/netwrite/NWFrame.cpp | 4 +-
src/netwrite/NWFrame.h | 4 +-
src/netwrite/NWWriter_Amitran.cpp | 14 +-
src/netwrite/NWWriter_Amitran.h | 4 +-
src/netwrite/NWWriter_DlrNavteq.cpp | 4 +-
src/netwrite/NWWriter_DlrNavteq.h | 4 +-
src/netwrite/NWWriter_MATSim.cpp | 4 +-
src/netwrite/NWWriter_MATSim.h | 4 +-
src/netwrite/NWWriter_OpenDrive.cpp | 4 +-
src/netwrite/NWWriter_OpenDrive.h | 4 +-
src/netwrite/NWWriter_SUMO.cpp | 80 +-
src/netwrite/NWWriter_SUMO.h | 32 +-
src/netwrite/NWWriter_XML.cpp | 21 +-
src/netwrite/NWWriter_XML.h | 7 +-
src/od2trips/Makefile.am | 1 +
src/od2trips/Makefile.in | 8 +-
src/od2trips/ODAmitranHandler.cpp | 4 +-
src/od2trips/ODAmitranHandler.h | 4 +-
src/od2trips/ODCell.h | 4 +-
src/od2trips/ODDistrict.cpp | 4 +-
src/od2trips/ODDistrict.h | 4 +-
src/od2trips/ODDistrictCont.cpp | 4 +-
src/od2trips/ODDistrictCont.h | 4 +-
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 | 8 +-
src/polyconvert/Makefile.in | 3 +-
src/polyconvert/PCLoaderArcView.cpp | 4 +-
src/polyconvert/PCLoaderArcView.h | 4 +-
src/polyconvert/PCLoaderDlrNavteq.cpp | 4 +-
src/polyconvert/PCLoaderDlrNavteq.h | 4 +-
src/polyconvert/PCLoaderOSM.cpp | 4 +-
src/polyconvert/PCLoaderOSM.h | 4 +-
src/polyconvert/PCLoaderVisum.cpp | 4 +-
src/polyconvert/PCLoaderVisum.h | 4 +-
src/polyconvert/PCLoaderXML.cpp | 4 +-
src/polyconvert/PCLoaderXML.h | 4 +-
src/polyconvert/PCNetProjectionLoader.cpp | 4 +-
src/polyconvert/PCNetProjectionLoader.h | 4 +-
src/polyconvert/PCPolyContainer.cpp | 6 +-
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 | 6 +-
src/router/Makefile.am | 6 +-
src/router/Makefile.in | 21 +-
src/router/ROAbstractEdgeBuilder.h | 4 +-
src/router/ROCostCalculator.cpp | 251 -
src/router/ROCostCalculator.h | 186 -
src/router/ROEdge.cpp | 100 +-
src/router/ROEdge.h | 82 +-
src/router/ROFrame.cpp | 22 +-
src/router/ROFrame.h | 4 +-
src/router/ROHelper.cpp | 23 +-
src/router/ROHelper.h | 8 +-
src/router/ROLane.h | 4 +-
src/router/ROLoader.cpp | 59 +-
src/router/ROLoader.h | 12 +-
src/router/RONet.cpp | 177 +-
src/router/RONet.h | 74 +-
src/router/RONetHandler.cpp | 14 +-
src/router/RONetHandler.h | 4 +-
src/router/RONode.cpp | 4 +-
src/router/RONode.h | 4 +-
src/router/RORoute.cpp | 4 +-
src/router/RORoute.h | 8 +-
src/router/RORouteAggregator.h | 200 +
src/router/RORouteDef.cpp | 56 +-
src/router/RORouteDef.h | 21 +-
src/router/RORouteHandler.cpp | 14 +-
src/router/RORouteHandler.h | 9 +-
src/router/ROVehicle.cpp | 18 +-
src/router/ROVehicle.h | 37 +-
src/router/ROVehicleCont.cpp | 4 +-
src/router/ROVehicleCont.h | 4 +-
src/router/ReferencedItem.h | 89 -
src/sumo_main.cpp | 9 +-
src/tools/Makefile.in | 3 +-
src/tools/TrajectoriesHandler.cpp | 38 +-
src/tools/TrajectoriesHandler.h | 8 +-
src/tools/emissionsDrivingCycle_main.cpp | 21 +-
src/tools/emissionsMap_main.cpp | 6 +-
src/traci-server/Makefile.in | 3 +-
src/traci-server/TraCIConstants.h | 4 +-
src/traci-server/TraCIException.h | 4 +-
src/traci-server/TraCIServer.cpp | 8 +-
src/traci-server/TraCIServer.h | 4 +-
src/traci-server/TraCIServerAPI_ArealDetector.cpp | 7 +-
src/traci-server/TraCIServerAPI_ArealDetector.h | 4 +-
src/traci-server/TraCIServerAPI_Edge.cpp | 4 +-
src/traci-server/TraCIServerAPI_Edge.h | 4 +-
src/traci-server/TraCIServerAPI_InductionLoop.cpp | 5 +-
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 | 4 +-
src/traci-server/TraCIServerAPI_Lane.h | 4 +-
src/traci-server/TraCIServerAPI_MeMeDetector.cpp | 9 +-
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 | 4 +-
src/traci-server/TraCIServerAPI_Simulation.h | 4 +-
src/traci-server/TraCIServerAPI_TLS.cpp | 4 +-
src/traci-server/TraCIServerAPI_TLS.h | 4 +-
src/traci-server/TraCIServerAPI_Vehicle.cpp | 23 +-
src/traci-server/TraCIServerAPI_Vehicle.h | 4 +-
src/traci-server/TraCIServerAPI_VehicleType.cpp | 44 +-
src/traci-server/TraCIServerAPI_VehicleType.h | 4 +-
src/traci_testclient/Makefile.in | 3 +-
src/traci_testclient/TraCITestClient.cpp | 4 +-
src/traci_testclient/TraCITestClient.h | 4 +-
src/traci_testclient/tracitestclient_main.cpp | 4 +-
src/utils/Makefile.am | 2 +-
src/utils/Makefile.in | 7 +-
src/utils/common/AbstractMutex.h | 4 +-
src/utils/common/Command.h | 4 +-
src/utils/common/FileHelpers.cpp | 4 +-
src/utils/common/FileHelpers.h | 14 +-
src/utils/common/IDSupplier.cpp | 4 +-
src/utils/common/IDSupplier.h | 4 +-
src/utils/common/InstancePool.h | 116 -
src/utils/common/Makefile.am | 39 +-
src/utils/common/Makefile.in | 53 +-
src/utils/common/MsgHandler.cpp | 4 +-
src/utils/common/MsgHandler.h | 4 +-
src/utils/common/MsgRetrievingFunction.h | 4 +-
src/utils/common/Named.h | 4 +-
src/utils/common/NamedObjectCont.h | 4 +-
src/utils/common/NamedRTree.h | 24 +-
src/utils/common/Parameterised.cpp | 4 +-
src/utils/common/Parameterised.h | 4 +-
src/utils/common/RGBColor.cpp | 12 +-
src/utils/common/RGBColor.h | 4 +-
src/utils/common/RandHelper.cpp | 4 +-
src/utils/common/RandHelper.h | 11 +-
src/utils/common/RandomDistributor.h | 4 +-
src/utils/common/SUMOTime.cpp | 4 +-
src/utils/common/SUMOTime.h | 4 +-
src/utils/common/SUMOVehicleClass.cpp | 8 +-
src/utils/common/SUMOVehicleClass.h | 4 +-
src/utils/common/StaticCommand.h | 2 +-
src/utils/common/StdDefs.cpp | 25 +-
src/utils/common/StdDefs.h | 6 +-
src/utils/common/StringBijection.h | 4 +-
src/utils/common/StringTokenizer.cpp | 4 +-
src/utils/common/StringTokenizer.h | 4 +-
src/utils/common/StringUtils.cpp | 4 +-
src/utils/common/StringUtils.h | 4 +-
src/utils/common/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 | 4 +-
src/utils/common/TplConvert.h | 4 +-
src/utils/common/UtilExceptions.h | 4 +-
src/utils/common/ValueRetriever.h | 4 +-
src/utils/common/ValueSource.h | 4 +-
src/utils/common/ValueTimeLine.h | 4 +-
src/utils/common/VectorHelper.h | 4 +-
src/utils/common/WrappingCommand.h | 4 +-
src/utils/distribution/Distribution.h | 4 +-
src/utils/distribution/DistributionCont.cpp | 4 +-
src/utils/distribution/DistributionCont.h | 4 +-
src/utils/distribution/Distribution_MeanDev.cpp | 4 +-
src/utils/distribution/Distribution_MeanDev.h | 4 +-
src/utils/distribution/Distribution_Points.cpp | 4 +-
src/utils/distribution/Distribution_Points.h | 4 +-
src/utils/distribution/Makefile.am | 2 -
src/utils/distribution/Makefile.in | 4 +-
src/utils/emissions/HelpersHBEFA.cpp | 4 +-
src/utils/emissions/HelpersHBEFA.h | 4 +-
src/utils/emissions/HelpersHBEFA3.cpp | 6 +-
src/utils/emissions/HelpersHBEFA3.h | 4 +-
src/utils/emissions/HelpersHarmonoise.cpp | 4 +-
src/utils/emissions/HelpersHarmonoise.h | 4 +-
src/utils/emissions/HelpersPHEMlight.cpp | 6 +-
src/utils/emissions/HelpersPHEMlight.h | 6 +-
src/utils/emissions/Makefile.in | 3 +-
src/utils/emissions/PHEMCEP.cpp | 25 +-
src/utils/emissions/PHEMCEP.h | 6 +-
src/utils/emissions/PHEMCEPHandler.cpp | 7 +-
src/utils/emissions/PHEMCEPHandler.h | 2 +-
src/utils/emissions/PHEMConstants.h | 4 +-
src/utils/emissions/PollutantsInterface.cpp | 4 +-
src/utils/emissions/PollutantsInterface.h | 6 +-
src/utils/foxtools/FXBaseObject.cpp | 4 +-
src/utils/foxtools/FXBaseObject.h | 4 +-
src/utils/foxtools/FXLCDLabel.cpp | 4 +-
src/utils/foxtools/FXLCDLabel.h | 4 +-
src/utils/foxtools/FXLinkLabel.cpp | 4 +-
src/utils/foxtools/FXLinkLabel.h | 4 +-
src/utils/foxtools/FXRealSpinDial.cpp | 6 +-
src/utils/foxtools/FXRealSpinDial.h | 4 +-
src/utils/foxtools/FXSevenSegment.cpp | 4 +-
src/utils/foxtools/FXSevenSegment.h | 4 +-
src/utils/foxtools/FXSingleEventThread.cpp | 4 +-
src/utils/foxtools/FXSingleEventThread.h | 4 +-
src/utils/foxtools/FXThreadEvent.cpp | 4 +-
src/utils/foxtools/FXThreadEvent.h | 4 +-
src/utils/foxtools/FXThreadMessageRetriever.h | 4 +-
src/utils/foxtools/FXWorkerThread.h | 300 +
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 | 51 +-
src/utils/foxtools/MFXEventQue.h | 48 +-
src/utils/foxtools/MFXImageHelper.cpp | 4 +-
src/utils/foxtools/MFXImageHelper.h | 4 +-
src/utils/foxtools/MFXInterThreadEventClient.h | 4 +-
src/utils/foxtools/MFXMenuHeader.cpp | 4 +-
src/utils/foxtools/MFXMenuHeader.h | 4 +-
src/utils/foxtools/MFXMutex.cpp | 4 +-
src/utils/foxtools/MFXMutex.h | 4 +-
src/utils/foxtools/MFXUtils.cpp | 4 +-
src/utils/foxtools/MFXUtils.h | 4 +-
src/utils/foxtools/Makefile.am | 1 +
src/utils/foxtools/Makefile.in | 4 +-
src/utils/foxtools/fxexdefs.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 | 6 +-
src/utils/geom/GeoConvHelper.h | 4 +-
src/utils/geom/GeomConvHelper.cpp | 4 +-
src/utils/geom/GeomConvHelper.h | 4 +-
src/utils/geom/GeomHelper.cpp | 19 +-
src/utils/geom/GeomHelper.h | 4 +-
src/utils/geom/Helper_ConvexHull.cpp | 4 +-
src/utils/geom/Helper_ConvexHull.h | 4 +-
src/utils/geom/Line.cpp | 4 +-
src/utils/geom/Line.h | 4 +-
src/utils/geom/Makefile.in | 3 +-
src/utils/geom/Position.cpp | 4 +-
src/utils/geom/Position.h | 4 +-
src/utils/geom/PositionVector.cpp | 12 +-
src/utils/geom/PositionVector.h | 4 +-
src/utils/geom/bezier.cpp | 4 +-
src/utils/geom/bezier.h | 4 +-
src/utils/gui/Makefile.in | 3 +-
src/utils/gui/div/GLHelper.cpp | 4 +-
src/utils/gui/div/GLHelper.h | 4 +-
src/utils/gui/div/GLObjectValuePassConnector.h | 4 +-
src/utils/gui/div/GUIDialog_GLChosenEditor.cpp | 4 +-
src/utils/gui/div/GUIDialog_GLChosenEditor.h | 4 +-
src/utils/gui/div/GUIGlobalSelection.cpp | 4 +-
src/utils/gui/div/GUIGlobalSelection.h | 4 +-
src/utils/gui/div/GUIIOGlobals.cpp | 4 +-
src/utils/gui/div/GUIIOGlobals.h | 4 +-
src/utils/gui/div/GUIMessageWindow.cpp | 6 +-
src/utils/gui/div/GUIMessageWindow.h | 8 +-
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 | 4 +-
src/utils/gui/div/GUIParameterTableWindow.h | 4 +-
src/utils/gui/div/GUISelectedStorage.cpp | 4 +-
src/utils/gui/div/GUISelectedStorage.h | 4 +-
src/utils/gui/div/GUIUserIO.cpp | 4 +-
src/utils/gui/div/GUIUserIO.h | 4 +-
src/utils/gui/div/Makefile.in | 3 +-
src/utils/gui/events/GUIEvent.h | 4 +-
src/utils/gui/events/GUIEvent_Message.h | 4 +-
src/utils/gui/events/GUIEvent_SimulationStep.h | 4 +-
src/utils/gui/events/Makefile.in | 3 +-
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 | 15 +-
src/utils/gui/globjects/GUIPointOfInterest.h | 5 +-
src/utils/gui/globjects/GUIPolygon.cpp | 12 +-
src/utils/gui/globjects/GUIPolygon.h | 5 +-
src/utils/gui/globjects/Makefile.in | 3 +-
src/utils/gui/images/GUIIconSubSys.cpp | 4 +-
src/utils/gui/images/GUIIconSubSys.h | 4 +-
src/utils/gui/images/GUIIcons.h | 4 +-
src/utils/gui/images/GUITexturesHelper.cpp | 4 +-
src/utils/gui/images/GUITexturesHelper.h | 4 +-
src/utils/gui/images/Makefile.in | 3 +-
src/utils/gui/images/flag.cpp | 4 +-
src/utils/gui/images/flag_minus.cpp | 4 +-
src/utils/gui/images/flag_plus.cpp | 4 +-
src/utils/gui/images/manip.cpp | 4 +-
src/utils/gui/settings/GUIColorScheme.h | 81 +-
src/utils/gui/settings/GUIColorer.h | 37 +-
.../gui/settings/GUICompleteSchemeStorage.cpp | 6 +-
src/utils/gui/settings/GUICompleteSchemeStorage.h | 4 +-
src/utils/gui/settings/GUISettingsHandler.cpp | 65 +-
src/utils/gui/settings/GUISettingsHandler.h | 14 +-
.../gui/settings/GUIVisualizationSettings.cpp | 267 +-
src/utils/gui/settings/GUIVisualizationSettings.h | 90 +-
src/utils/gui/settings/Makefile.in | 3 +-
src/utils/gui/tracker/GUIParameterTracker.cpp | 4 +-
src/utils/gui/tracker/GUIParameterTracker.h | 4 +-
src/utils/gui/tracker/Makefile.in | 3 +-
src/utils/gui/tracker/TrackerValueDesc.cpp | 4 +-
src/utils/gui/tracker/TrackerValueDesc.h | 4 +-
src/utils/gui/windows/GUIAppEnum.h | 6 +-
.../gui/windows/GUIDanielPerspectiveChanger.cpp | 4 +-
.../gui/windows/GUIDanielPerspectiveChanger.h | 4 +-
src/utils/gui/windows/GUIDialog_EditViewport.cpp | 16 +-
src/utils/gui/windows/GUIDialog_EditViewport.h | 4 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.cpp | 6 +-
src/utils/gui/windows/GUIDialog_GLObjChooser.h | 9 +-
src/utils/gui/windows/GUIDialog_ViewSettings.cpp | 452 +-
src/utils/gui/windows/GUIDialog_ViewSettings.h | 57 +-
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 | 24 +-
src/utils/gui/windows/GUISUMOAbstractView.h | 4 +-
src/utils/gui/windows/Makefile.in | 3 +-
src/utils/importio/LineHandler.h | 4 +-
src/utils/importio/LineReader.cpp | 4 +-
src/utils/importio/LineReader.h | 4 +-
src/utils/importio/Makefile.in | 3 +-
src/utils/importio/NamedColumnsParser.cpp | 4 +-
src/utils/importio/NamedColumnsParser.h | 4 +-
src/utils/iodevices/BinaryFormatter.cpp | 18 +-
src/utils/iodevices/BinaryFormatter.h | 33 +-
src/utils/iodevices/BinaryInputDevice.cpp | 4 +-
src/utils/iodevices/BinaryInputDevice.h | 4 +-
src/utils/iodevices/Makefile.in | 3 +-
src/utils/iodevices/OutputDevice.cpp | 6 +-
src/utils/iodevices/OutputDevice.h | 4 +-
src/utils/iodevices/OutputDevice_CERR.cpp | 4 +-
src/utils/iodevices/OutputDevice_CERR.h | 4 +-
src/utils/iodevices/OutputDevice_COUT.cpp | 4 +-
src/utils/iodevices/OutputDevice_COUT.h | 4 +-
src/utils/iodevices/OutputDevice_File.cpp | 4 +-
src/utils/iodevices/OutputDevice_File.h | 4 +-
src/utils/iodevices/OutputDevice_Network.cpp | 4 +-
src/utils/iodevices/OutputDevice_Network.h | 4 +-
src/utils/iodevices/OutputDevice_String.cpp | 4 +-
src/utils/iodevices/OutputDevice_String.h | 4 +-
src/utils/iodevices/OutputFormatter.h | 4 +-
src/utils/iodevices/PlainXMLFormatter.cpp | 4 +-
src/utils/iodevices/PlainXMLFormatter.h | 4 +-
src/utils/options/Makefile.in | 3 +-
src/utils/options/Option.cpp | 4 +-
src/utils/options/Option.h | 4 +-
src/utils/options/OptionsCont.cpp | 12 +-
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/Makefile.in | 3 +-
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/Makefile.in | 3 +-
src/utils/traci/TraCIAPI.cpp | 4 +-
src/utils/traci/TraCIAPI.h | 4 +-
src/utils/{common => vehicle}/AStarRouter.h | 117 +-
src/utils/vehicle/BulkStarRouter.h | 385 ++
src/utils/vehicle/CHRouter.h | 869 +++
src/utils/vehicle/CHRouterWrapper.h | 142 +
.../{common => vehicle}/DijkstraRouterEffort.h | 103 +-
src/utils/{common => vehicle}/DijkstraRouterTT.h | 90 +-
src/utils/vehicle/GawronCalculator.h | 125 +
src/utils/vehicle/LogitCalculator.h | 165 +
src/utils/vehicle/Makefile.am | 11 +
src/{foreign/tcpip => utils/vehicle}/Makefile.in | 47 +-
src/utils/{common => vehicle}/PedestrianRouter.h | 44 +-
src/utils/vehicle/RouteCostCalculator.h | 125 +
src/utils/vehicle/SPTree.h | 250 +
src/utils/{common => vehicle}/SUMOAbstractRouter.h | 31 +-
.../{common => vehicle}/SUMOVTypeParameter.cpp | 6 +-
src/utils/{common => vehicle}/SUMOVTypeParameter.h | 11 +-
src/utils/{common => vehicle}/SUMOVehicle.h | 17 +-
.../{common => vehicle}/SUMOVehicleParameter.cpp | 13 +-
.../{common => vehicle}/SUMOVehicleParameter.h | 15 +-
src/utils/xml/GenericSAXHandler.cpp | 4 +-
src/utils/xml/GenericSAXHandler.h | 4 +-
src/utils/xml/Makefile.in | 3 +-
src/utils/xml/SAXWeightsHandler.cpp | 4 +-
src/utils/xml/SAXWeightsHandler.h | 4 +-
src/utils/xml/SUMORouteHandler.cpp | 10 +-
src/utils/xml/SUMORouteHandler.h | 19 +-
src/utils/xml/SUMORouteLoader.cpp | 33 +-
src/utils/xml/SUMORouteLoader.h | 7 +-
src/utils/xml/SUMORouteLoaderControl.cpp | 17 +-
src/utils/xml/SUMORouteLoaderControl.h | 14 +-
src/utils/xml/SUMOSAXAttributes.cpp | 4 +-
src/utils/xml/SUMOSAXAttributes.h | 4 +-
src/utils/xml/SUMOSAXAttributesImpl_Binary.cpp | 4 +-
src/utils/xml/SUMOSAXAttributesImpl_Binary.h | 4 +-
src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp | 4 +-
src/utils/xml/SUMOSAXAttributesImpl_Xerces.h | 4 +-
src/utils/xml/SUMOSAXHandler.cpp | 4 +-
src/utils/xml/SUMOSAXHandler.h | 4 +-
src/utils/xml/SUMOSAXReader.cpp | 7 +-
src/utils/xml/SUMOSAXReader.h | 4 +-
src/utils/xml/SUMOVehicleParserHelper.cpp | 13 +-
src/utils/xml/SUMOVehicleParserHelper.h | 8 +-
src/utils/xml/SUMOXMLDefinitions.cpp | 7 +-
src/utils/xml/SUMOXMLDefinitions.h | 8 +-
src/utils/xml/XMLSubSys.cpp | 4 +-
src/utils/xml/XMLSubSys.h | 4 +-
src/windows_config.h | 9 +-
tools/assign/Assignment.py | 6 +-
tools/assign/assign.py | 4 +-
tools/assign/cadytsIterate.py | 11 +-
tools/assign/costFunctionChecker.py | 11 +-
tools/assign/costMemory.py | 4 +-
tools/assign/dijkstra.py | 4 +-
tools/assign/duaIterate.py | 75 +-
tools/assign/duaIterate_analysis.py | 7 +-
tools/assign/elements.py | 4 +-
tools/assign/inputs.py | 4 +-
tools/assign/matrixDailyToHourly.py | 4 +-
tools/assign/network.py | 6 +-
tools/assign/networkStatistics.py | 4 +-
tools/assign/one-shot.py | 19 +-
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/build/apply_astyle.py | 4 +-
tools/{docs => build}/buildHTMLDocs.py | 12 +-
tools/build/checkAuthors.py | 4 +-
tools/build/checkSvnProps.py | 6 +-
tools/{docs => build}/configTemplateToWiki.py | 4 +-
tools/build/dailyBuildMSVC.py | 8 +-
.../{dailyUpdateMakeGCC => dailyUpdateMakeGCC.sh} | 7 +-
tools/build/history.py | 49 +
tools/{docs => build}/mirrorWiki.py | 10 +-
tools/build/pythonPropsMSVC.py | 4 +-
tools/build/status.py | 4 +-
...vn-hook-post-commit => svn-hook-post-commit.sh} | 0
tools/build/version.py | 4 +-
tools/build/wix.py | 4 +-
.../+traci/+areal/getContextSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+areal/getIDCount.m | 0
.../{TraCI4Matlab => }/+traci/+areal/getIDList.m | 0
.../+traci/+areal/getJamLengthMeters.m | 0
.../+traci/+areal/getJamLengthVehicle.m | 0
.../+traci/+areal/getLastStepMeanSpeed.m | 0
.../+traci/+areal/getLastStepOccupancy.m | 0
.../+traci/+areal/getSubscriptionResults.m | 0
.../+traci/+areal/getUniversal.m | 0
.../{TraCI4Matlab => }/+traci/+areal/subscribe.m | 0
.../+traci/+areal/subscribeContext.m | 0
.../+traci/+edge/adaptTraveltime.m | 0
.../+traci/+edge/getAdaptedTraveltime.m | 0
.../+traci/+edge/getCO2Emission.m | 0
.../+traci/+edge/getCOEmission.m | 0
.../+traci/+edge/getContextSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+edge/getEffort.m | 0
.../+traci/+edge/getFuelConsumption.m | 0
.../+traci/+edge/getHCEmission.m | 0
.../{TraCI4Matlab => }/+traci/+edge/getIDCount.m | 0
.../{TraCI4Matlab => }/+traci/+edge/getIDList.m | 0
.../+traci/+edge/getLastStepHaltingNumber.m | 0
.../+traci/+edge/getLastStepLength.m | 0
.../+traci/+edge/getLastStepMeanSpeed.m | 0
.../+traci/+edge/getLastStepOccupancy.m | 0
.../+traci/+edge/getLastStepVehicleIDs.m | 0
.../+traci/+edge/getLastStepVehicleNumber.m | 0
.../+traci/+edge/getNOxEmission.m | 0
.../+traci/+edge/getNoiseEmission.m | 0
.../+traci/+edge/getPmxEmission.m | 0
.../+traci/+edge/getSubscriptionResults.m | 0
.../+traci/+edge/getTraveltime.m | 0
.../{TraCI4Matlab => }/+traci/+edge/getUniversal.m | 0
.../{TraCI4Matlab => }/+traci/+edge/setEffort.m | 0
.../{TraCI4Matlab => }/+traci/+edge/setMaxSpeed.m | 0
.../{TraCI4Matlab => }/+traci/+edge/subscribe.m | 0
.../+traci/+edge/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/+gui/getBoundary.m | 0
.../+traci/+gui/getContextSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+gui/getIDList.m | 0
.../{TraCI4Matlab => }/+traci/+gui/getOffset.m | 0
.../{TraCI4Matlab => }/+traci/+gui/getSchema.m | 0
.../+traci/+gui/getSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+gui/getUniversal.m | 0
.../{TraCI4Matlab => }/+traci/+gui/getZoom.m | 0
.../{TraCI4Matlab => }/+traci/+gui/screenshot.m | 0
.../{TraCI4Matlab => }/+traci/+gui/setBoundary.m | 0
.../{TraCI4Matlab => }/+traci/+gui/setOffset.m | 0
.../{TraCI4Matlab => }/+traci/+gui/setSchema.m | 0
.../{TraCI4Matlab => }/+traci/+gui/setZoom.m | 0
.../{TraCI4Matlab => }/+traci/+gui/subscribe.m | 0
.../+traci/+gui/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/+gui/trackVehicle.m | 0
.../+inductionloop/getContextSubscriptionResults.m | 0
.../+traci/+inductionloop/getIDList.m | 0
.../+traci/+inductionloop/getLaneID.m | 0
.../+traci/+inductionloop/getLastStepMeanLength.m | 0
.../+traci/+inductionloop/getLastStepMeanSpeed.m | 0
.../+traci/+inductionloop/getLastStepOccupancy.m | 0
.../+traci/+inductionloop/getLastStepVehicleIDs.m | 0
.../+inductionloop/getLastStepVehicleNumber.m | 0
.../+traci/+inductionloop/getPosition.m | 0
.../+traci/+inductionloop/getSubscriptionResults.m | 0
.../+traci/+inductionloop/getTimeSinceDetection.m | 0
.../+traci/+inductionloop/getUniversal.m | 0
.../+traci/+inductionloop/getVehicleData.m | 0
.../+traci/+inductionloop/readVehicleData.m | 0
.../+traci/+inductionloop/subscribe.m | 0
.../+traci/+inductionloop/subscribeContext.m | 0
.../+junction/getContextSubscriptionResults.m | 0
.../+traci/+junction/getIDList.m | 0
.../+traci/+junction/getPosition.m | 0
.../+traci/+junction/getSubscriptionResults.m | 0
.../+traci/+junction/getUniversal.m | 0
.../+traci/+junction/subscribe.m | 0
.../+traci/+junction/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getAllowed.m | 0
.../+traci/+lane/getCO2Emission.m | 0
.../+traci/+lane/getCOEmission.m | 0
.../+traci/+lane/getContextSubscriptionResults.m | 0
.../+traci/+lane/getDisallowed.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getEdgeID.m | 0
.../+traci/+lane/getFuelConsumption.m | 0
.../+traci/+lane/getHCEmission.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getIDList.m | 0
.../+traci/+lane/getLastStepHaltingNumber.m | 0
.../+traci/+lane/getLastStepLength.m | 0
.../+traci/+lane/getLastStepMeanSpeed.m | 0
.../+traci/+lane/getLastStepOccupancy.m | 0
.../+traci/+lane/getLastStepVehicleIDs.m | 0
.../+traci/+lane/getLastStepVehicleNumber.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getLength.m | 0
.../+traci/+lane/getLinkNumber.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getLinks.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getMaxSpeed.m | 0
.../+traci/+lane/getNOxEmission.m | 0
.../+traci/+lane/getNoiseEmission.m | 0
.../+traci/+lane/getPMxEmission.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getShape.m | 0
.../+traci/+lane/getSubscriptionResults.m | 0
.../+traci/+lane/getTraveltime.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getUniversal.m | 0
.../{TraCI4Matlab => }/+traci/+lane/getWidth.m | 0
.../{TraCI4Matlab => }/+traci/+lane/readLinks.m | 0
.../{TraCI4Matlab => }/+traci/+lane/setAllowed.m | 0
.../+traci/+lane/setDisallowed.m | 0
.../{TraCI4Matlab => }/+traci/+lane/setLength.m | 0
.../{TraCI4Matlab => }/+traci/+lane/setMaxSpeed.m | 0
.../{TraCI4Matlab => }/+traci/+lane/subscribe.m | 0
.../+traci/+lane/subscribeContext.m | 0
.../getContextSubscriptionResults.m | 0
.../+traci/+multientryexit/getIDList.m | 0
.../+multientryexit/getLastStepHaltingNumber.m | 0
.../+traci/+multientryexit/getLastStepMeanSpeed.m | 0
.../+traci/+multientryexit/getLastStepVehicleIDs.m | 0
.../+multientryexit/getLastStepVehicleNumber.m | 0
.../+multientryexit/getSubscriptionResults.m | 0
.../+traci/+multientryexit/getUniversal.m | 0
.../+traci/+multientryexit/subscribe.m | 0
.../+traci/+multientryexit/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/+poi/add.m | 0
.../{TraCI4Matlab => }/+traci/+poi/getColor.m | 0
.../+traci/+poi/getContextSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+poi/getIDList.m | 0
.../{TraCI4Matlab => }/+traci/+poi/getPosition.m | 0
.../+traci/+poi/getSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+poi/getType.m | 0
.../{TraCI4Matlab => }/+traci/+poi/getUniversal.m | 0
.../{TraCI4Matlab => }/+traci/+poi/remove.m | 0
.../{TraCI4Matlab => }/+traci/+poi/setColor.m | 0
.../{TraCI4Matlab => }/+traci/+poi/setPosition.m | 0
.../{TraCI4Matlab => }/+traci/+poi/setType.m | 0
.../{TraCI4Matlab => }/+traci/+poi/subscribe.m | 0
.../+traci/+poi/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/add.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/getColor.m | 0
.../+polygon/getContextSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/getIDList.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/getShape.m | 0
.../+traci/+polygon/getSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/getType.m | 0
.../+traci/+polygon/getUniversal.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/remove.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/setColor.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/setShape.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/setType.m | 0
.../{TraCI4Matlab => }/+traci/+polygon/subscribe.m | 0
.../+traci/+polygon/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/+route/add.m | 0
.../+traci/+route/getContextSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+route/getEdges.m | 0
.../{TraCI4Matlab => }/+traci/+route/getIDList.m | 0
.../+traci/+route/getSubscriptionResults.m | 0
.../+traci/+route/getUniversal.m | 0
.../{TraCI4Matlab => }/+traci/+route/subscribe.m | 0
.../+traci/+route/subscribeContext.m | 0
.../+traci/+simulation/convert2D.m | 0
.../+traci/+simulation/convertGeo.m | 0
.../+traci/+simulation/convertRoad.m | 0
.../+traci/+simulation/getArrivedIDList.m | 0
.../+traci/+simulation/getArrivedNumber.m | 0
.../+traci/+simulation/getCurrentTime.m | 0
.../+traci/+simulation/getDeltaT.m | 0
.../+traci/+simulation/getDepartedIDList.m | 0
.../+traci/+simulation/getDepartedNumber.m | 0
.../+traci/+simulation/getDistance2D.m | 0
.../+traci/+simulation/getDistanceRoad.m | 0
.../+traci/+simulation/getEndingTeleportIDList.m | 0
.../+traci/+simulation/getEndingTeleportNumber.m | 0
.../+traci/+simulation/getLoadedIDList.m | 0
.../+traci/+simulation/getLoadedNumber.m | 0
.../+traci/+simulation/getMinExpectedNumber.m | 0
.../+traci/+simulation/getNetBoundary.m | 0
.../+traci/+simulation/getStartingTeleportIDList.m | 0
.../+traci/+simulation/getStartingTeleportNumber.m | 0
.../+traci/+simulation/getSubscriptionResults.m | 0
.../+traci/+simulation/getUniversal.m | 0
.../+traci/+simulation/subscribe.m | 0
.../+traci/+trafficlights/Logic.m | 0
.../+traci/+trafficlights/Phase.m | 0
.../getCompleteRedYellowGreenDefinition.m | 0
.../+trafficlights/getContextSubscriptionResults.m | 0
.../+traci/+trafficlights/getControlledLanes.m | 0
.../+traci/+trafficlights/getControlledLinks.m | 0
.../+traci/+trafficlights/getIDList.m | 0
.../+traci/+trafficlights/getNextSwitch.m | 0
.../+traci/+trafficlights/getPhase.m | 0
.../+traci/+trafficlights/getProgram.m | 0
.../+traci/+trafficlights/getRedYellowGreenState.m | 0
.../+traci/+trafficlights/getSubscriptionResults.m | 0
.../+traci/+trafficlights/getUniversal.m | 0
.../+traci/+trafficlights/readLinks.m | 0
.../+traci/+trafficlights/readLogics.m | 0
.../setCompleteRedYellowGreenDefinition.m | 0
.../+traci/+trafficlights/setPhase.m | 0
.../+traci/+trafficlights/setPhaseDuration.m | 0
.../+traci/+trafficlights/setProgram.m | 0
.../+traci/+trafficlights/setRedYellowGreenState.m | 0
.../+traci/+trafficlights/subscribe.m | 0
.../+traci/+trafficlights/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/add.m | 0
.../+traci/+vehicle/changeLane.m | 0
.../+traci/+vehicle/changeTarget.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getAccel.m | 0
.../+traci/+vehicle/getAdaptedTraveltime.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getAngle.m | 0
.../+traci/+vehicle/getBestLanes.m | 0
.../+traci/+vehicle/getCO2Emission.m | 0
.../+traci/+vehicle/getCOEmission.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getColor.m | 0
.../+vehicle/getContextSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getDecel.m | 0
.../+traci/+vehicle/getDrivingDistance.m | 0
.../+traci/+vehicle/getDrivingDistance2D.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getEffort.m | 0
.../+traci/+vehicle/getEmissionClass.m | 0
.../+traci/+vehicle/getFuelConsumption.m | 0
.../+traci/+vehicle/getHCEmission.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getIDList.m | 0
.../+traci/+vehicle/getImperfection.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getLaneID.m | 0
.../+traci/+vehicle/getLaneIndex.m | 0
.../+traci/+vehicle/getLanePosition.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getLength.m | 0
.../+traci/+vehicle/getMaxSpeed.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getMinGap.m | 0
.../+traci/+vehicle/getNOxEmission.m | 0
.../+traci/+vehicle/getNoiseEmission.m | 0
.../+traci/+vehicle/getPMxEmission.m | 0
.../+traci/+vehicle/getPosition.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getRoadID.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getRoute.m | 0
.../+traci/+vehicle/getRouteID.m | 0
.../+traci/+vehicle/getShapeClass.m | 0
.../+traci/+vehicle/getSignals.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getSpeed.m | 0
.../+traci/+vehicle/getSpeedDeviation.m | 0
.../+traci/+vehicle/getSpeedFactor.m | 0
.../+traci/+vehicle/getSpeedWithoutTraCI.m | 0
.../+traci/+vehicle/getSubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getTau.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getTypeID.m | 0
.../+traci/+vehicle/getUniversal.m | 0
.../+traci/+vehicle/getVehicleClass.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/getWidth.m | 0
.../+traci/+vehicle/isRouteValid.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/moveTo.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/moveToVTD.m | 0
.../+traci/+vehicle/readBestLanes.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/remove.m | 0
.../+traci/+vehicle/rerouteEffort.m | 0
.../+traci/+vehicle/rerouteTraveltime.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setAccel.m | 0
.../+traci/+vehicle/setAdaptedTraveltime.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setColor.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setDecel.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setEffort.m | 0
.../+traci/+vehicle/setEmissionClass.m | 0
.../+traci/+vehicle/setImperfection.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setLength.m | 0
.../+traci/+vehicle/setMaxSpeed.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setMinGap.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setRoute.m | 0
.../+traci/+vehicle/setRouteID.m | 0
.../+traci/+vehicle/setShapeClass.m | 0
.../+traci/+vehicle/setSignals.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setSpeed.m | 0
.../+traci/+vehicle/setSpeedDeviation.m | 0
.../+traci/+vehicle/setSpeedFactor.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setStop.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setTau.m | 0
.../+traci/+vehicle/setVehicleClass.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/setWidth.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/slowDown.m | 0
.../{TraCI4Matlab => }/+traci/+vehicle/subscribe.m | 0
.../+traci/+vehicle/subscribeContext.m | 0
.../+traci/+vehicletype/getAccel.m | 0
.../+traci/+vehicletype/getColor.m | 0
.../+vehicletype/getContextSubscriptionResults.m | 0
.../+traci/+vehicletype/getDecel.m | 0
.../+traci/+vehicletype/getEmissionClass.m | 0
.../+traci/+vehicletype/getIDList.m | 0
.../+traci/+vehicletype/getImperfection.m | 0
.../+traci/+vehicletype/getLength.m | 0
.../+traci/+vehicletype/getMaxSpeed.m | 0
.../+traci/+vehicletype/getMinGap.m | 0
.../+traci/+vehicletype/getShapeClass.m | 0
.../+traci/+vehicletype/getSpeedDeviation.m | 0
.../+traci/+vehicletype/getSpeedFactor.m | 0
.../+traci/+vehicletype/getSubscriptionResults.m | 0
.../+traci/+vehicletype/getTau.m | 0
.../+traci/+vehicletype/getUniversal.m | 0
.../+traci/+vehicletype/getVehicleClass.m | 0
.../+traci/+vehicletype/getWidth.m | 0
.../+traci/+vehicletype/setAccel.m | 0
.../+traci/+vehicletype/setColor.m | 0
.../+traci/+vehicletype/setDecel.m | 0
.../+traci/+vehicletype/setEmissionClass.m | 0
.../+traci/+vehicletype/setImperfection.m | 0
.../+traci/+vehicletype/setLength.m | 0
.../+traci/+vehicletype/setMaxSpeed.m | 0
.../+traci/+vehicletype/setMinGap.m | 0
.../+traci/+vehicletype/setShapeClass.m | 0
.../+traci/+vehicletype/setSpeedDeviation.m | 0
.../+traci/+vehicletype/setSpeedFactor.m | 0
.../+traci/+vehicletype/setTau.m | 0
.../+traci/+vehicletype/setVehicleClass.m | 0
.../+traci/+vehicletype/setWidth.m | 0
.../+traci/+vehicletype/subscribe.m | 0
.../+traci/+vehicletype/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/Message.m | 0
.../{TraCI4Matlab => }/+traci/RETURN_VALUE_FUNC.m | 0
.../{TraCI4Matlab => }/+traci/Socket.m | 0
.../{TraCI4Matlab => }/+traci/Storage.m | 0
.../+traci/SubscriptionResults.m | 0
.../{TraCI4Matlab => }/+traci/beginMessage.m | 0
.../{TraCI4Matlab => }/+traci/checkResult.m | 0
.../TraCI4Matlab/{TraCI4Matlab => }/+traci/close.m | 0
.../{TraCI4Matlab => }/+traci/constants.m | 0
.../{TraCI4Matlab => }/+traci/getVersion.m | 0
.../TraCI4Matlab/{TraCI4Matlab => }/+traci/init.m | 0
.../{TraCI4Matlab => }/+traci/packInt32.m | 0
.../{TraCI4Matlab => }/+traci/packInt64.m | 0
.../{TraCI4Matlab => }/+traci/readSubscription.m | 0
.../{TraCI4Matlab => }/+traci/recvExact.m | 0
.../{TraCI4Matlab => }/+traci/sendByteCmd.m | 0
.../{TraCI4Matlab => }/+traci/sendDoubleCmd.m | 0
.../{TraCI4Matlab => }/+traci/sendExact.m | 0
.../{TraCI4Matlab => }/+traci/sendIntCmd.m | 0
.../+traci/sendReadOneStringCmd.m | 0
.../{TraCI4Matlab => }/+traci/sendStringCmd.m | 0
.../{TraCI4Matlab => }/+traci/simulationStep.m | 0
.../{TraCI4Matlab => }/+traci/subscribe.m | 0
.../{TraCI4Matlab => }/+traci/subscribeContext.m | 0
.../{TraCI4Matlab => }/+traci/switchConnection.m | 0
.../{TraCI4Matlab => }/+traci/time2steps.m | 0
.../{TraCI4Matlab => }/examples/traci_test.m | 0
.../{TraCI4Matlab => }/examples/traci_test2.m | 0
.../TraCI4Matlab/{TraCI4Matlab => }/license.txt | 0
.../sumoplayer/convert_sumoplayer_op_2_lonlat.py | 4 +-
tools/contributed/traas/build.xml | 2 +-
.../traas/src/de/tudresden/sumo/cmd/Poi.java | 2 +-
.../traas/src/de/tudresden/sumo/cmd/Polygon.java | 8 +-
.../traas/src/de/tudresden/sumo/cmd/Vehicle.java | 16 +-
.../src/de/tudresden/sumo/util/SumoCommand.java | 10 +
.../traas/src/de/tudresden/ws/Traci.java | 4 +-
.../tudresden/ws/container/SumoVehicleSignal.java | 48 +
.../ws/container/SumoVehicleSignalState.java | 33 +
tools/detector/aggregateFlows.py | 4 +-
tools/detector/deleteUnusedDetectors.py | 6 +-
tools/detector/detector.py | 4 +-
tools/detector/flowFromRoutes.py | 4 +-
tools/detector/flowrouter.py | 4 +-
tools/detector/validate.py | 4 +-
tools/district/countConnectionsInDistricts.py | 4 +-
tools/district/districtMapper.py | 4 +-
tools/district/edgesInDistricts.py | 4 +-
tools/game/patchTrafficLights.py | 4 +-
tools/game/runner.py | 35 +-
tools/game/setup.py | 4 +-
tools/import/osm/index.html | 23 +
tools/import/osm/lib.js | 44 +
tools/import/osm/osmBuild.py | 29 +-
tools/import/osm/osmGet.py | 4 +-
tools/import/osm/osmPopulationExtractor.py | 4 +-
tools/import/osm/script.js | 218 +
tools/import/osm/server.py | 242 +
tools/import/osm/style.css | 67 +
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/rmsd.py | 4 +-
tools/lib/testUtil.py | 4 +-
tools/net/0103to0110.py | 4 +-
tools/net/0123to0130.py | 6 +-
tools/net/OrderedMultiSet.py | 4 +-
tools/net/batch0103to0110.py | 4 +-
tools/net/createRoundaboutConnections.py | 4 +-
tools/net/netcheck.py | 4 +-
tools/net/netdiff.py | 14 +-
tools/net/netduplicate.py | 4 +-
tools/net/netextract.py | 4 +-
tools/net/netextract_subPart.py | 4 +-
tools/net/netmatch.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/accelerations.py | 4 +-
tools/output/analyze_teleports.py | 32 +-
tools/output/generateITetrisIntersectionMetrics.py | 4 +-
tools/output/generateITetrisNetworkMetrics.py | 4 +-
tools/output/generateMeanDataDefinitions.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 | 6 +-
tools/output/vehLanes.py | 10 +-
tools/output/vehroute2amitranOD.py | 4 +-
tools/output/vehrouteDiff.py | 4 +-
.../projects/TLS-Evaluationsszenarien/changeNet.py | 4 +-
.../projects/TLS-Evaluationsszenarien/evaluator.py | 4 +-
.../projects/TLS-Evaluationsszenarien/genRoutes.py | 4 +-
tools/projects/TLS-Evaluationsszenarien/main.py | 4 +-
tools/projects/TLS-Evaluationsszenarien/plotter.py | 4 +-
tools/projects/TLS-Evaluationsszenarien/test.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/CompareVelocitys.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/FetchData.py | 4 +-
tools/projects/TaxiFCD_Krieg/src/analysis/Taxi.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/Traveltime.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/TraveltimeMulti.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/Traveltime_DK.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/VelocityCurve.py | 4 +-
.../src/analysis/VelocityOverRoute.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/VelocityOverTime.py | 4 +-
.../TaxiFCD_Krieg/src/analysis/__init__.py | 4 +-
.../projects/TaxiFCD_Krieg/src/backup/__init__.py | 4 +-
.../TaxiFCD_Krieg/src/fcdQuality/ParamEffects.py | 4 +-
.../src/fcdQuality/ParamEffectsOLD.py | 4 +-
.../src/fcdQuality/ParamEffectsProcessedFCD.py | 4 +-
.../TaxiFCD_Krieg/src/fcdQuality/__init__.py | 4 +-
.../TaxiFCD_Krieg/src/fcdQuality/readPlot.py | 4 +-
.../TaxiFCD_Krieg/src/fcdQuality/readPlotOLD.py | 4 +-
.../src/fcdToRoutes/FCDvsCompleteRoute.py | 4 +-
.../src/fcdToRoutes/GenerateTaxiRoutes.py | 4 +-
.../src/fcdToRoutes/GenerateTaxiRoutesMain.py | 4 +-
.../src/fcdToRoutes/My_mpl_dump_onNet.py | 4 +-
.../TaxiFCD_Krieg/src/fcdToRoutes/__init__.py | 4 +-
.../src/fcdToRoutes/differentDepartRoutes.py | 4 +-
.../TaxiFCD_Krieg/src/rawFCD/GenerateRawFCD.py | 4 +-
.../src/taxiQuantity/QuantityOverDay.py | 4 +-
.../src/taxiQuantity/SeparateVLSArea.py | 4 +-
.../TaxiFCD_Krieg/src/taxiQuantity/TaxisPerEdge.py | 4 +-
.../TaxiFCD_Krieg/src/util/BinarySearch.py | 4 +-
tools/projects/TaxiFCD_Krieg/src/util/CalcTime.py | 4 +-
tools/projects/TaxiFCD_Krieg/src/util/Path.py | 4 +-
.../projects/TaxiFCD_Krieg/src/util/ProgressBar.py | 4 +-
tools/projects/TaxiFCD_Krieg/src/util/Reader.py | 4 +-
tools/projects/TaxiFCD_Krieg/src/util/__init__.py | 4 +-
tools/{ => purgatory}/10to11.py | 4 +-
tools/{route => purgatory}/findUTurns.py | 15 +-
tools/{ => purgatory}/generate-ns2.py | 4 +-
tools/{route => purgatory}/kShortest.py | 4 +-
tools/{ => purgatory}/removeSVN.py | 4 +-
tools/{route => purgatory}/routes2OD.py | 4 +-
tools/{build => purgatory}/ubuntuBuild.sh | 0
tools/{ => purgatory}/xml2cvs.pl | 0
tools/route/cutRoutes.py | 6 +-
...extract_route_edges.py => extractRouteEdges.py} | 14 +-
tools/route/route2alts.py | 4 +-
tools/route/route2poly.py | 4 +-
tools/route/route_1htoDay.py | 4 +-
tools/route/route_departOffset.py | 4 +-
tools/route/routecheck.py | 4 +-
tools/route/routecompare.py | 4 +-
tools/route/routes_Join.py | 4 +-
tools/route/sort_routes.py | 4 +-
tools/route/tracegenerator.py | 4 +-
tools/route/tracemapper.py | 4 +-
tools/route/vehicle2flow.py | 4 +-
tools/shapes/CSV2polyconvertXML.py | 4 +-
tools/shapes/circlePolygon.py | 6 +-
tools/shapes/poi_alongRoads.py | 2 +-
tools/shapes/poi_atTLS.py | 4 +-
tools/shapes/pois2inductionLoops.py | 4 +-
tools/sumolib/__init__.py | 30 +-
tools/sumolib/color.py | 4 +-
tools/sumolib/files/__init__.py | 4 +-
tools/sumolib/files/additional.py | 6 +-
tools/sumolib/files/selection.py | 4 +-
tools/sumolib/geomhelper.py | 23 +-
tools/sumolib/miscutils.py | 33 +-
tools/sumolib/net/__init__.py | 45 +-
tools/sumolib/net/connection.py | 4 +-
tools/sumolib/net/edge.py | 7 +-
tools/sumolib/net/lane.py | 30 +-
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/gpx.py | 4 +-
tools/sumolib/output/convert/ns2.py | 4 +-
tools/sumolib/output/convert/omnet.py | 4 +-
tools/sumolib/output/convert/phem.py | 4 +-
tools/sumolib/output/convert/poi.py | 4 +-
tools/sumolib/output/convert/shawn.py | 4 +-
tools/sumolib/output/dump.py | 4 +-
tools/sumolib/output/inductionloop.py | 4 +-
tools/sumolib/route.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 | 4 +-
tools/sumolib/shapes/polygon.py | 4 +-
tools/tls/tls_check.py | 4 +-
tools/tls/tls_csv2SUMO.py | 4 +-
tools/{bin => }/traceExporter.py | 4 +-
tools/traci/__init__.py | 10 +-
tools/traci/areal.py | 15 +-
tools/traci/constants.py | 16 +-
tools/traci/edge.py | 4 +-
tools/traci/gui.py | 4 +-
tools/traci/inductionloop.py | 6 +-
tools/traci/junction.py | 4 +-
tools/traci/lane.py | 25 +-
tools/traci/multientryexit.py | 4 +-
tools/traci/poi.py | 4 +-
tools/traci/polygon.py | 4 +-
tools/traci/rebuildConstants.py | 8 +-
tools/traci/route.py | 4 +-
tools/traci/simulation.py | 4 +-
tools/traci/traciToHex.py | 4 +-
tools/traci/trafficlights.py | 4 +-
tools/traci/vehicle.py | 26 +-
tools/traci/vehicletype.py | 4 +-
tools/trigger/csv2vss.py | 4 +-
tools/trip/generateTripsXml.py | 6 +-
tools/trip/randomTrips.py | 94 +-
tools/trip/route2trips.py | 43 +-
tools/turn-defs/collectinghandler.py | 4 +-
tools/turn-defs/connections.py | 9 +-
tools/turn-defs/generateTurnDefs.py | 4 +-
tools/turn-defs/turndefinitions.py | 9 +-
tools/visualization/helpers.py | 74 +-
tools/visualization/mpl_dump_onNet.py | 4 +-
tools/visualization/mpl_dump_timeline.py | 4 +-
tools/visualization/mpl_dump_twoAgainst.py | 4 +-
tools/visualization/mpl_tripinfos_twoAgainst.py | 4 +-
tools/visualization/plot_csv_bars.py | 7 +-
tools/visualization/plot_csv_pie.py | 5 +-
tools/visualization/plot_csv_timeline.py | 5 +-
tools/visualization/plot_net_dump.py | 5 +-
tools/visualization/plot_net_selection.py | 5 +-
tools/visualization/plot_net_speeds.py | 5 +-
tools/visualization/plot_net_trafficLights.py | 5 +-
tools/visualization/plot_summary.py | 5 +-
tools/visualization/plot_tripinfo_distributions.py | 5 +-
tools/xml/addSchema.py | 14 +-
tools/xml/binary2plain.py | 4 +-
tools/xml/csv2xml.py | 18 +-
tools/xml/protobuf2xml.py | 4 +-
tools/xml/rebuildSchemata.py | 10 +-
tools/xml/schemaCheck.py | 6 +-
tools/xml/xml2csv.py | 12 +-
tools/xml/xml2protobuf.py | 4 +-
tools/xml/xsd.py | 19 +-
tools_filelist | 722 +--
unittest/Makefile.in | 3 +-
unittest/src/Makefile.am | 21 +-
unittest/src/Makefile.in | 29 +-
unittest/src/microsim/MSCFModelTest.cpp | 76 +-
unittest/src/microsim/MSEventControlTest.cpp | 4 +-
unittest/src/microsim/Makefile.in | 3 +-
unittest/src/netbuild/Makefile.am | 2 +-
unittest/src/netbuild/Makefile.in | 9 +-
unittest/src/netbuild/NBHeightMapperTest.cpp | 65 +
unittest/src/netbuild/NBTrafficLightLogicTest.cpp | 4 +-
unittest/src/unittest_main.cpp | 4 +-
unittest/src/utils/Makefile.am | 6 +-
unittest/src/utils/Makefile.in | 8 +-
unittest/src/utils/common/CommandMock.h | 4 +-
unittest/src/utils/common/Makefile.in | 3 +-
unittest/src/utils/common/RGBColorTest.cpp | 4 +-
unittest/src/utils/common/StringTokenizerTest.cpp | 4 +-
unittest/src/utils/common/StringUtilsTest.cpp | 30 +-
unittest/src/utils/common/TplConvertTest.cpp | 4 +-
unittest/src/utils/common/ValueTimeLineTest.cpp | 4 +-
unittest/src/utils/foxtools/FXWorkerThreadTest.cpp | 75 +
unittest/src/utils/foxtools/Makefile.am | 3 +
.../src/{netbuild => utils/foxtools}/Makefile.in | 35 +-
unittest/src/utils/geom/BoundaryTest.cpp | 4 +-
unittest/src/utils/geom/GeoConvHelperTest.cpp | 4 +-
unittest/src/utils/geom/GeomHelperTest.cpp | 4 +-
unittest/src/utils/geom/LineTest.cpp | 4 +-
unittest/src/utils/geom/Makefile.in | 3 +-
unittest/src/utils/geom/PositionVectorTest.cpp | 4 +-
unittest/src/utils/iodevices/Makefile.am | 1 +
unittest/src/utils/iodevices/Makefile.in | 4 +-
.../src/utils/iodevices/OutputDeviceMock.h | 55 +-
1977 files changed, 16145 insertions(+), 15032 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