[sumo] 02/05: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jun 20 22:24:12 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository sumo.
commit 8914c91e7003f796cda78f789bbd053bb7742a18
Merge: b7467ca d7097c6
Author: Anton Gladky <gladk at debian.org>
Date: Fri Jun 20 22:47:39 2014 +0200
Merge.
AUTHORS | 8 +
INSTALL | 15 +-
Makefile.am | 16 +-
Makefile.in | 18 +-
build/msvc10/Fastbuild.props | 18 -
build/msvc10/Release.props | 33 -
build/msvc10/Win32.props | 48 -
build/msvc10/activitygen/activitygen.vcxproj | 235 -
.../msvc10/activitygen/activitygen.vcxproj.filters | 164 -
build/msvc10/defaults.props | 25 -
build/msvc10/dfrouter/dfrouter.vcxproj | 208 -
build/msvc10/dfrouter/dfrouter.vcxproj.filters | 77 -
build/msvc10/duarouter/duarouter.vcxproj | 191 -
build/msvc10/duarouter/duarouter.vcxproj.filters | 32 -
build/msvc10/exe.props | 56 -
build/msvc10/guisim/guisim.vcxproj | 345 -
build/msvc10/guisim/guisim.vcxproj.filters | 27 -
build/msvc10/internal.props | 11 -
build/msvc10/internal.sln | 1721 ----
build/msvc10/jtrrouter/jtrrouter.vcxproj | 196 -
build/msvc10/jtrrouter/jtrrouter.vcxproj.filters | 50 -
build/msvc10/marouter/marouter.vcxproj | 157 -
build/msvc10/marouter/marouter.vcxproj.filters | 71 -
build/msvc10/netconvert/netconvert.vcxproj | 264 -
build/msvc10/netconvert/netconvert.vcxproj.filters | 18 -
build/msvc10/netedit/netedit.vcxproj | 253 -
build/msvc10/netedit/netedit.vcxproj.filters | 188 -
build/msvc10/netgenerate/netgenerate.vcxproj | 195 -
.../msvc10/netgenerate/netgenerate.vcxproj.filters | 50 -
build/msvc10/od2trips/od2trips.vcxproj | 197 -
build/msvc10/od2trips/od2trips.vcxproj.filters | 47 -
build/msvc10/polyconvert/polyconvert.vcxproj | 257 -
.../msvc10/polyconvert/polyconvert.vcxproj.filters | 74 -
build/msvc10/prj.sln | 1183 ---
build/msvc10/sumo/sumo.vcxproj | 282 -
build/msvc10/sumo/sumo.vcxproj.filters | 23 -
build/msvc10/tools.sln | 354 -
.../traci-testclient/Traci_TestClient.vcxproj | 180 -
.../Traci_TestClient.vcxproj.filters | 36 -
build/msvc10/x64.props | 51 -
build/msvc10/y_libgui/y_libgui.vcxproj | 193 -
build/msvc10/y_libgui/y_libgui.vcxproj.filters | 77 -
.../msvc10/y_libguinetload/y_libguinetload.vcxproj | 289 -
.../y_libguinetload.vcxproj.filters | 35 -
build/msvc10/y_libguisim/y_libguisim.vcxproj | 310 -
.../msvc10/y_libguisim/y_libguisim.vcxproj.filters | 143 -
build/msvc10/y_libinternal/y_libinternal.vcxproj | 106 -
.../y_libinternal/y_libinternal.vcxproj.filters | 38 -
build/msvc10/y_libmesogui/y_libmesogui.vcxproj | 103 -
.../y_libmesogui/y_libmesogui.vcxproj.filters | 29 -
build/msvc10/y_libmesosim/y_libmesosim.vcxproj | 111 -
.../y_libmesosim/y_libmesosim.vcxproj.filters | 53 -
build/msvc10/y_libmicrosim/y_libmicrosim.vcxproj | 244 -
.../y_libmicrosim/y_libmicrosim.vcxproj.filters | 229 -
build/msvc10/y_libnetbuild/y_libnetbuild.vcxproj | 198 -
.../y_libnetbuild/y_libnetbuild.vcxproj.filters | 179 -
build/msvc10/y_libnetimport/y_libnetimport.vcxproj | 262 -
.../y_libnetimport/y_libnetimport.vcxproj.filters | 125 -
build/msvc10/y_libnetload/y_libnetload.vcxproj | 240 -
.../y_libnetload/y_libnetload.vcxproj.filters | 59 -
build/msvc10/y_libnetwrite/y_libnetwrite.vcxproj | 156 -
.../y_libnetwrite/y_libnetwrite.vcxproj.filters | 53 -
build/msvc10/y_librouter/y_librouter.vcxproj | 268 -
.../msvc10/y_librouter/y_librouter.vcxproj.filters | 104 -
build/msvc10/y_osgview/y_osgview.vcxproj | 107 -
build/msvc10/y_osgview/y_osgview.vcxproj.filters | 32 -
.../z_libgui_dialogs/z_libgui_dialogs.vcxproj | 183 -
.../z_libgui_dialogs.vcxproj.filters | 35 -
.../z_libmicrosim_actions.vcxproj | 131 -
.../z_libmicrosim_actions.vcxproj.filters | 47 -
.../z_libmicrosim_cfmodels.vcxproj | 250 -
.../z_libmicrosim_cfmodels.vcxproj.filters | 77 -
.../z_libmicrosim_devices.vcxproj | 248 -
.../z_libmicrosim_devices.vcxproj.filters | 71 -
.../z_libmicrosim_logging.vcxproj | 123 -
.../z_libmicrosim_logging.vcxproj.filters | 23 -
.../z_libmicrosim_output.vcxproj | 268 -
.../z_libmicrosim_output.vcxproj.filters | 131 -
.../z_libmicrosim_traffic_lights.vcxproj | 161 -
.../z_libmicrosim_traffic_lights.vcxproj.filters | 56 -
.../z_libmicrosim_trigger.vcxproj | 195 -
.../z_libmicrosim_trigger.vcxproj.filters | 53 -
.../z_libnetimport_vissim.vcxproj | 309 -
.../z_libnetimport_vissim.vcxproj.filters | 500 -
.../z_libutils_common/z_libutils_common.vcxproj | 200 -
.../z_libutils_common.vcxproj.filters | 176 -
.../z_libutils_distribution.vcxproj | 155 -
.../z_libutils_distribution.vcxproj.filters | 38 -
.../z_libutils_emissions.vcxproj | 160 -
.../z_libutils_emissions.vcxproj.filters | 56 -
.../z_libutils_foxtools.vcxproj | 199 -
.../z_libutils_foxtools.vcxproj.filters | 116 -
.../msvc10/z_libutils_geom/z_libutils_geom.vcxproj | 200 -
.../z_libutils_geom.vcxproj.filters | 101 -
.../z_libutils_gui_div/z_libutils_gui_div.vcxproj | 141 -
.../z_libutils_gui_div.vcxproj.filters | 77 -
.../z_libutils_gui_events.vcxproj | 122 -
.../z_libutils_gui_events.vcxproj.filters | 24 -
.../z_libutils_gui_globjects.vcxproj | 135 -
.../z_libutils_gui_globjects.vcxproj.filters | 59 -
.../z_libutils_gui_images.vcxproj | 126 -
.../z_libutils_gui_images.vcxproj.filters | 32 -
.../z_libutils_gui_settings.vcxproj | 187 -
.../z_libutils_gui_settings.vcxproj.filters | 41 -
.../z_libutils_gui_tracker.vcxproj | 125 -
.../z_libutils_gui_tracker.vcxproj.filters | 29 -
.../z_libutils_gui_windows.vcxproj | 203 -
.../z_libutils_gui_windows.vcxproj.filters | 68 -
.../z_libutils_importio.vcxproj | 159 -
.../z_libutils_importio.vcxproj.filters | 32 -
.../z_libutils_iodevices.vcxproj | 164 -
.../z_libutils_iodevices.vcxproj.filters | 74 -
.../z_libutils_options/z_libutils_options.vcxproj | 166 -
.../z_libutils_options.vcxproj.filters | 47 -
build/msvc10/z_libutils_xml/z_libutils_xml.vcxproj | 180 -
.../z_libutils_xml/z_libutils_xml.vcxproj.filters | 95 -
.../z_optional_libtraciserver.vcxproj | 223 -
.../z_optional_libtraciserver.vcxproj.filters | 108 -
.../zz_foreign_eulerspiral.vcxproj | 155 -
.../zz_foreign_eulerspiral.vcxproj.filters | 35 -
.../zz_foreign_gl2ps/zz_foreign_gl2ps.vcxproj | 123 -
.../zz_foreign_gl2ps.vcxproj.filters | 27 -
.../msvc10/zz_foreign_nvwa/zz_foreign_nvwa.vcxproj | 125 -
.../zz_foreign_nvwa.vcxproj.filters | 33 -
.../zz_foreign_polyfonts.vcxproj | 126 -
.../zz_foreign_polyfonts.vcxproj.filters | 36 -
.../zz_foreign_rtree/zz_foreign_rtree.vcxproj | 149 -
.../zz_foreign_rtree.vcxproj.filters | 21 -
.../zz_foreign_tcpip/zz_foreign_tcpip.vcxproj | 159 -
.../zz_foreign_tcpip.vcxproj.filters | 29 -
.../emissionsDrivingCycle.vcxproj | 240 -
.../emissionsDrivingCycle.vcxproj.filters | 18 -
.../zzz_tools_emissionsMap/emissionsMap.vcxproj | 240 -
.../emissionsMap.vcxproj.filters | 18 -
build/msvc11/Fastbuild.props | 18 -
build/msvc11/Release.props | 33 -
build/msvc11/Win32.props | 48 -
build/msvc11/activitygen/activitygen.vcxproj | 271 -
.../msvc11/activitygen/activitygen.vcxproj.filters | 164 -
build/msvc11/defaults.props | 25 -
build/msvc11/dfrouter/dfrouter.vcxproj | 244 -
build/msvc11/dfrouter/dfrouter.vcxproj.filters | 77 -
build/msvc11/duarouter/duarouter.vcxproj | 227 -
build/msvc11/duarouter/duarouter.vcxproj.filters | 32 -
build/msvc11/exe.props | 56 -
build/msvc11/guisim/guisim.vcxproj | 381 -
build/msvc11/guisim/guisim.vcxproj.filters | 27 -
build/msvc11/internal.props | 11 -
build/msvc11/internal.sln | 1721 ----
build/msvc11/jtrrouter/jtrrouter.vcxproj | 232 -
build/msvc11/jtrrouter/jtrrouter.vcxproj.filters | 50 -
build/msvc11/marouter/marouter.vcxproj | 175 -
build/msvc11/marouter/marouter.vcxproj.filters | 71 -
build/msvc11/netconvert/netconvert.vcxproj | 300 -
build/msvc11/netconvert/netconvert.vcxproj.filters | 18 -
build/msvc11/netedit/netedit.vcxproj | 271 -
build/msvc11/netedit/netedit.vcxproj.filters | 188 -
build/msvc11/netgenerate/netgenerate.vcxproj | 231 -
.../msvc11/netgenerate/netgenerate.vcxproj.filters | 50 -
build/msvc11/od2trips/od2trips.vcxproj | 233 -
build/msvc11/od2trips/od2trips.vcxproj.filters | 47 -
build/msvc11/polyconvert/polyconvert.vcxproj | 293 -
.../msvc11/polyconvert/polyconvert.vcxproj.filters | 74 -
build/msvc11/prj.sln | 1183 ---
build/msvc11/sumo/sumo.vcxproj | 318 -
build/msvc11/sumo/sumo.vcxproj.filters | 23 -
build/msvc11/tools.sln | 354 -
.../traci-testclient/Traci_TestClient.vcxproj | 216 -
.../Traci_TestClient.vcxproj.filters | 36 -
build/msvc11/x64.props | 51 -
build/msvc11/y_libgui/y_libgui.vcxproj | 203 -
build/msvc11/y_libgui/y_libgui.vcxproj.filters | 77 -
.../msvc11/y_libguinetload/y_libguinetload.vcxproj | 299 -
.../y_libguinetload.vcxproj.filters | 35 -
build/msvc11/y_libguisim/y_libguisim.vcxproj | 320 -
.../msvc11/y_libguisim/y_libguisim.vcxproj.filters | 143 -
build/msvc11/y_libinternal/y_libinternal.vcxproj | 112 -
.../y_libinternal/y_libinternal.vcxproj.filters | 38 -
build/msvc11/y_libmesogui/y_libmesogui.vcxproj | 109 -
.../y_libmesogui/y_libmesogui.vcxproj.filters | 29 -
build/msvc11/y_libmesosim/y_libmesosim.vcxproj | 117 -
.../y_libmesosim/y_libmesosim.vcxproj.filters | 53 -
build/msvc11/y_libmicrosim/y_libmicrosim.vcxproj | 254 -
.../y_libmicrosim/y_libmicrosim.vcxproj.filters | 229 -
build/msvc11/y_libnetbuild/y_libnetbuild.vcxproj | 204 -
.../y_libnetbuild/y_libnetbuild.vcxproj.filters | 179 -
build/msvc11/y_libnetimport/y_libnetimport.vcxproj | 272 -
.../y_libnetimport/y_libnetimport.vcxproj.filters | 125 -
build/msvc11/y_libnetload/y_libnetload.vcxproj | 250 -
.../y_libnetload/y_libnetload.vcxproj.filters | 59 -
build/msvc11/y_libnetwrite/y_libnetwrite.vcxproj | 162 -
.../y_libnetwrite/y_libnetwrite.vcxproj.filters | 53 -
build/msvc11/y_librouter/y_librouter.vcxproj | 278 -
.../msvc11/y_librouter/y_librouter.vcxproj.filters | 104 -
build/msvc11/y_osgview/y_osgview.vcxproj | 113 -
build/msvc11/y_osgview/y_osgview.vcxproj.filters | 32 -
.../z_libgui_dialogs/z_libgui_dialogs.vcxproj | 193 -
.../z_libgui_dialogs.vcxproj.filters | 35 -
.../z_libmicrosim_actions.vcxproj | 137 -
.../z_libmicrosim_actions.vcxproj.filters | 47 -
.../z_libmicrosim_cfmodels.vcxproj | 260 -
.../z_libmicrosim_cfmodels.vcxproj.filters | 77 -
.../z_libmicrosim_devices.vcxproj | 258 -
.../z_libmicrosim_devices.vcxproj.filters | 71 -
.../z_libmicrosim_logging.vcxproj | 129 -
.../z_libmicrosim_logging.vcxproj.filters | 23 -
.../z_libmicrosim_output.vcxproj | 278 -
.../z_libmicrosim_output.vcxproj.filters | 131 -
.../z_libmicrosim_traffic_lights.vcxproj | 167 -
.../z_libmicrosim_traffic_lights.vcxproj.filters | 56 -
.../z_libmicrosim_trigger.vcxproj | 205 -
.../z_libmicrosim_trigger.vcxproj.filters | 53 -
.../z_libnetimport_vissim.vcxproj | 315 -
.../z_libnetimport_vissim.vcxproj.filters | 500 -
.../z_libutils_common/z_libutils_common.vcxproj | 208 -
.../z_libutils_common.vcxproj.filters | 176 -
.../z_libutils_distribution.vcxproj | 161 -
.../z_libutils_distribution.vcxproj.filters | 38 -
.../z_libutils_emissions.vcxproj | 168 -
.../z_libutils_emissions.vcxproj.filters | 56 -
.../z_libutils_foxtools.vcxproj | 205 -
.../z_libutils_foxtools.vcxproj.filters | 116 -
.../msvc11/z_libutils_geom/z_libutils_geom.vcxproj | 206 -
.../z_libutils_geom.vcxproj.filters | 101 -
.../z_libutils_gui_div/z_libutils_gui_div.vcxproj | 147 -
.../z_libutils_gui_div.vcxproj.filters | 77 -
.../z_libutils_gui_events.vcxproj | 128 -
.../z_libutils_gui_events.vcxproj.filters | 24 -
.../z_libutils_gui_globjects.vcxproj | 141 -
.../z_libutils_gui_globjects.vcxproj.filters | 59 -
.../z_libutils_gui_images.vcxproj | 132 -
.../z_libutils_gui_images.vcxproj.filters | 32 -
.../z_libutils_gui_settings.vcxproj | 197 -
.../z_libutils_gui_settings.vcxproj.filters | 41 -
.../z_libutils_gui_tracker.vcxproj | 131 -
.../z_libutils_gui_tracker.vcxproj.filters | 29 -
.../z_libutils_gui_windows.vcxproj | 213 -
.../z_libutils_gui_windows.vcxproj.filters | 68 -
.../z_libutils_importio.vcxproj | 165 -
.../z_libutils_importio.vcxproj.filters | 32 -
.../z_libutils_iodevices.vcxproj | 172 -
.../z_libutils_iodevices.vcxproj.filters | 74 -
.../z_libutils_options/z_libutils_options.vcxproj | 172 -
.../z_libutils_options.vcxproj.filters | 47 -
build/msvc11/z_libutils_xml/z_libutils_xml.vcxproj | 186 -
.../z_libutils_xml/z_libutils_xml.vcxproj.filters | 95 -
.../z_optional_libtraciserver.vcxproj | 233 -
.../z_optional_libtraciserver.vcxproj.filters | 108 -
.../zz_foreign_eulerspiral.vcxproj | 161 -
.../zz_foreign_eulerspiral.vcxproj.filters | 35 -
.../zz_foreign_gl2ps/zz_foreign_gl2ps.vcxproj | 129 -
.../zz_foreign_gl2ps.vcxproj.filters | 27 -
.../msvc11/zz_foreign_nvwa/zz_foreign_nvwa.vcxproj | 131 -
.../zz_foreign_nvwa.vcxproj.filters | 33 -
.../zz_foreign_polyfonts.vcxproj | 132 -
.../zz_foreign_polyfonts.vcxproj.filters | 36 -
.../zz_foreign_rtree/zz_foreign_rtree.vcxproj | 155 -
.../zz_foreign_rtree.vcxproj.filters | 21 -
.../zz_foreign_tcpip/zz_foreign_tcpip.vcxproj | 165 -
.../zz_foreign_tcpip.vcxproj.filters | 29 -
.../emissionsDrivingCycle.vcxproj | 240 -
.../emissionsDrivingCycle.vcxproj.filters | 18 -
.../zzz_tools_emissionsMap/emissionsMap.vcxproj | 240 -
.../emissionsMap.vcxproj.filters | 18 -
build/msvc9/Fastbuild.vsprops | 19 -
build/msvc9/Release.vsprops | 33 -
build/msvc9/Win32.vsprops | 39 -
build/msvc9/activitygen/activitygen.vcproj | 606 --
build/msvc9/defaults.vsprops | 26 -
build/msvc9/dfrouter/dfrouter.vcproj | 491 -
build/msvc9/duarouter/duarouter.vcproj | 430 -
build/msvc9/exe.vsprops | 15 -
build/msvc9/guisim/guisim.vcproj | 669 --
build/msvc9/jtrrouter/jtrrouter.vcproj | 459 -
build/msvc9/meso.sln | 526 -
build/msvc9/meso.vsprops | 11 -
build/msvc9/netconvert/netconvert.vcproj | 421 -
build/msvc9/netgen/netgen.vcproj | 461 -
build/msvc9/od2trips/od2trips.vcproj | 455 -
build/msvc9/polyconvert/polyconvert.vcproj | 491 -
build/msvc9/prj.sln | 1103 --
build/msvc9/sumo/sumo.vcproj | 686 --
build/msvc9/tools.sln | 227 -
.../msvc9/traci-testclient/Traci_TestClient.vcproj | 417 -
build/msvc9/x64.vsprops | 43 -
build/msvc9/y_libgui/y_libgui.vcproj | 658 --
build/msvc9/y_libguinetload/y_libguinetload.vcproj | 607 --
build/msvc9/y_libguisim/y_libguisim.vcproj | 740 --
build/msvc9/y_libmesogui/y_libmesogui.vcproj | 357 -
build/msvc9/y_libmesosim/y_libmesosim.vcproj | 397 -
build/msvc9/y_libmicrosim/y_libmicrosim.vcproj | 841 --
build/msvc9/y_libnetbuild/y_libnetbuild.vcproj | 570 --
build/msvc9/y_libnetimport/y_libnetimport.vcproj | 494 -
build/msvc9/y_libnetload/y_libnetload.vcproj | 614 --
build/msvc9/y_libnetwrite/y_libnetwrite.vcproj | 398 -
build/msvc9/y_librouter/y_librouter.vcproj | 469 -
.../msvc9/z_libgui_dialogs/z_libgui_dialogs.vcproj | 606 --
.../z_libmicrosim_actions.vcproj | 391 -
.../z_libmicrosim_cfmodels.vcproj | 431 -
.../z_libmicrosim_devices.vcproj | 431 -
.../z_libmicrosim_logging.vcproj | 361 -
.../z_libmicrosim_output.vcproj | 714 --
.../z_libmicrosim_traffic_lights.vcproj | 406 -
.../z_libmicrosim_trigger.vcproj | 603 --
.../z_libnetimport_vissim.vcproj | 998 --
.../z_libutils_common/z_libutils_common.vcproj | 681 --
.../z_libutils_distribution.vcproj | 382 -
.../z_libutils_emissions.vcproj | 410 -
.../z_libutils_foxtools/z_libutils_foxtools.vcproj | 492 -
build/msvc9/z_libutils_geom/z_libutils_geom.vcproj | 466 -
.../z_libutils_gui_div/z_libutils_gui_div.vcproj | 431 -
.../z_libutils_gui_events.vcproj | 363 -
.../z_libutils_gui_globjects.vcproj | 407 -
.../z_libutils_gui_images.vcproj | 371 -
.../z_libutils_gui_settings.vcproj | 583 --
.../z_libutils_gui_tracker.vcproj | 367 -
.../z_libutils_gui_windows.vcproj | 634 --
.../z_libutils_importio/z_libutils_importio.vcproj | 376 -
.../z_libutils_iodevices.vcproj | 548 -
.../z_libutils_options/z_libutils_options.vcproj | 398 -
.../z_libutils_shapes/z_libutils_shapes.vcproj | 386 -
build/msvc9/z_libutils_xml/z_libutils_xml.vcproj | 460 -
.../z_optional_libtraciserver.vcproj | 500 -
.../zz_foreign_eulerspiral.vcproj | 381 -
.../msvc9/zz_foreign_gl2ps/zz_foreign_gl2ps.vcproj | 371 -
build/msvc9/zz_foreign_nvwa/zz_foreign_nvwa.vcproj | 373 -
.../zz_foreign_polyfonts.vcproj | 374 -
.../msvc9/zz_foreign_rtree/zz_foreign_rtree.vcproj | 365 -
.../msvc9/zz_foreign_tcpip/zz_foreign_tcpip.vcproj | 379 -
.../zzz_tools_emissionsDrivingCycle.vcproj | 414 -
.../zzz_tools_emissionsMap.vcproj | 414 -
build/package/sumo.spec | 95 -
config.guess | 421 +-
config.sub | 277 +-
configure | 24 +-
configure.ac | 6 +-
data/typemap/osmNetconvertPedestrians.typ.xml | 39 +
data/typemap/osmNetconvertRuralDe.typ.xml | 49 +
data/typemap/osmNetconvertUrbanDe.typ.xml | 49 +
data/typemap/osmPolyconvert.typ.xml | 1 +
data/xsd/additional_file.xsd | 1 +
data/xsd/amitran/linkdata.xsd | 68 +-
data/xsd/amitran/network.xsd | 85 +-
data/xsd/amitran/od.xsd | 76 +-
data/xsd/amitran/routes.xsd | 36 +-
data/xsd/amitran/trajectories.xsd | 207 +-
data/xsd/connections_file.xsd | 17 +-
data/xsd/dfrouterConfiguration.xsd | 1 -
data/xsd/marouterConfiguration.xsd | 1 +
data/xsd/net_file.xsd | 5 +-
data/xsd/netconvertConfiguration.xsd | 8 +
data/xsd/netgenerateConfiguration.xsd | 6 +
data/xsd/netstate_file.xsd | 10 +
data/xsd/nodes_file.xsd | 2 +
data/xsd/od2tripsConfiguration.xsd | 1 +
data/xsd/routeTypes.xsd | 5 +
data/xsd/sumoConfiguration.xsd | 8 +-
data/xsd/types_file.xsd | 1 +
depcomp | 531 +-
docs/examples/dfrouter/input_tri.net.xml | 8 +-
.../duarouter/flows2routes/input_net.net.xml | 8 +-
.../flows2routes_100s_interval/input_net.net.xml | 8 +-
.../input_net.net.xml | 8 +-
.../flows2routes_200s_interval/input_net.net.xml | 8 +-
.../duarouter/trips2routes/input_net.net.xml | 8 +-
.../straight_only_sinks/input_net.net.xml | 8 +-
docs/examples/jtrrouter/turns/input_net.net.xml | 8 +-
docs/examples/sumo/busses/input_additional.add.xml | 2 +-
docs/examples/sumo/busses/net.net.xml | 4 +-
docs/examples/sumo/hokkaido/net.net.xml | 8 +-
.../sumo/output/cross3ltl_emission/net.net.xml | 8 +-
.../examples/sumo/output/cross3ltl_fcd/net.net.xml | 8 +-
.../sumo/output/cross3ltl_full/net.net.xml | 8 +-
.../sumo/output/cross3ltl_inductloops/net.net.xml | 8 +-
.../cross3ltl_meandata_constrained/net.net.xml | 8 +-
.../output/cross3ltl_meandata_edges/net.net.xml | 8 +-
.../output/cross3ltl_meandata_lanes/net.net.xml | 8 +-
.../sumo/output/cross3ltl_queue/net.net.xml | 8 +-
.../sumo/output/cross3ltl_rawdump/net.net.xml | 8 +-
.../sumo/output/cross3ltl_summary/net.net.xml | 8 +-
.../sumo/output/cross3ltl_tripinfo/net.net.xml | 8 +-
.../sumo/output/cross3ltl_vehroutes/net.net.xml | 8 +-
.../sumo/output/cross3ltl_vtypeprobe/net.net.xml | 8 +-
.../sumo/simple_nets/box/box1l/net.net.xml | 8 +-
.../sumo/simple_nets/box/box2l/net.net.xml | 12 +-
.../sumo/simple_nets/box/box3l/net.net.xml | 8 +-
.../sumo/simple_nets/box/box4l/net.net.xml | 8 +-
.../sumo/simple_nets/cross/cross1l/net.net.xml | 8 +-
.../sumo/simple_nets/cross/cross1ltl/net.net.xml | 8 +-
.../sumo/simple_nets/cross/cross3l/net.net.xml | 8 +-
.../sumo/simple_nets/cross/cross3ltl/net.net.xml | 8 +-
.../examples/sumo/variable_speed_signs/net.net.xml | 8 +-
docs/examples/sumo/vehicle_stops/net.net.xml | 8 +-
.../sumo/visualization/parade/input_routes.rou.xml | 36 +-
.../examples/sumo/visualization/parade/net.net.xml | 8 +-
docs/examples/tools/dua-iterate/input_net.net.xml | 8 +-
docs/tutorial/city_mobil/agentManager.py | 4 +-
docs/tutorial/city_mobil/constants.py | 6 +-
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.net.xml | 8 +-
docs/tutorial/hello/runner.py | 4 +-
docs/tutorial/output_parsing/runner.py | 4 +-
docs/tutorial/quickstart/data/quickstart.net.xml | 14 +-
docs/tutorial/quickstart/runner.py | 4 +-
docs/tutorial/san_pablo_dam/data/analyzeData.py | 18 +
docs/tutorial/san_pablo_dam/runner.py | 4 +-
docs/tutorial/san_pablo_dam/validate.py | 17 +
docs/tutorial/traci_tls/data/cross.net.xml | 10 +-
docs/tutorial/traci_tls/data/cross.sumocfg | 4 -
docs/tutorial/traci_tls/embedded.py | 8 +-
docs/tutorial/traci_tls/runner.py | 9 +-
install-sh | 35 +-
missing | 461 +-
src/activitygen/AGActivityGen.cpp | 5 +-
src/activitygen/AGActivityGen.h | 5 +-
src/activitygen/AGActivityTripWriter.h | 5 +-
src/activitygen/activities/AGActivities.cpp | 5 +-
src/activitygen/activities/AGActivity.h | 5 +-
src/activitygen/activities/AGFreeTime.cpp | 5 +-
src/activitygen/activities/AGFreeTime.h | 5 +-
src/activitygen/activities/AGTrip.cpp | 6 +-
src/activitygen/activities/AGTrip.h | 6 +-
src/activitygen/activitygen_main.cpp | 10 +-
src/activitygen/city/AGAdult.cpp | 5 +-
src/activitygen/city/AGAdult.h | 5 +-
src/activitygen/city/AGCar.cpp | 5 +-
src/activitygen/city/AGCar.h | 5 +-
src/activitygen/city/AGChild.cpp | 5 +-
src/activitygen/city/AGChild.h | 5 +-
src/activitygen/city/AGCity.cpp | 12 +-
src/activitygen/city/AGCity.h | 5 +-
src/activitygen/city/AGHousehold.h | 5 +-
src/activitygen/city/AGPerson.cpp | 5 +-
src/activitygen/city/AGStreet.cpp | 5 +-
src/activitygen/city/AGStreet.h | 5 +-
src/activitygen/city/AGWorkPosition.h | 5 +-
src/config.h | 12 +-
src/dfrouter/RODFDetFlowLoader.cpp | 8 +-
src/dfrouter/RODFDetector.cpp | 5 +-
src/dfrouter/RODFDetectorFlow.cpp | 5 +-
src/dfrouter/RODFEdge.cpp | 6 +-
src/dfrouter/RODFEdge.h | 5 +-
src/dfrouter/RODFEdgeBuilder.cpp | 5 +-
src/dfrouter/RODFEdgeBuilder.h | 5 +-
src/dfrouter/RODFFrame.cpp | 8 +-
src/dfrouter/RODFNet.cpp | 8 +-
src/dfrouter/RODFNet.h | 5 +-
src/dfrouter/RODFRouteCont.cpp | 23 +-
src/dfrouter/RODFRouteCont.h | 7 +-
src/dfrouter/dfrouter_main.cpp | 11 +-
src/duarouter/RODUAEdgeBuilder.cpp | 6 +-
src/duarouter/RODUAEdgeBuilder.h | 6 +-
src/foreign/mersenne/MersenneTwister.h | 4 +-
src/foreign/polyfonts/pfPSansBold16.c | 4 +
src/foreign/polyfonts/polyfonts.c | 4 +
src/gui/GUIApplicationWindow.cpp | 165 +-
src/gui/GUIApplicationWindow.h | 29 +-
src/gui/GUIEvent_SimulationLoaded.h | 5 +-
src/gui/GUIGlobals.cpp | 4 +-
src/gui/GUIGlobals.h | 4 +-
src/gui/GUILoadThread.cpp | 19 +-
src/gui/GUILoadThread.h | 5 +-
src/gui/GUIRunThread.cpp | 10 +-
src/gui/GUIRunThread.h | 20 +-
src/gui/GUISUMOViewParent.cpp | 12 +-
src/gui/GUISUMOViewParent.h | 5 +-
src/gui/GUITLLogicPhasesTrackerWindow.cpp | 4 +-
src/gui/dialogs/GUIDialog_Breakpoints.cpp | 37 +-
src/gui/dialogs/GUIDialog_Breakpoints.h | 10 +-
src/guinetload/GUIEdgeControlBuilder.cpp | 6 +-
src/guinetload/GUIEdgeControlBuilder.h | 4 +-
src/guinetload/GUITriggerBuilder.h | 5 +-
src/guisim/GUIEdge.cpp | 27 +-
src/guisim/GUIEdge.h | 8 +-
src/guisim/GUIInstantInductLoop.cpp | 6 +-
src/guisim/GUILane.cpp | 249 +-
src/guisim/GUILane.h | 11 +-
src/guisim/GUINet.cpp | 5 +-
src/guisim/GUIPerson.cpp | 121 +-
src/guisim/GUIPerson.h | 24 +-
src/guisim/GUIPersonControl.cpp | 6 +-
src/guisim/GUIPersonControl.h | 6 +-
src/guisim/GUIShapeContainer.h | 5 +-
src/guisim/GUITrafficLightLogicWrapper.cpp | 4 +-
src/guisim/GUIVehicle.cpp | 120 +-
src/guisim/GUIVehicle.h | 34 +-
src/guisim/GUIVehicleControl.cpp | 6 +-
src/guisim/GUIVehicleControl.h | 5 +-
src/jtrrouter/ROJTREdge.cpp | 5 +-
src/jtrrouter/ROJTREdge.h | 5 +-
src/jtrrouter/ROJTREdgeBuilder.cpp | 5 +-
src/jtrrouter/ROJTREdgeBuilder.h | 5 +-
src/microsim/MSAbstractLaneChangeModel.cpp | 21 +-
src/microsim/MSAbstractLaneChangeModel.h | 11 +-
src/microsim/MSBaseVehicle.h | 5 +-
src/microsim/MSBitSetLogic.h | 4 +-
src/microsim/MSEdge.cpp | 41 +-
src/microsim/MSEdge.h | 79 +-
src/microsim/MSEdgeWeightsStorage.cpp | 32 +-
src/microsim/MSEdgeWeightsStorage.h | 14 +-
src/microsim/MSEventControl.cpp | 4 +-
src/microsim/MSFrame.cpp | 53 +-
src/microsim/MSFrame.h | 3 +-
src/microsim/MSGlobals.cpp | 5 +-
src/microsim/MSGlobals.h | 5 +-
src/microsim/MSInsertionControl.cpp | 38 +-
src/microsim/MSInsertionControl.h | 5 +-
src/microsim/MSInternalJunction.cpp | 9 +-
src/microsim/MSJunction.cpp | 6 +-
src/microsim/MSJunction.h | 25 +-
src/microsim/MSJunctionLogic.h | 4 +-
src/microsim/MSLCM_DK2008.cpp | 5 +-
src/microsim/MSLCM_DK2008.h | 5 +-
src/microsim/MSLCM_JE2013.cpp | 101 +-
src/microsim/MSLCM_JE2013.h | 6 +-
src/microsim/MSLCM_LC2013.cpp | 89 +-
src/microsim/MSLane.cpp | 76 +-
src/microsim/MSLane.h | 9 +-
src/microsim/MSLaneChanger.cpp | 12 +-
src/microsim/MSLaneChanger.h | 5 +-
src/microsim/MSLink.cpp | 116 +-
src/microsim/MSLink.h | 36 +-
src/microsim/MSLinkCont.cpp | 26 +-
src/microsim/MSLinkCont.h | 13 +-
src/microsim/MSLogicJunction.cpp | 3 +-
src/microsim/MSLogicJunction.h | 3 +-
src/microsim/MSMoveReminder.cpp | 5 +-
src/microsim/MSMoveReminder.h | 5 +-
src/microsim/MSNet.cpp | 40 +-
src/microsim/MSNet.h | 10 +-
src/microsim/MSNoLogicJunction.cpp | 7 +-
src/microsim/MSNoLogicJunction.h | 3 +-
src/microsim/MSPModel.cpp | 128 +
src/microsim/MSPModel.h | 119 +
src/microsim/MSPModel_NonInteracting.cpp | 175 +
src/microsim/MSPModel_NonInteracting.h | 119 +
src/microsim/MSPModel_Striping.cpp | 1040 ++
src/microsim/MSPModel_Striping.h | 338 +
src/microsim/MSPerson.cpp | 169 +-
src/microsim/MSPerson.h | 134 +-
src/microsim/MSRightOfWayJunction.cpp | 21 +-
src/microsim/MSRoute.cpp | 5 +-
src/microsim/MSRoute.h | 5 +-
src/microsim/MSRouteHandler.cpp | 93 +-
src/microsim/MSStateHandler.cpp | 5 +-
src/microsim/MSStateHandler.h | 5 +-
src/microsim/MSVehicle.cpp | 167 +-
src/microsim/MSVehicle.h | 26 +-
src/microsim/MSVehicleContainer.cpp | 4 +-
src/microsim/MSVehicleControl.cpp | 32 +-
src/microsim/MSVehicleControl.h | 29 +-
src/microsim/MSVehicleTransfer.cpp | 18 +-
src/microsim/MSVehicleTransfer.h | 24 +-
src/microsim/MSVehicleType.cpp | 113 +-
src/microsim/MSVehicleType.h | 16 +-
src/microsim/Makefile.am | 3 +
src/microsim/Makefile.in | 9 +-
src/microsim/cfmodels/MSCFModel_Daniel1.cpp | 6 +-
src/microsim/cfmodels/MSCFModel_Daniel1.h | 5 +-
src/microsim/cfmodels/MSCFModel_IDM.cpp | 45 +-
src/microsim/cfmodels/MSCFModel_IDM.h | 12 +-
src/microsim/cfmodels/MSCFModel_PWag2009.cpp | 5 +-
src/microsim/cfmodels/MSCFModel_PWag2009.h | 5 +-
src/microsim/cfmodels/MSCFModel_SmartSK.cpp | 7 +-
src/microsim/cfmodels/MSCFModel_SmartSK.h | 6 +-
src/microsim/cfmodels/MSCFModel_Wiedemann.cpp | 5 +-
src/microsim/devices/MSDevice.cpp | 7 +-
src/microsim/devices/MSDevice.h | 5 +-
src/microsim/devices/MSDevice_BTreceiver.cpp | 64 +-
src/microsim/devices/MSDevice_BTreceiver.h | 27 +-
src/microsim/devices/MSDevice_BTsender.cpp | 7 +-
src/microsim/devices/MSDevice_BTsender.h | 7 +-
src/microsim/devices/MSDevice_Emissions.cpp | 53 +-
src/microsim/devices/MSDevice_Emissions.h | 17 +-
src/microsim/devices/MSDevice_Example.cpp | 6 +-
src/microsim/devices/MSDevice_Example.h | 5 +-
src/microsim/devices/MSDevice_Routing.cpp | 24 +-
src/microsim/devices/MSDevice_Routing.h | 7 +-
src/microsim/devices/MSDevice_Tripinfo.cpp | 5 +-
src/microsim/devices/MSDevice_Tripinfo.h | 5 +-
src/microsim/devices/MSDevice_Vehroutes.cpp | 5 +-
src/microsim/devices/MSDevice_Vehroutes.h | 5 +-
src/microsim/output/MSAmitranTrajectories.cpp | 100 +
src/microsim/output/MSAmitranTrajectories.h | 102 +
src/microsim/output/MSE2Collector.cpp | 23 +-
src/microsim/output/MSE2Collector.h | 9 +-
src/microsim/output/MSE3Collector.cpp | 34 +-
src/microsim/output/MSE3Collector.h | 5 +-
src/microsim/output/MSEmissionExport.cpp | 21 +-
src/microsim/output/MSEmissionExport.h | 4 +-
src/microsim/output/MSFCDExport.cpp | 34 +-
src/microsim/output/MSFCDExport.h | 4 +-
src/microsim/output/MSFullExport.cpp | 26 +-
src/microsim/output/MSFullExport.h | 4 +-
src/microsim/output/MSInductLoop.cpp | 10 +-
src/microsim/output/MSInductLoop.h | 7 +-
src/microsim/output/MSInstantInductLoop.cpp | 6 +-
src/microsim/output/MSInstantInductLoop.h | 5 +-
src/microsim/output/MSMeanData.cpp | 33 +-
src/microsim/output/MSMeanData.h | 34 +-
src/microsim/output/MSMeanData_Amitran.cpp | 206 +
src/microsim/output/MSMeanData_Amitran.h | 256 +
src/microsim/output/MSMeanData_Emissions.cpp | 75 +-
src/microsim/output/MSMeanData_Emissions.h | 24 +-
src/microsim/output/MSMeanData_Net.cpp | 5 +-
src/microsim/output/MSMeanData_Net.h | 5 +-
src/microsim/output/MSQueueExport.cpp | 7 +-
src/microsim/output/MSQueueExport.h | 4 +-
src/microsim/output/MSRouteProbe.cpp | 5 +-
src/microsim/output/MSVTKExport.cpp | 7 +-
src/microsim/output/MSVTKExport.h | 4 +-
src/microsim/output/MSXMLRawOut.cpp | 45 +-
src/microsim/output/MSXMLRawOut.h | 4 +-
.../output/MS_E2_ZS_CollectorOverLanes.cpp | 7 +-
src/microsim/output/Makefile.am | 2 +
src/microsim/output/Makefile.in | 11 +-
.../traffic_lights/MSActuatedTrafficLightLogic.h | 5 +-
.../traffic_lights/MSAgentbasedTrafficLightLogic.h | 5 +-
.../traffic_lights/MSTrafficLightLogic.cpp | 18 +-
src/microsim/traffic_lights/MSTrafficLightLogic.h | 4 +-
src/microsim/trigger/MSBusStop.cpp | 5 +-
src/microsim/trigger/MSBusStop.h | 5 +-
src/microsim/trigger/MSCalibrator.cpp | 5 +-
src/microsim/trigger/MSCalibrator.h | 5 +-
src/microsim/trigger/MSTrigger.cpp | 5 +-
src/netbuild/NBAlgorithms.cpp | 24 +-
src/netbuild/NBAlgorithms.h | 38 +-
src/netbuild/NBAlgorithms_Ramps.cpp | 14 +-
src/netbuild/NBAlgorithms_Ramps.h | 5 +-
src/netbuild/NBConnection.cpp | 10 +-
src/netbuild/NBConnection.h | 5 +-
src/netbuild/NBContHelper.cpp | 10 +-
src/netbuild/NBContHelper.h | 19 +-
src/netbuild/NBEdge.cpp | 278 +-
src/netbuild/NBEdge.h | 81 +-
src/netbuild/NBEdgeCont.cpp | 51 +-
src/netbuild/NBEdgeCont.h | 10 +-
src/netbuild/NBFrame.cpp | 30 +-
src/netbuild/NBHelpers.cpp | 3 +-
src/netbuild/NBHelpers.h | 3 +-
src/netbuild/NBLoadedSUMOTLDef.cpp | 68 +-
src/netbuild/NBLoadedSUMOTLDef.h | 14 +-
src/netbuild/NBNetBuilder.cpp | 37 +-
src/netbuild/NBNode.cpp | 634 +-
src/netbuild/NBNode.h | 180 +-
src/netbuild/NBNodeCont.cpp | 69 +-
src/netbuild/NBNodeCont.h | 8 +-
src/netbuild/NBOwnTLDef.cpp | 103 +-
src/netbuild/NBOwnTLDef.h | 12 +-
src/netbuild/NBRequest.cpp | 114 +-
src/netbuild/NBRequest.h | 21 +-
src/netbuild/NBSign.cpp | 54 +-
src/netbuild/NBSign.h | 5 +-
src/netbuild/NBTrafficLightDefinition.cpp | 8 +-
src/netbuild/NBTrafficLightDefinition.h | 18 +-
src/netbuild/NBTrafficLightLogic.cpp | 4 +-
src/netbuild/NBTypeCont.cpp | 18 +-
src/netbuild/NBTypeCont.h | 36 +-
src/netgen/NGEdge.cpp | 5 +-
src/netgen/NGFrame.cpp | 5 +-
src/netgen/NGNet.cpp | 5 +-
src/netimport/NIImporter_ArcView.cpp | 14 +-
src/netimport/NIImporter_ArcView.h | 5 +-
src/netimport/NIImporter_DlrNavteq.h | 5 +-
src/netimport/NIImporter_ITSUMO.cpp | 7 +-
src/netimport/NIImporter_MATSim.cpp | 4 +-
src/netimport/NIImporter_OpenDrive.cpp | 17 +-
src/netimport/NIImporter_OpenStreetMap.cpp | 62 +-
src/netimport/NIImporter_OpenStreetMap.h | 10 +-
src/netimport/NIImporter_RobocupRescue.cpp | 6 +-
src/netimport/NIImporter_SUMO.cpp | 94 +-
src/netimport/NIImporter_SUMO.h | 38 +-
src/netimport/NIImporter_VISUM.cpp | 10 +-
src/netimport/NILoader.cpp | 10 +-
src/netimport/NINavTeqHelper.cpp | 28 +-
src/netimport/NIVisumTL.cpp | 6 +-
src/netimport/NIXMLConnectionsHandler.cpp | 69 +-
src/netimport/NIXMLConnectionsHandler.h | 7 +-
src/netimport/NIXMLEdgesHandler.cpp | 20 +-
src/netimport/NIXMLEdgesHandler.h | 4 +-
src/netimport/NIXMLNodesHandler.cpp | 11 +-
src/netimport/NIXMLTrafficLightsHandler.cpp | 9 +-
src/netimport/NIXMLTypesHandler.cpp | 5 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.cpp | 5 +-
.../vissim/tempstructs/NIVissimClosedLaneDef.h | 5 +-
.../vissim/tempstructs/NIVissimClosures.cpp | 5 +-
.../vissim/tempstructs/NIVissimClosures.h | 5 +-
.../vissim/tempstructs/NIVissimDisturbance.cpp | 4 +-
.../vissim/tempstructs/NIVissimDisturbance.h | 5 +-
.../vissim/tempstructs/NIVissimNodeDef.cpp | 5 +-
src/netimport/vissim/tempstructs/NIVissimNodeDef.h | 5 +-
.../vissim/tempstructs/NIVissimVehTypeClass.cpp | 5 +-
.../vissim/tempstructs/NIVissimVehTypeClass.h | 5 +-
src/netload/NLBuilder.cpp | 6 +-
src/netload/NLDetectorBuilder.cpp | 9 +-
src/netload/NLEdgeControlBuilder.cpp | 28 +-
src/netload/NLEdgeControlBuilder.h | 6 +-
src/netload/NLHandler.cpp | 34 +-
src/netload/NLHandler.h | 5 +-
src/netload/NLJunctionControlBuilder.cpp | 12 +-
src/netload/NLJunctionControlBuilder.h | 5 +-
src/netload/NLTriggerBuilder.h | 5 +-
src/netwrite/Makefile.am | 1 +
src/netwrite/Makefile.in | 5 +-
src/netwrite/NWFrame.cpp | 8 +-
src/netwrite/NWWriter_Amitran.cpp | 138 +
src/netwrite/NWWriter_Amitran.h | 64 +
src/netwrite/NWWriter_DlrNavteq.cpp | 29 +-
src/netwrite/NWWriter_DlrNavteq.h | 11 +-
src/netwrite/NWWriter_OpenDrive.cpp | 5 +-
src/netwrite/NWWriter_SUMO.cpp | 124 +-
src/netwrite/NWWriter_SUMO.h | 4 +-
src/netwrite/NWWriter_XML.cpp | 35 +-
src/od2trips/Makefile.am | 7 +-
src/od2trips/Makefile.in | 12 +-
src/od2trips/ODAmitranHandler.cpp | 75 +
src/od2trips/ODAmitranHandler.h | 108 +
src/od2trips/ODCell.h | 5 +-
src/od2trips/ODDistrict.cpp | 5 +-
src/od2trips/ODDistrict.h | 5 +-
src/od2trips/ODDistrictCont.cpp | 9 +-
src/od2trips/ODDistrictCont.h | 6 +-
src/od2trips/ODMatrix.cpp | 49 +-
src/od2trips/ODMatrix.h | 7 +-
src/od2trips/od2trips_main.cpp | 12 +-
src/polyconvert/PCLoaderDlrNavteq.cpp | 6 +-
src/polyconvert/PCLoaderOSM.cpp | 8 +-
src/polyconvert/PCLoaderOSM.h | 5 +-
src/polyconvert/PCLoaderVisum.cpp | 4 +-
src/polyconvert/PCLoaderXML.cpp | 4 +-
src/polyconvert/PCNetProjectionLoader.cpp | 4 +-
src/polyconvert/PCPolyContainer.cpp | 5 +-
src/polyconvert/PCPolyContainer.h | 5 +-
src/polyconvert/PCTypeMap.cpp | 6 +-
src/polyconvert/PCTypeMap.h | 5 +-
src/polyconvert/polyconvert_main.cpp | 5 +-
src/router/ROAbstractEdgeBuilder.h | 5 +-
src/router/ROCostCalculator.cpp | 5 +-
src/router/ROCostCalculator.h | 5 +-
src/router/ROEdge.cpp | 123 +-
src/router/ROEdge.h | 75 +-
src/router/ROFrame.cpp | 6 +-
src/router/ROLane.h | 36 +-
src/router/ROLoader.cpp | 18 +-
src/router/ROLoader.h | 5 +-
src/router/RONet.cpp | 14 +-
src/router/RONet.h | 6 +-
src/router/RONetHandler.cpp | 93 +-
src/router/RONetHandler.h | 17 +-
src/router/RONode.h | 28 +-
src/router/RORoute.cpp | 5 +-
src/router/RORoute.h | 6 +-
src/router/RORouteDef.cpp | 5 +-
src/router/RORouteDef.h | 5 +-
src/router/RORouteHandler.cpp | 104 +-
src/router/RORouteHandler.h | 18 +-
src/router/ROVehicle.cpp | 5 +-
src/router/ROVehicle.h | 7 +-
src/sumo_main.cpp | 12 +-
src/tools/Makefile.am | 5 +-
src/tools/Makefile.in | 28 +-
src/tools/TrajectoriesHandler.cpp | 169 +
src/tools/TrajectoriesHandler.h | 124 +
src/tools/emissionsDrivingCycle_main.cpp | 161 +-
src/tools/emissionsMap_main.cpp | 61 +-
src/traci-server/TraCIConstants.h | 10 +-
src/traci-server/TraCIServer.cpp | 16 +-
src/traci-server/TraCIServerAPI_ArealDetector.cpp | 6 +-
src/traci-server/TraCIServerAPI_ArealDetector.h | 5 +-
src/traci-server/TraCIServerAPI_Edge.cpp | 9 +-
src/traci-server/TraCIServerAPI_InductionLoop.cpp | 7 +-
src/traci-server/TraCIServerAPI_Junction.cpp | 6 +-
src/traci-server/TraCIServerAPI_Lane.cpp | 16 +-
src/traci-server/TraCIServerAPI_Lane.h | 5 +-
src/traci-server/TraCIServerAPI_POI.cpp | 5 +-
src/traci-server/TraCIServerAPI_Polygon.cpp | 6 +-
src/traci-server/TraCIServerAPI_TLS.cpp | 9 +-
src/traci-server/TraCIServerAPI_Vehicle.cpp | 32 +-
src/traci-server/TraCIServerAPI_VehicleType.cpp | 11 +-
src/traci_testclient/TraCITestClient.cpp | 5 +-
src/utils/common/AStarRouter.h | 6 +-
src/utils/common/DijkstraRouterTT.h | 4 +-
src/utils/common/FileHelpers.cpp | 7 +-
src/utils/common/FileHelpers.h | 9 +-
src/utils/common/Makefile.am | 1 +
src/utils/common/Makefile.in | 1 +
src/utils/common/MsgHandler.cpp | 12 +-
src/utils/common/MsgHandler.h | 10 +-
src/utils/common/NamedObjectCont.h | 5 +-
src/utils/common/NamedRTree.h | 6 +-
src/utils/common/Parameterised.h | 5 +-
src/utils/common/PedestrianRouter.h | 466 +
src/utils/common/RGBColor.cpp | 28 +-
src/utils/common/RGBColor.h | 5 +-
src/utils/common/RandHelper.h | 5 +-
src/utils/common/RandomDistributor.h | 5 +-
src/utils/common/SUMOAbstractRouter.h | 5 +-
src/utils/common/SUMOTime.cpp | 6 +-
src/utils/common/SUMOTime.h | 4 +-
src/utils/common/SUMOVTypeParameter.cpp | 219 +-
src/utils/common/SUMOVTypeParameter.h | 32 +-
src/utils/common/SUMOVehicle.h | 3 +-
src/utils/common/SUMOVehicleClass.cpp | 389 +-
src/utils/common/SUMOVehicleClass.h | 383 +-
src/utils/common/SUMOVehicleParameter.cpp | 4 +-
src/utils/common/SUMOVehicleParameter.h | 4 +-
src/utils/common/StdDefs.cpp | 6 +-
src/utils/common/StdDefs.h | 5 +-
src/utils/common/StringBijection.h | 47 +-
src/utils/common/SysUtils.cpp | 44 +-
src/utils/common/SysUtils.h | 7 +-
src/utils/common/SystemFrame.cpp | 4 +-
src/utils/common/SystemFrame.h | 2 +-
src/utils/common/ToString.h | 5 +-
src/utils/common/TplConvert.h | 4 +-
src/utils/common/VectorHelper.h | 4 +-
src/utils/emissions/HelpersHBEFA.cpp | 92 +-
src/utils/emissions/HelpersHBEFA.h | 101 +-
src/utils/emissions/HelpersHBEFA3.cpp | 575 ++
src/utils/emissions/HelpersHBEFA3.h | 137 +
src/utils/emissions/HelpersHarmonoise.cpp | 11 +-
src/utils/emissions/HelpersHarmonoise.h | 6 +-
src/utils/emissions/HelpersPHEMlight.cpp | 238 +-
src/utils/emissions/HelpersPHEMlight.h | 102 +-
src/utils/emissions/Makefile.am | 6 +-
src/utils/emissions/Makefile.in | 9 +-
src/utils/emissions/PHEMCEP.cpp | 12 +-
src/utils/emissions/PHEMCEP.h | 9 +-
src/utils/emissions/PHEMCEPHandler.cpp | 18 +-
src/utils/emissions/PHEMCEPHandler.h | 11 +-
src/utils/emissions/PHEMConstants.h | 5 +-
src/utils/emissions/PollutantsInterface.cpp | 189 +-
src/utils/emissions/PollutantsInterface.h | 385 +-
src/utils/foxtools/FXBaseObject.cpp | 44 +-
src/utils/foxtools/FXBaseObject.h | 43 +-
src/utils/foxtools/FXLCDLabel.cpp | 44 +-
src/utils/foxtools/FXLCDLabel.h | 44 +-
src/utils/foxtools/FXLinkLabel.cpp | 22 +
src/utils/foxtools/FXLinkLabel.h | 21 +
src/utils/foxtools/FXRealSpinDial.cpp | 51 +-
src/utils/foxtools/FXRealSpinDial.h | 52 +-
src/utils/foxtools/FXSevenSegment.cpp | 44 +-
src/utils/foxtools/FXSevenSegment.h | 44 +-
src/utils/foxtools/FXSingleEventThread.cpp | 24 +
src/utils/foxtools/FXSingleEventThread.h | 22 +
src/utils/foxtools/FXThreadEvent.cpp | 8 +-
src/utils/foxtools/FXThreadEvent.h | 8 +-
src/utils/foxtools/FXThreadMessageRetriever.h | 4 +-
src/utils/foxtools/MFXAddEditTypedTable.cpp | 4 +-
src/utils/foxtools/MFXAddEditTypedTable.h | 4 +-
src/utils/foxtools/MFXCheckableButton.cpp | 4 +-
src/utils/foxtools/MFXCheckableButton.h | 4 +-
src/utils/foxtools/MFXEditableTable.cpp | 4 +-
src/utils/foxtools/MFXEditableTable.h | 4 +-
src/utils/foxtools/MFXEventQue.cpp | 4 +-
src/utils/foxtools/MFXEventQue.h | 4 +-
src/utils/foxtools/MFXImageHelper.cpp | 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 | 44 +-
src/utils/foxtools/MFXMutex.h | 44 +-
src/utils/foxtools/MFXUtils.cpp | 4 +-
src/utils/foxtools/MFXUtils.h | 4 +-
src/utils/foxtools/fxexdefs.h | 43 +-
src/utils/geom/GeomHelper.cpp | 8 +-
src/utils/geom/Helper_ConvexHull.cpp | 5 +-
src/utils/geom/Position.h | 14 +-
src/utils/geom/PositionVector.cpp | 51 +-
src/utils/geom/PositionVector.h | 12 +-
src/utils/geom/bezier.cpp | 5 +-
src/utils/geom/bezier.h | 5 +-
src/utils/gui/div/GLHelper.cpp | 13 +-
src/utils/gui/div/GLHelper.h | 5 +-
src/utils/gui/div/GUIMessageWindow.cpp | 5 +-
src/utils/gui/div/GUIMessageWindow.h | 5 +-
src/utils/gui/div/GUIParameterTableWindow.cpp | 5 +-
src/utils/gui/div/GUIParameterTableWindow.h | 5 +-
src/utils/gui/globjects/GLIncludes.h | 6 +-
src/utils/gui/images/GUITexturesHelper.cpp | 5 +-
src/utils/gui/images/GUITexturesHelper.h | 5 +-
src/utils/gui/images/flag.cpp | 24 +-
src/utils/gui/images/flag_minus.cpp | 23 +-
src/utils/gui/images/flag_plus.cpp | 24 +-
src/utils/gui/images/manip.cpp | 24 +-
.../gui/settings/GUICompleteSchemeStorage.cpp | 3 +-
src/utils/gui/settings/GUISettingsHandler.cpp | 44 +-
src/utils/gui/settings/GUISettingsHandler.h | 11 +-
.../gui/settings/GUIVisualizationSettings.cpp | 39 +-
src/utils/gui/settings/GUIVisualizationSettings.h | 4 +-
src/utils/gui/windows/GUIAppEnum.h | 4 +-
.../gui/windows/GUIDanielPerspectiveChanger.cpp | 4 +-
src/utils/gui/windows/GUIDialog_EditViewport.cpp | 5 +-
src/utils/gui/windows/GUIDialog_ViewSettings.cpp | 6 +-
src/utils/gui/windows/GUIDialog_ViewSettings.h | 4 +-
src/utils/gui/windows/GUISUMOAbstractView.cpp | 12 +-
src/utils/iodevices/BinaryFormatter.cpp | 6 +-
src/utils/iodevices/BinaryFormatter.h | 18 +-
src/utils/iodevices/BinaryInputDevice.cpp | 4 +-
src/utils/iodevices/BinaryInputDevice.h | 5 +-
src/utils/iodevices/OutputDevice.cpp | 32 +-
src/utils/iodevices/OutputDevice.h | 16 +-
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 | 5 +-
src/utils/iodevices/OutputDevice_File.h | 4 +-
src/utils/iodevices/OutputDevice_Network.cpp | 10 +-
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 | 6 +-
src/utils/iodevices/PlainXMLFormatter.cpp | 14 +-
src/utils/iodevices/PlainXMLFormatter.h | 13 +-
src/utils/options/Option.h | 3 +-
src/utils/options/OptionsCont.cpp | 6 +-
src/utils/options/OptionsIO.cpp | 6 +-
src/utils/shapes/PointOfInterest.h | 5 +-
src/utils/shapes/Polygon.cpp | 5 +-
src/utils/shapes/Polygon.h | 6 +-
src/utils/shapes/Shape.cpp | 5 +-
src/utils/shapes/Shape.h | 5 +-
src/utils/shapes/ShapeContainer.cpp | 5 +-
src/utils/shapes/ShapeContainer.h | 5 +-
src/utils/traci/TraCIAPI.cpp | 7 +-
src/utils/traci/TraCIAPI.h | 6 +-
src/utils/xml/GenericSAXHandler.cpp | 4 +-
src/utils/xml/GenericSAXHandler.h | 4 +-
src/utils/xml/SAXWeightsHandler.cpp | 4 +-
src/utils/xml/SAXWeightsHandler.h | 4 +-
src/utils/xml/SUMORouteLoader.cpp | 4 +-
src/utils/xml/SUMORouteLoader.h | 4 +-
src/utils/xml/SUMORouteLoaderControl.cpp | 5 +-
src/utils/xml/SUMORouteLoaderControl.h | 5 +-
src/utils/xml/SUMOSAXAttributes.cpp | 6 +-
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 | 12 +-
src/utils/xml/SUMOSAXReader.h | 6 +-
src/utils/xml/SUMOVehicleParserHelper.cpp | 78 +-
src/utils/xml/SUMOVehicleParserHelper.h | 4 +-
src/utils/xml/SUMOXMLDefinitions.cpp | 59 +-
src/utils/xml/SUMOXMLDefinitions.h | 42 +-
src/utils/xml/XMLSubSys.cpp | 4 +-
src/utils/xml/XMLSubSys.h | 4 +-
src/windows_config.h | 9 +-
tools/assign/Assignment.py | 7 +-
tools/assign/assign.py | 6 +-
tools/assign/cadytsIterate.py | 7 +-
tools/assign/costMemory.py | 5 +-
tools/assign/dijkstra.py | 6 +-
tools/assign/duaIterate.py | 4 +-
tools/assign/duaIterate_analysis.py | 112 +-
tools/assign/elements.py | 6 +-
tools/assign/inputs.py | 6 +-
tools/assign/matrixDailyToHourly.py | 4 +-
tools/assign/network.py | 8 +-
tools/assign/networkStatistics.py | 26 +-
tools/assign/one-shot.py | 4 +-
tools/assign/outputs.py | 8 +-
tools/assign/routeChoices.py | 5 +-
tools/assign/run.py | 4 +-
tools/assign/statisticsElements.py | 4 +-
tools/assign/tables.py | 2 +-
tools/bin/traceExporter.py | 4 +-
tools/build/checkAuthors.py | 8 +-
tools/build/dailyBuildMSVC.py | 21 +-
tools/build/dailyUpdateMakeGCC | 4 +-
tools/build/status.py | 17 +
tools/build/wix.py | 5 +-
.../TraCI4Matlab/+traci/+edge/adaptTraveltime.m | 17 -
.../+traci/+edge/getAdaptedTraveltime.m | 19 -
.../TraCI4Matlab/+traci/+edge/getEffort.m | 19 -
.../TraCI4Matlab/+traci/+edge/setEffort.m | 17 -
.../TraCI4Matlab/+traci/+gui/setBoundary.m | 16 -
.../TraCI4Matlab/+traci/+gui/setOffset.m | 15 -
.../TraCI4Matlab/+traci/+lane/setAllowed.m | 22 -
.../TraCI4Matlab/+traci/+lane/setDisallowed.m | 21 -
tools/contributed/TraCI4Matlab/+traci/+poi/add.m | 36 -
.../contributed/TraCI4Matlab/+traci/+poi/remove.m | 19 -
.../TraCI4Matlab/+traci/+poi/setPosition.m | 15 -
.../contributed/TraCI4Matlab/+traci/+poi/setType.m | 15 -
.../contributed/TraCI4Matlab/+traci/+polygon/add.m | 53 -
.../TraCI4Matlab/+traci/+polygon/remove.m | 19 -
.../TraCI4Matlab/+traci/+polygon/setShape.m | 20 -
.../TraCI4Matlab/+traci/+polygon/setType.m | 15 -
tools/contributed/TraCI4Matlab/+traci/+route/add.m | 22 -
.../TraCI4Matlab/+traci/+simulation/convert2D.m | 38 -
.../TraCI4Matlab/+traci/+simulation/convertGeo.m | 38 -
.../TraCI4Matlab/+traci/+simulation/convertRoad.m | 38 -
.../+traci/+simulation/getDistance2D.m | 46 -
.../+traci/+simulation/getDistanceRoad.m | 36 -
.../+traci/+trafficlights/getSubscriptionResults.m | 26 -
.../setCompleteRedYellowGreenDefinition.m | 44 -
.../contributed/TraCI4Matlab/+traci/+vehicle/add.m | 57 -
.../TraCI4Matlab/+traci/+vehicle/changeLane.m | 20 -
.../+traci/+vehicle/getAdaptedTraveltime.m | 21 -
.../+traci/+vehicle/getDrivingDistance.m | 24 -
.../+traci/+vehicle/getDrivingDistance2D.m | 19 -
.../TraCI4Matlab/+traci/+vehicle/getEffort.m | 21 -
.../TraCI4Matlab/+traci/+vehicle/moveTo.m | 21 -
.../TraCI4Matlab/+traci/+vehicle/moveToVTD.m | 22 -
.../TraCI4Matlab/+traci/+vehicle/rerouteEffort.m | 19 -
.../+traci/+vehicle/rerouteTraveltime.m | 19 -
.../+traci/+vehicle/setAdaptedTraveltime.m | 24 -
.../TraCI4Matlab/+traci/+vehicle/setEffort.m | 24 -
.../TraCI4Matlab/+traci/+vehicle/setRoute.m | 28 -
.../TraCI4Matlab/+traci/+vehicle/setStop.m | 38 -
.../TraCI4Matlab/+traci/+vehicle/slowDown.m | 19 -
.../TraCI4Matlab/+traci/RETURN_VALUE_FUNC.m | 214 -
tools/contributed/TraCI4Matlab/+traci/Storage.m | 69 -
.../contributed/TraCI4Matlab/+traci/beginMessage.m | 29 -
.../contributed/TraCI4Matlab/+traci/checkResult.m | 32 -
tools/contributed/TraCI4Matlab/+traci/close.m | 27 -
tools/contributed/TraCI4Matlab/+traci/constants.m | 657 --
tools/contributed/TraCI4Matlab/+traci/getVersion.m | 33 -
tools/contributed/TraCI4Matlab/+traci/init.m | 65 -
.../TraCI4Matlab/+traci/readSubscription.m | 133 -
tools/contributed/TraCI4Matlab/+traci/recvExact.m | 37 -
.../TraCI4Matlab/+traci/sendDoubleCmd.m | 14 -
tools/contributed/TraCI4Matlab/+traci/sendExact.m | 56 -
tools/contributed/TraCI4Matlab/+traci/sendIntCmd.m | 14 -
.../TraCI4Matlab/+traci/sendStringCmd.m | 18 -
.../TraCI4Matlab/+traci/simulationStep.m | 58 -
tools/contributed/TraCI4Matlab/+traci/subscribe.m | 36 -
.../TraCI4Matlab/+traci/subscribeContext.m | 51 -
.../+traci/+areal/getContextSubscriptionResults.m | 26 +
.../TraCI4Matlab/+traci/+areal/getIDCount.m | 10 +
.../TraCI4Matlab/+traci/+areal/getIDList.m | 12 +
.../+traci/+areal/getJamLengthMeters.m | 13 +
.../+traci/+areal/getJamLengthVehicle.m | 13 +
.../+traci/+areal/getLastStepMeanSpeed.m | 12 +
.../+traci/+areal/getLastStepOccupancy.m | 12 +
.../+traci/+areal/getSubscriptionResults.m | 26 +
.../TraCI4Matlab/+traci/+areal/getUniversal.m | 25 +
.../TraCI4Matlab/+traci/+areal/subscribe.m | 43 +
.../TraCI4Matlab/+traci/+areal/subscribeContext.m | 51 +
.../TraCI4Matlab/+traci/+edge/adaptTraveltime.m | 17 +
.../+traci/+edge/getAdaptedTraveltime.m | 19 +
.../+traci/+edge/getCO2Emission.m | 0
.../+traci/+edge/getCOEmission.m | 0
.../+traci/+edge/getContextSubscriptionResults.m | 0
.../TraCI4Matlab/+traci/+edge/getEffort.m | 19 +
.../+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 | 17 +
.../{ => 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 | 16 +
.../TraCI4Matlab/+traci/+gui/setOffset.m | 15 +
.../{ => 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 | 22 +
.../TraCI4Matlab/+traci/+lane/setDisallowed.m | 21 +
.../{ => 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/TraCI4Matlab/+traci/+poi/add.m | 36 +
.../{ => 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/TraCI4Matlab/+traci/+poi/remove.m | 18 +
.../{ => TraCI4Matlab}/+traci/+poi/setColor.m | 0
.../TraCI4Matlab/+traci/+poi/setPosition.m | 14 +
.../TraCI4Matlab/+traci/+poi/setType.m | 15 +
.../{ => TraCI4Matlab}/+traci/+poi/subscribe.m | 0
.../+traci/+poi/subscribeContext.m | 0
.../TraCI4Matlab/+traci/+polygon/add.m | 50 +
.../{ => 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 | 18 +
.../{ => TraCI4Matlab}/+traci/+polygon/setColor.m | 0
.../TraCI4Matlab/+traci/+polygon/setShape.m | 20 +
.../TraCI4Matlab/+traci/+polygon/setType.m | 15 +
.../{ => TraCI4Matlab}/+traci/+polygon/subscribe.m | 0
.../+traci/+polygon/subscribeContext.m | 0
.../TraCI4Matlab/TraCI4Matlab/+traci/+route/add.m | 22 +
.../+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
.../TraCI4Matlab/+traci/+simulation/convert2D.m | 38 +
.../TraCI4Matlab/+traci/+simulation/convertGeo.m | 38 +
.../TraCI4Matlab/+traci/+simulation/convertRoad.m | 38 +
.../+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 | 46 +
.../+traci/+simulation/getDistanceRoad.m | 36 +
.../+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 | 27 +
.../+traci/+trafficlights/getUniversal.m | 0
.../+traci/+trafficlights/readLinks.m | 0
.../+traci/+trafficlights/readLogics.m | 0
.../setCompleteRedYellowGreenDefinition.m | 44 +
.../+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 | 57 +
.../TraCI4Matlab/+traci/+vehicle/changeLane.m | 20 +
.../+traci/+vehicle/changeTarget.m | 0
.../{ => TraCI4Matlab}/+traci/+vehicle/getAccel.m | 0
.../+traci/+vehicle/getAdaptedTraveltime.m | 21 +
.../{ => 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 | 24 +
.../+traci/+vehicle/getDrivingDistance2D.m | 19 +
.../TraCI4Matlab/+traci/+vehicle/getEffort.m | 21 +
.../+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 | 21 +
.../TraCI4Matlab/+traci/+vehicle/moveToVTD.m | 22 +
.../+traci/+vehicle/readBestLanes.m | 0
.../{ => TraCI4Matlab}/+traci/+vehicle/remove.m | 0
.../TraCI4Matlab/+traci/+vehicle/rerouteEffort.m | 19 +
.../+traci/+vehicle/rerouteTraveltime.m | 19 +
.../{ => TraCI4Matlab}/+traci/+vehicle/setAccel.m | 0
.../+traci/+vehicle/setAdaptedTraveltime.m | 24 +
.../{ => TraCI4Matlab}/+traci/+vehicle/setColor.m | 0
.../{ => TraCI4Matlab}/+traci/+vehicle/setDecel.m | 0
.../TraCI4Matlab/+traci/+vehicle/setEffort.m | 24 +
.../+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 | 28 +
.../+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 | 38 +
.../{ => TraCI4Matlab}/+traci/+vehicle/setTau.m | 0
.../+traci/+vehicle/setVehicleClass.m | 0
.../{ => TraCI4Matlab}/+traci/+vehicle/setWidth.m | 0
.../TraCI4Matlab/+traci/+vehicle/slowDown.m | 19 +
.../{ => 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 | 222 +
.../TraCI4Matlab/TraCI4Matlab/+traci/Socket.m | 33 +
.../TraCI4Matlab/TraCI4Matlab/+traci/Storage.m | 70 +
.../+traci/SubscriptionResults.m | 0
.../TraCI4Matlab/+traci/beginMessage.m | 29 +
.../TraCI4Matlab/TraCI4Matlab/+traci/checkResult.m | 33 +
.../TraCI4Matlab/TraCI4Matlab/+traci/close.m | 28 +
.../TraCI4Matlab/TraCI4Matlab/+traci/constants.m | 675 ++
.../TraCI4Matlab/TraCI4Matlab/+traci/getVersion.m | 33 +
.../TraCI4Matlab/TraCI4Matlab/+traci/init.m | 70 +
.../TraCI4Matlab/TraCI4Matlab/+traci/packInt32.m | 14 +
.../TraCI4Matlab/TraCI4Matlab/+traci/packInt64.m | 10 +
.../TraCI4Matlab/+traci/readSubscription.m | 136 +
.../TraCI4Matlab/TraCI4Matlab/+traci/recvExact.m | 52 +
.../{ => TraCI4Matlab}/+traci/sendByteCmd.m | 0
.../TraCI4Matlab/+traci/sendDoubleCmd.m | 14 +
.../TraCI4Matlab/TraCI4Matlab/+traci/sendExact.m | 62 +
.../TraCI4Matlab/TraCI4Matlab/+traci/sendIntCmd.m | 14 +
.../+traci/sendReadOneStringCmd.m | 0
.../TraCI4Matlab/+traci/sendStringCmd.m | 18 +
.../TraCI4Matlab/+traci/simulationStep.m | 58 +
.../TraCI4Matlab/TraCI4Matlab/+traci/subscribe.m | 36 +
.../TraCI4Matlab/+traci/subscribeContext.m | 51 +
.../{ => TraCI4Matlab}/+traci/switchConnection.m | 0
.../{ => TraCI4Matlab}/+traci/time2steps.m | 0
.../{ => TraCI4Matlab}/examples/traci_test.m | 0
.../TraCI4Matlab/examples/traci_test2.m | 602 ++
.../TraCI4Matlab/{ => TraCI4Matlab}/license.txt | 0
.../TraCI4Matlab/examples/traci_test2.m | 564 --
.../TraCI4Matlab/examples/traci_test2_clean.m | 73 -
.../sumoplayer/convert_sumoplayer_op_2_lonlat.py | 24 +-
tools/contributed/traas/build.xml | 120 +-
.../traas/src/de/tudresden/sumo/cmd/Edge.java | 4 +-
.../src/de/tudresden/sumo/cmd/Inductionloop.java | 3 +-
.../traas/src/de/tudresden/sumo/cmd/Lane.java | 4 +-
.../traas/src/de/tudresden/sumo/cmd/Poi.java | 2 +-
.../traas/src/de/tudresden/sumo/cmd/Route.java | 3 +-
.../src/de/tudresden/sumo/cmd/Simulation.java | 2 +-
.../traas/src/de/tudresden/sumo/cmd/Vehicle.java | 48 +-
.../src/de/tudresden/sumo/config/Constants.java | 9 +
.../de/tudresden/sumo/util/CommandProcessor.java | 49 +-
.../src/de/tudresden/sumo/util/ConvertHelper.java | 53 +
.../src/de/tudresden/sumo/util/SumoCommand.java | 54 +-
.../traas/src/de/tudresden/ws/Traci.java | 81 +-
.../de/tudresden/ws/container/SumoBoundingBox.java | 4 +
.../src/de/tudresden/ws/container/SumoColor.java | 5 +
.../src/de/tudresden/ws/container/SumoLink.java | 45 +-
.../de/tudresden/ws/container/SumoLinkList.java | 9 +
.../de/tudresden/ws/container/SumoPosition2D.java | 3 +
.../de/tudresden/ws/container/SumoPosition3D.java | 49 +
.../de/tudresden/ws/container/SumoTLSLogic.java | 11 +
.../de/tudresden/ws/container/SumoTLSPhase.java | 4 +
.../appeal/traci/protocol/ResponseMessage.java | 11 +-
.../appeal/traci/examples/TcpNoDelayControl.java | 138 +
.../polito/appeal/traci/SumoTraciConnection.java | 71 +-
.../polito/appeal/traci/test/TraCIServerTest.java | 3 +-
.../appeal/traci/test/TrafficLightsTest.java | 1 -
tools/contributed/trafficmodeler/build.sh | 2 +-
tools/detector/detector.py | 3 +-
tools/detector/flowFromRoutes.py | 4 +-
tools/detector/validate.py | 140 +
tools/district/countConnectionsInDistricts.py | 3 +-
tools/district/districtMapper.py | 5 +-
tools/district/edgesInDistricts.py | 52 +-
tools/docs/buildHTMLDocs.py | 3 +-
tools/docs/configTemplateToWiki.py | 5 +-
tools/docs/mirrorWiki.py | 5 +-
tools/game/bs3d.sumocfg | 21 +
tools/game/bs3d/bs.net.xml | 10072 +++++++++++++++++++
tools/game/bs3d/bs.netccfg | 20 +
tools/game/bs3d/bs3.3ds | Bin 0 -> 1187423 bytes
tools/game/bs3d/bs3d.rou.xml | 43 +
tools/game/bs3d/bsplain.con.xml | 50 +
tools/game/bs3d/bsplain.edg.xml | 1045 ++
tools/game/bs3d/bsplain.nod.xml | 232 +
tools/game/bs3d/bsplain.tll.xml | 24 +
tools/game/bs3d/view_B.xml | 204 +
tools/game/cross/cross.rou.xml | 43 +-
tools/game/cross/cross.settings.xml | 6 +
tools/game/cross/cross3d.settings.xml | 5 +-
tools/game/cross_demo.sumocfg | 16 +
tools/game/highway/highway.net.xml | 474 +
tools/game/highway/highway.rou.xml | 13 +
tools/game/highway/highway_bremen.gif | Bin 0 -> 992716 bytes
tools/game/highway/settings.xml | 88 +
tools/game/input_additional.add.xml | 2 +-
tools/game/ramp.sumocfg | 21 +
tools/game/ramp/ramp.net.xml | 219 +
tools/game/ramp/ramp.rou.xml | 17 +
tools/game/ramp/ramp_settings.xml | 180 +
tools/game/runner.py | 118 +-
tools/game/setup.py | 31 +-
tools/game/sounds/car_horn1.wav | Bin 0 -> 568464 bytes
tools/game/sounds/car_horn2.wav | Bin 0 -> 932488 bytes
tools/game/sounds/car_horn3.wav | Bin 0 -> 762492 bytes
tools/game/sounds/license.txt | 3 +
tools/game/square/settings.xml | 5 +
tools/game/square/square.rou.xml | 6 +-
tools/generate-ns2.py | 28 +-
tools/import/osm/osmBuild.py | 18 +-
tools/import/osm/osmPopulationExtractor.py | 5 +-
tools/import/vissim/vissim_parseBusStops.py | 3 +-
tools/lib/rmsd.py | 18 +
tools/net/OrderedMultiSet.py | 3 +-
tools/net/netcheck.py | 5 +-
tools/net/netdiff.py | 4 +-
tools/net/netduplicate.py | 3 +-
tools/net/odConnectionsCheck.py | 7 +-
tools/net/xmlconnections_mapEdges.py | 3 +-
tools/net/xmledges_applyOffset.py | 3 +-
tools/net/xmlnodes_applyOffset.py | 3 +-
tools/output/analyze_teleports.py | 5 +-
tools/output/generateMeanDataDefinitions.py | 19 +-
tools/output/vehroute2amitranOD.py | 90 +
tools/output/vehrouteDiff.py | 5 +-
.../TaxiFCD_Krieg/src/analysis/__init__.py | 20 +
.../projects/TaxiFCD_Krieg/src/backup/__init__.py | 20 +
.../TaxiFCD_Krieg/src/fcdQuality/__init__.py | 20 +
.../TaxiFCD_Krieg/src/fcdToRoutes/__init__.py | 20 +
tools/projects/TaxiFCD_Krieg/src/util/__init__.py | 20 +
tools/route/extract_route_edges.py | 5 +-
tools/route/kShortest.py | 3 +-
tools/route/route2poly.py | 5 +-
tools/route/routecheck.py | 4 +-
tools/route/routes_Join.py | 3 +-
tools/route/sort_routes.py | 12 +-
tools/shapes/CSV2polyconvertXML.py | 1 +
tools/sumolib/__init__.py | 4 +-
tools/sumolib/color.py | 15 +-
tools/sumolib/files/__init__.py | 6 +-
tools/sumolib/files/additional.py | 16 +
tools/sumolib/files/selection.py | 16 +
tools/sumolib/geomhelper.py | 6 +-
tools/sumolib/miscutils.py | 21 +-
tools/sumolib/net/__init__.py | 44 +-
tools/sumolib/net/connection.py | 5 +-
tools/sumolib/net/edge.py | 5 +-
tools/sumolib/net/lane.py | 39 +-
tools/sumolib/net/node.py | 5 +-
tools/sumolib/options.py | 5 +-
tools/sumolib/output/__init__.py | 29 +-
tools/sumolib/output/convert/__init__.py | 5 +-
tools/sumolib/output/convert/gpsdat.py | 3 +-
tools/sumolib/output/convert/gpx.py | 3 +-
tools/sumolib/output/convert/ns2.py | 20 +-
tools/sumolib/output/convert/omnet.py | 3 +-
tools/sumolib/output/convert/phem.py | 14 +-
tools/sumolib/output/convert/poi.py | 3 +-
tools/sumolib/output/convert/shawn.py | 3 +-
tools/sumolib/output/dump.py | 64 +-
tools/sumolib/output/inductionloop.py | 18 +
tools/sumolib/sensors/__init__.py | 6 +-
tools/sumolib/sensors/inductive_loop.py | 3 +-
tools/sumolib/shapes/__init__.py | 5 +-
tools/sumolib/shapes/poi.py | 4 +-
tools/sumolib/shapes/polygon.py | 21 +-
tools/tls/tls_csv2SUMO.py | 7 +-
tools/traci/__init__.py | 5 +-
tools/traci/areal.py | 3 +-
tools/traci/constants.py | 11 +-
tools/traci/edge.py | 3 +-
tools/traci/junction.py | 4 +-
tools/traci/lane.py | 4 +-
tools/traci/simulation.py | 6 +-
tools/traci/vehicle.py | 18 +-
tools/trip/generateTripsXml.py | 10 +-
tools/trip/randomTrips.py | 107 +-
tools/turn-defs/connections.py | 3 +-
tools/turn-defs/turndefinitions.py | 3 +-
tools/visualization/helpers.py | 5 +-
tools/visualization/mpl_dump_onNet.py | 5 +-
tools/visualization/plot_csv_pie.py | 5 +-
tools/visualization/plot_csv_timeline.py | 5 +-
tools/visualization/plot_net_dump.py | 16 +
tools/visualization/plot_net_selection.py | 16 +
tools/visualization/plot_net_speeds.py | 16 +
tools/visualization/plot_net_trafficLights.py | 16 +
tools/visualization/plot_summary.py | 5 +-
tools/visualization/plot_tripinfo_distributions.py | 5 +-
tools/xml/csv2xml.py | 3 +-
tools/xml/protobuf2xml.py | 52 +-
tools/xml/rebuildSchemata.py | 4 +-
tools/xml/schemaCheck.py | 3 +-
tools/xml/xml2csv.py | 12 +-
tools/xml/xml2protobuf.py | 53 +-
tools_filelist | 696 +-
unittest/src/Makefile.am | 10 +-
unittest/src/Makefile.in | 22 +-
unittest/src/microsim/MSCFModelTest.cpp | 27 +-
unittest/src/microsim/MSEventControlTest.cpp | 25 +-
unittest/src/netbuild/NBTrafficLightLogicTest.cpp | 25 +-
unittest/src/unittest_main.cpp | 11 +-
unittest/src/utils/common/CommandMock.h | 21 +
unittest/src/utils/common/RGBColorTest.cpp | 12 +-
unittest/src/utils/common/StringTokenizerTest.cpp | 21 +
unittest/src/utils/common/StringUtilsTest.cpp | 12 +-
unittest/src/utils/common/TplConvertTest.cpp | 12 +-
unittest/src/utils/common/ValueTimeLineTest.cpp | 13 +-
unittest/src/utils/geom/BoundaryTest.cpp | 24 +-
unittest/src/utils/geom/GeoConvHelperTest.cpp | 21 +
unittest/src/utils/geom/GeomHelperTest.cpp | 25 +-
unittest/src/utils/geom/LineTest.cpp | 25 +-
unittest/src/utils/geom/PositionVectorTest.cpp | 26 +-
1551 files changed, 32986 insertions(+), 79369 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