[sumo] branch master updated (967d4d9 -> 7893ad2)

Anton Gladky gladk at moszumanska.debian.org
Sun Jul 23 14:24:00 UTC 2017


This is an automated email from the git hooks/post-receive script.

gladk pushed a change to branch master
in repository sumo.

      from  967d4d9   Update changelog.
      adds  78f2092   New upstream version 0.30.0+dfsg1
       new  f48bd48   Updated version 0.30.0+dfsg1 from 'upstream/0.30.0+dfsg1'
       new  07cc5b1   Refresh patches.
       new  c29b854   Bump Standards-Version: 4.0.0
       new  7893ad2   Update changelog.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitignore                                         |     1 -
 AUTHORS                                            |     5 +-
 Makefile.am                                        |     8 +-
 Makefile.in                                        |     3 +
 README                                             |     6 +-
 bin/Makefile.am                                    |     3 -
 bin/Makefile.in                                    |     3 -
 configure                                          |   109 +-
 configure.ac                                       |    43 +-
 data/xsd/activitygenConfiguration.xsd              |     2 +
 data/xsd/additional_file.xsd                       |    35 +
 data/xsd/amitran/linkdata.xsd                      |    70 +-
 data/xsd/baseTypes.xsd                             |    47 +-
 data/xsd/calibratorstats_file.xsd                  |    30 +
 data/xsd/det_e1meso_file.xsd                       |    52 +
 data/xsd/det_e2_file.xsd                           |     1 +
 data/xsd/det_e3_file.xsd                           |     2 +
 data/xsd/detectors_file.xsd                        |    31 +
 data/xsd/dfrouterConfiguration.xsd                 |     2 +
 data/xsd/duarouterConfiguration.xsd                |     3 +
 data/xsd/edgediff_file.xsd                         |    12 +-
 data/xsd/edges_file.xsd                            |    19 +-
 data/xsd/instant_e1_file.xsd                       |    35 +
 data/xsd/jtrrouterConfiguration.xsd                |     2 +
 data/xsd/marouterConfiguration.xsd                 |     2 +
 data/xsd/net_file.xsd                              |    21 +-
 data/xsd/netconvertConfiguration.xsd               |    15 +
 data/xsd/netgenerateConfiguration.xsd              |     5 +
 data/xsd/nodes_file.xsd                            |     2 +-
 data/xsd/od2tripsConfiguration.xsd                 |     3 +
 data/xsd/polyconvertConfiguration.xsd              |     3 +
 data/xsd/routeTypes.xsd                            |    28 +-
 data/xsd/state_file.xsd                            |   117 +
 data/xsd/stopinfo_file.xsd                         |    36 +
 data/xsd/sumoConfiguration.xsd                     |    24 +
 data/xsd/tllogic_file.xsd                          |     2 +-
 data/xsd/tlsstates_file.xsd                        |    24 +
 data/xsd/tlsswitches_file.xsd                      |    24 +
 data/xsd/tripinfo_file.xsd                         |     2 +
 data/xsd/turns_file.xsd                            |     4 +-
 data/xsd/vtypeprobe_file.xsd                       |    16 +
 debian/changelog                                   |     8 +
 debian/control                                     |     2 +-
 debian/patches/10_remove_embedded_gl2ps.patch      |   120 +-
 debian/patches/20_fix_scripts_headers.patch        |    10 +
 debian/patches/30_add_missing_link.patch           |    14 +-
 debian/patches/40_drop_some_buildflags.patch       |     8 +-
 debian/patches/50_use_system_openlayers.patch      |     6 +-
 debian/patches/60_fix_format_not_a_string.patch    |    48 -
 debian/patches/series                              |     1 -
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../OSM/adlershof_dlr/data/xsd/additional_file.xsd |    35 +
 .../adlershof_dlr/data/xsd/amitran/linkdata.xsd    |    70 +-
 .../OSM/adlershof_dlr/data/xsd/baseTypes.xsd       |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../OSM/adlershof_dlr/data/xsd/det_e1meso_file.xsd |    52 +
 .../OSM/adlershof_dlr/data/xsd/det_e2_file.xsd     |     1 +
 .../OSM/adlershof_dlr/data/xsd/det_e3_file.xsd     |     2 +
 .../OSM/adlershof_dlr/data/xsd/detectors_file.xsd  |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../OSM/adlershof_dlr/data/xsd/edgediff_file.xsd   |    12 +-
 .../OSM/adlershof_dlr/data/xsd/edges_file.xsd      |    19 +-
 .../OSM/adlershof_dlr/data/xsd/instant_e1_file.xsd |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../OSM/adlershof_dlr/data/xsd/net_file.xsd        |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../OSM/adlershof_dlr/data/xsd/nodes_file.xsd      |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../OSM/adlershof_dlr/data/xsd/routeTypes.xsd      |    27 +-
 .../OSM/adlershof_dlr/data/xsd/state_file.xsd      |   117 +
 .../OSM/adlershof_dlr/data/xsd/stopinfo_file.xsd   |    36 +
 .../adlershof_dlr/data/xsd/sumoConfiguration.xsd   |    24 +
 .../OSM/adlershof_dlr/data/xsd/tllogic_file.xsd    |     2 +-
 .../OSM/adlershof_dlr/data/xsd/tlsstates_file.xsd  |    24 +
 .../adlershof_dlr/data/xsd/tlsswitches_file.xsd    |    24 +
 .../OSM/adlershof_dlr/data/xsd/tripinfo_file.xsd   |     2 +
 .../OSM/adlershof_dlr/data/xsd/turns_file.xsd      |     4 +-
 .../OSM/adlershof_dlr/data/xsd/vtypeprobe_file.xsd |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../data/xsd/additional_file.xsd                   |    35 +
 .../data/xsd/amitran/linkdata.xsd                  |    70 +-
 .../cross3l_edge2edge_conns/data/xsd/baseTypes.xsd |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../data/xsd/det_e1meso_file.xsd                   |    52 +
 .../data/xsd/det_e2_file.xsd                       |     1 +
 .../data/xsd/det_e3_file.xsd                       |     2 +
 .../data/xsd/detectors_file.xsd                    |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../data/xsd/edgediff_file.xsd                     |    12 +-
 .../data/xsd/edges_file.xsd                        |    19 +-
 .../data/xsd/instant_e1_file.xsd                   |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../cross3l_edge2edge_conns/data/xsd/net_file.xsd  |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../data/xsd/nodes_file.xsd                        |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../data/xsd/routeTypes.xsd                        |    27 +-
 .../data/xsd/state_file.xsd                        |   117 +
 .../data/xsd/stopinfo_file.xsd                     |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../data/xsd/tllogic_file.xsd                      |     2 +-
 .../data/xsd/tlsstates_file.xsd                    |    24 +
 .../data/xsd/tlsswitches_file.xsd                  |    24 +
 .../data/xsd/tripinfo_file.xsd                     |     2 +
 .../data/xsd/turns_file.xsd                        |     4 +-
 .../data/xsd/vtypeprobe_file.xsd                   |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../data/xsd/additional_file.xsd                   |    35 +
 .../data/xsd/amitran/linkdata.xsd                  |    70 +-
 .../cross3l_lane2lane_conns/data/xsd/baseTypes.xsd |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../data/xsd/det_e1meso_file.xsd                   |    52 +
 .../data/xsd/det_e2_file.xsd                       |     1 +
 .../data/xsd/det_e3_file.xsd                       |     2 +
 .../data/xsd/detectors_file.xsd                    |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../data/xsd/edgediff_file.xsd                     |    12 +-
 .../data/xsd/edges_file.xsd                        |    19 +-
 .../data/xsd/instant_e1_file.xsd                   |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../cross3l_lane2lane_conns/data/xsd/net_file.xsd  |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../data/xsd/nodes_file.xsd                        |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../data/xsd/routeTypes.xsd                        |    27 +-
 .../data/xsd/state_file.xsd                        |   117 +
 .../data/xsd/stopinfo_file.xsd                     |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../data/xsd/tllogic_file.xsd                      |     2 +-
 .../data/xsd/tlsstates_file.xsd                    |    24 +
 .../data/xsd/tlsswitches_file.xsd                  |    24 +
 .../data/xsd/tripinfo_file.xsd                     |     2 +
 .../data/xsd/turns_file.xsd                        |     4 +-
 .../data/xsd/vtypeprobe_file.xsd                   |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../data/xsd/additional_file.xsd                   |    35 +
 .../data/xsd/amitran/linkdata.xsd                  |    70 +-
 .../cross3l_no_turnarounds/data/xsd/baseTypes.xsd  |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../data/xsd/det_e1meso_file.xsd                   |    52 +
 .../data/xsd/det_e2_file.xsd                       |     1 +
 .../data/xsd/det_e3_file.xsd                       |     2 +
 .../data/xsd/detectors_file.xsd                    |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../data/xsd/edgediff_file.xsd                     |    12 +-
 .../cross3l_no_turnarounds/data/xsd/edges_file.xsd |    19 +-
 .../data/xsd/instant_e1_file.xsd                   |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../cross3l_no_turnarounds/data/xsd/net_file.xsd   |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../cross3l_no_turnarounds/data/xsd/nodes_file.xsd |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../cross3l_no_turnarounds/data/xsd/routeTypes.xsd |    27 +-
 .../cross3l_no_turnarounds/data/xsd/state_file.xsd |   117 +
 .../data/xsd/stopinfo_file.xsd                     |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../data/xsd/tllogic_file.xsd                      |     2 +-
 .../data/xsd/tlsstates_file.xsd                    |    24 +
 .../data/xsd/tlsswitches_file.xsd                  |    24 +
 .../data/xsd/tripinfo_file.xsd                     |     2 +
 .../cross3l_no_turnarounds/data/xsd/turns_file.xsd |     4 +-
 .../data/xsd/vtypeprobe_file.xsd                   |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../data/xsd/additional_file.xsd                   |    35 +
 .../data/xsd/amitran/linkdata.xsd                  |    70 +-
 .../cross3l_prohibitions/data/xsd/baseTypes.xsd    |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../data/xsd/det_e1meso_file.xsd                   |    52 +
 .../cross3l_prohibitions/data/xsd/det_e2_file.xsd  |     1 +
 .../cross3l_prohibitions/data/xsd/det_e3_file.xsd  |     2 +
 .../data/xsd/detectors_file.xsd                    |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../data/xsd/edgediff_file.xsd                     |    12 +-
 .../cross3l_prohibitions/data/xsd/edges_file.xsd   |    19 +-
 .../data/xsd/instant_e1_file.xsd                   |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../cross3l_prohibitions/data/xsd/net_file.xsd     |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../cross3l_prohibitions/data/xsd/nodes_file.xsd   |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../cross3l_prohibitions/data/xsd/routeTypes.xsd   |    27 +-
 .../cross3l_prohibitions/data/xsd/state_file.xsd   |   117 +
 .../data/xsd/stopinfo_file.xsd                     |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../cross3l_prohibitions/data/xsd/tllogic_file.xsd |     2 +-
 .../data/xsd/tlsstates_file.xsd                    |    24 +
 .../data/xsd/tlsswitches_file.xsd                  |    24 +
 .../data/xsd/tripinfo_file.xsd                     |     2 +
 .../cross3l_prohibitions/data/xsd/turns_file.xsd   |     4 +-
 .../data/xsd/vtypeprobe_file.xsd                   |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../data/xsd/additional_file.xsd                   |    35 +
 .../data/xsd/amitran/linkdata.xsd                  |    70 +-
 .../cross3l_unconstrained/data/xsd/baseTypes.xsd   |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../data/xsd/det_e1meso_file.xsd                   |    52 +
 .../cross3l_unconstrained/data/xsd/det_e2_file.xsd |     1 +
 .../cross3l_unconstrained/data/xsd/det_e3_file.xsd |     2 +
 .../data/xsd/detectors_file.xsd                    |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../data/xsd/edgediff_file.xsd                     |    12 +-
 .../cross3l_unconstrained/data/xsd/edges_file.xsd  |    19 +-
 .../data/xsd/instant_e1_file.xsd                   |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../cross3l_unconstrained/data/xsd/net_file.xsd    |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../cross3l_unconstrained/data/xsd/nodes_file.xsd  |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../cross3l_unconstrained/data/xsd/routeTypes.xsd  |    27 +-
 .../cross3l_unconstrained/data/xsd/state_file.xsd  |   117 +
 .../data/xsd/stopinfo_file.xsd                     |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../data/xsd/tllogic_file.xsd                      |     2 +-
 .../data/xsd/tlsstates_file.xsd                    |    24 +
 .../data/xsd/tlsswitches_file.xsd                  |    24 +
 .../data/xsd/tripinfo_file.xsd                     |     2 +
 .../cross3l_unconstrained/data/xsd/turns_file.xsd  |     4 +-
 .../data/xsd/vtypeprobe_file.xsd                   |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../dlr-testtrack/data/xsd/additional_file.xsd     |    35 +
 .../dlr-testtrack/data/xsd/amitran/linkdata.xsd    |    70 +-
 .../dlr-testtrack/data/xsd/baseTypes.xsd           |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../dlr-testtrack/data/xsd/det_e1meso_file.xsd     |    52 +
 .../dlr-testtrack/data/xsd/det_e2_file.xsd         |     1 +
 .../dlr-testtrack/data/xsd/det_e3_file.xsd         |     2 +
 .../dlr-testtrack/data/xsd/detectors_file.xsd      |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../dlr-testtrack/data/xsd/edgediff_file.xsd       |    12 +-
 .../dlr-testtrack/data/xsd/edges_file.xsd          |    19 +-
 .../dlr-testtrack/data/xsd/instant_e1_file.xsd     |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../netconvert/dlr-testtrack/data/xsd/net_file.xsd |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../dlr-testtrack/data/xsd/nodes_file.xsd          |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../dlr-testtrack/data/xsd/routeTypes.xsd          |    27 +-
 .../dlr-testtrack/data/xsd/state_file.xsd          |   117 +
 .../dlr-testtrack/data/xsd/stopinfo_file.xsd       |    36 +
 .../dlr-testtrack/data/xsd/sumoConfiguration.xsd   |    24 +
 .../dlr-testtrack/data/xsd/tllogic_file.xsd        |     2 +-
 .../dlr-testtrack/data/xsd/tlsstates_file.xsd      |    24 +
 .../dlr-testtrack/data/xsd/tlsswitches_file.xsd    |    24 +
 .../dlr-testtrack/data/xsd/tripinfo_file.xsd       |     2 +
 .../dlr-testtrack/data/xsd/turns_file.xsd          |     4 +-
 .../dlr-testtrack/data/xsd/vtypeprobe_file.xsd     |    16 +
 .../dlr-testtrack/input_connections.con.xml        |    10 +-
 .../hokkaido/data/xsd/activitygenConfiguration.xsd |     2 +
 .../hokkaido/data/xsd/additional_file.xsd          |    35 +
 .../hokkaido/data/xsd/amitran/linkdata.xsd         |    70 +-
 .../netconvert/hokkaido/data/xsd/baseTypes.xsd     |    47 +-
 .../hokkaido/data/xsd/calibratorstats_file.xsd     |    30 +
 .../hokkaido/data/xsd/det_e1meso_file.xsd          |    52 +
 .../netconvert/hokkaido/data/xsd/det_e2_file.xsd   |     1 +
 .../netconvert/hokkaido/data/xsd/det_e3_file.xsd   |     2 +
 .../hokkaido/data/xsd/detectors_file.xsd           |    31 +
 .../hokkaido/data/xsd/dfrouterConfiguration.xsd    |     2 +
 .../hokkaido/data/xsd/duarouterConfiguration.xsd   |     3 +
 .../netconvert/hokkaido/data/xsd/edgediff_file.xsd |    12 +-
 .../netconvert/hokkaido/data/xsd/edges_file.xsd    |    19 +-
 .../hokkaido/data/xsd/instant_e1_file.xsd          |    35 +
 .../hokkaido/data/xsd/jtrrouterConfiguration.xsd   |     2 +
 .../hokkaido/data/xsd/marouterConfiguration.xsd    |     2 +
 .../netconvert/hokkaido/data/xsd/net_file.xsd      |    21 +-
 .../hokkaido/data/xsd/netconvertConfiguration.xsd  |    15 +
 .../hokkaido/data/xsd/netgenerateConfiguration.xsd |     5 +
 .../netconvert/hokkaido/data/xsd/nodes_file.xsd    |     2 +-
 .../hokkaido/data/xsd/od2tripsConfiguration.xsd    |     3 +
 .../hokkaido/data/xsd/polyconvertConfiguration.xsd |     3 +
 .../netconvert/hokkaido/data/xsd/routeTypes.xsd    |    27 +-
 .../netconvert/hokkaido/data/xsd/state_file.xsd    |   117 +
 .../netconvert/hokkaido/data/xsd/stopinfo_file.xsd |    36 +
 .../hokkaido/data/xsd/sumoConfiguration.xsd        |    24 +
 .../netconvert/hokkaido/data/xsd/tllogic_file.xsd  |     2 +-
 .../hokkaido/data/xsd/tlsstates_file.xsd           |    24 +
 .../hokkaido/data/xsd/tlsswitches_file.xsd         |    24 +
 .../netconvert/hokkaido/data/xsd/tripinfo_file.xsd |     2 +
 .../netconvert/hokkaido/data/xsd/turns_file.xsd    |     4 +-
 .../hokkaido/data/xsd/vtypeprobe_file.xsd          |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../cross_notypes_kmh/data/xsd/additional_file.xsd |    35 +
 .../data/xsd/amitran/linkdata.xsd                  |    70 +-
 .../cross_notypes_kmh/data/xsd/baseTypes.xsd       |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../cross_notypes_kmh/data/xsd/det_e1meso_file.xsd |    52 +
 .../cross_notypes_kmh/data/xsd/det_e2_file.xsd     |     1 +
 .../cross_notypes_kmh/data/xsd/det_e3_file.xsd     |     2 +
 .../cross_notypes_kmh/data/xsd/detectors_file.xsd  |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../cross_notypes_kmh/data/xsd/edgediff_file.xsd   |    12 +-
 .../cross_notypes_kmh/data/xsd/edges_file.xsd      |    19 +-
 .../cross_notypes_kmh/data/xsd/instant_e1_file.xsd |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../cross_notypes_kmh/data/xsd/net_file.xsd        |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../cross_notypes_kmh/data/xsd/nodes_file.xsd      |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../cross_notypes_kmh/data/xsd/routeTypes.xsd      |    27 +-
 .../cross_notypes_kmh/data/xsd/state_file.xsd      |   117 +
 .../cross_notypes_kmh/data/xsd/stopinfo_file.xsd   |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../cross_notypes_kmh/data/xsd/tllogic_file.xsd    |     2 +-
 .../cross_notypes_kmh/data/xsd/tlsstates_file.xsd  |    24 +
 .../data/xsd/tlsswitches_file.xsd                  |    24 +
 .../cross_notypes_kmh/data/xsd/tripinfo_file.xsd   |     2 +
 .../cross_notypes_kmh/data/xsd/turns_file.xsd      |     4 +-
 .../cross_notypes_kmh/data/xsd/vtypeprobe_file.xsd |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../data/xsd/additional_file.xsd                   |    35 +
 .../data/xsd/amitran/linkdata.xsd                  |    70 +-
 .../cross_usingtypes_kmh/data/xsd/baseTypes.xsd    |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../data/xsd/det_e1meso_file.xsd                   |    52 +
 .../cross_usingtypes_kmh/data/xsd/det_e2_file.xsd  |     1 +
 .../cross_usingtypes_kmh/data/xsd/det_e3_file.xsd  |     2 +
 .../data/xsd/detectors_file.xsd                    |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../data/xsd/edgediff_file.xsd                     |    12 +-
 .../cross_usingtypes_kmh/data/xsd/edges_file.xsd   |    19 +-
 .../data/xsd/instant_e1_file.xsd                   |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../cross_usingtypes_kmh/data/xsd/net_file.xsd     |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../cross_usingtypes_kmh/data/xsd/nodes_file.xsd   |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../cross_usingtypes_kmh/data/xsd/routeTypes.xsd   |    27 +-
 .../cross_usingtypes_kmh/data/xsd/state_file.xsd   |   117 +
 .../data/xsd/stopinfo_file.xsd                     |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../cross_usingtypes_kmh/data/xsd/tllogic_file.xsd |     2 +-
 .../data/xsd/tlsstates_file.xsd                    |    24 +
 .../data/xsd/tlsswitches_file.xsd                  |    24 +
 .../data/xsd/tripinfo_file.xsd                     |     2 +
 .../cross_usingtypes_kmh/data/xsd/turns_file.xsd   |     4 +-
 .../data/xsd/vtypeprobe_file.xsd                   |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../cross_notypes/data/xsd/additional_file.xsd     |    35 +
 .../cross_notypes/data/xsd/amitran/linkdata.xsd    |    70 +-
 .../types/cross_notypes/data/xsd/baseTypes.xsd     |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../cross_notypes/data/xsd/det_e1meso_file.xsd     |    52 +
 .../types/cross_notypes/data/xsd/det_e2_file.xsd   |     1 +
 .../types/cross_notypes/data/xsd/det_e3_file.xsd   |     2 +
 .../cross_notypes/data/xsd/detectors_file.xsd      |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../types/cross_notypes/data/xsd/edgediff_file.xsd |    12 +-
 .../types/cross_notypes/data/xsd/edges_file.xsd    |    19 +-
 .../cross_notypes/data/xsd/instant_e1_file.xsd     |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../types/cross_notypes/data/xsd/net_file.xsd      |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../types/cross_notypes/data/xsd/nodes_file.xsd    |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../types/cross_notypes/data/xsd/routeTypes.xsd    |    27 +-
 .../types/cross_notypes/data/xsd/state_file.xsd    |   117 +
 .../types/cross_notypes/data/xsd/stopinfo_file.xsd |    36 +
 .../cross_notypes/data/xsd/sumoConfiguration.xsd   |    24 +
 .../types/cross_notypes/data/xsd/tllogic_file.xsd  |     2 +-
 .../cross_notypes/data/xsd/tlsstates_file.xsd      |    24 +
 .../cross_notypes/data/xsd/tlsswitches_file.xsd    |    24 +
 .../types/cross_notypes/data/xsd/tripinfo_file.xsd |     2 +
 .../types/cross_notypes/data/xsd/turns_file.xsd    |     4 +-
 .../cross_notypes/data/xsd/vtypeprobe_file.xsd     |    16 +
 .../data/xsd/activitygenConfiguration.xsd          |     2 +
 .../cross_usingtypes/data/xsd/additional_file.xsd  |    35 +
 .../cross_usingtypes/data/xsd/amitran/linkdata.xsd |    70 +-
 .../types/cross_usingtypes/data/xsd/baseTypes.xsd  |    47 +-
 .../data/xsd/calibratorstats_file.xsd              |    30 +
 .../cross_usingtypes/data/xsd/det_e1meso_file.xsd  |    52 +
 .../cross_usingtypes/data/xsd/det_e2_file.xsd      |     1 +
 .../cross_usingtypes/data/xsd/det_e3_file.xsd      |     2 +
 .../cross_usingtypes/data/xsd/detectors_file.xsd   |    31 +
 .../data/xsd/dfrouterConfiguration.xsd             |     2 +
 .../data/xsd/duarouterConfiguration.xsd            |     3 +
 .../cross_usingtypes/data/xsd/edgediff_file.xsd    |    12 +-
 .../types/cross_usingtypes/data/xsd/edges_file.xsd |    19 +-
 .../cross_usingtypes/data/xsd/instant_e1_file.xsd  |    35 +
 .../data/xsd/jtrrouterConfiguration.xsd            |     2 +
 .../data/xsd/marouterConfiguration.xsd             |     2 +
 .../types/cross_usingtypes/data/xsd/net_file.xsd   |    21 +-
 .../data/xsd/netconvertConfiguration.xsd           |    15 +
 .../data/xsd/netgenerateConfiguration.xsd          |     5 +
 .../types/cross_usingtypes/data/xsd/nodes_file.xsd |     2 +-
 .../data/xsd/od2tripsConfiguration.xsd             |     3 +
 .../data/xsd/polyconvertConfiguration.xsd          |     3 +
 .../types/cross_usingtypes/data/xsd/routeTypes.xsd |    27 +-
 .../types/cross_usingtypes/data/xsd/state_file.xsd |   117 +
 .../cross_usingtypes/data/xsd/stopinfo_file.xsd    |    36 +
 .../data/xsd/sumoConfiguration.xsd                 |    24 +
 .../cross_usingtypes/data/xsd/tllogic_file.xsd     |     2 +-
 .../cross_usingtypes/data/xsd/tlsstates_file.xsd   |    24 +
 .../cross_usingtypes/data/xsd/tlsswitches_file.xsd |    24 +
 .../cross_usingtypes/data/xsd/tripinfo_file.xsd    |     2 +
 .../types/cross_usingtypes/data/xsd/turns_file.xsd |     4 +-
 .../cross_usingtypes/data/xsd/vtypeprobe_file.xsd  |    16 +
 docs/tutorial/circles/data/circles.add.xml         |    13 +
 docs/tutorial/circles/data/circles.net.xml         |   124 +
 docs/tutorial/circles/data/circles.rou.xml         |     4 +
 docs/tutorial/circles/data/circles.sumocfg         |     7 +
 docs/tutorial/circles/runner.py                    |    42 +
 docs/tutorial/city_mobil/agentManager.py           |     4 +-
 docs/tutorial/city_mobil/constants.py              |     4 +-
 docs/tutorial/city_mobil/createNet.py              |     6 +-
 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/runner.py                      |     4 +-
 docs/tutorial/output_parsing/runner.py             |     4 +-
 docs/tutorial/quickstart/runner.py                 |     4 +-
 docs/tutorial/san_pablo_dam/data/analyzeData.py    |     4 +-
 docs/tutorial/san_pablo_dam/runner.py              |     4 +-
 docs/tutorial/san_pablo_dam/validate.py            |     4 +-
 .../sumolympics/data/makeSumolympicWalkers.py      |    20 +
 .../sumolympics/data/sumolympicWalks.rou.xml       |   602 +
 docs/tutorial/sumolympics/data/sumolympics.net.xml |    74 +
 docs/tutorial/sumolympics/data/sumolympics.rou.xml |    15 +
 docs/tutorial/sumolympics/data/sumolympics.sumocfg |    13 +
 docs/tutorial/sumolympics/runner.py                |    42 +
 docs/tutorial/traci_pedestrian_crossing/runner.py  |     4 +-
 docs/tutorial/traci_tls/embedded.py                |     4 +-
 docs/tutorial/traci_tls/runner.py                  |    13 +-
 src/Makefile.am                                    |    15 +-
 src/Makefile.in                                    |    34 +-
 src/activitygen/AGActivityGen.cpp                  |     8 +-
 src/activitygen/AGActivityGen.h                    |     4 +-
 src/activitygen/AGActivityGenHandler.cpp           |    34 +-
 src/activitygen/AGActivityGenHandler.h             |     4 +-
 src/activitygen/AGActivityTripWriter.cpp           |     4 +-
 src/activitygen/AGActivityTripWriter.h             |     4 +-
 src/activitygen/AGFrame.cpp                        |     4 +-
 src/activitygen/AGFrame.h                          |     4 +-
 src/activitygen/Makefile.am                        |     6 +-
 src/activitygen/Makefile.in                        |    10 +-
 src/activitygen/activities/AGActivities.cpp        |     4 +-
 src/activitygen/activities/AGActivities.h          |     4 +-
 src/activitygen/activities/AGActivity.cpp          |    10 +-
 src/activitygen/activities/AGActivity.h            |     8 +-
 src/activitygen/activities/AGFreeTime.cpp          |     8 +-
 src/activitygen/activities/AGFreeTime.h            |     6 +-
 src/activitygen/activities/AGTrip.cpp              |    14 +-
 src/activitygen/activities/AGTrip.h                |    12 +-
 src/activitygen/activities/AGWorkAndSchool.cpp     |     4 +-
 src/activitygen/activities/AGWorkAndSchool.h       |     4 +-
 src/activitygen/activitygen_main.cpp               |     8 +-
 src/activitygen/city/AGAdult.cpp                   |     6 +-
 src/activitygen/city/AGAdult.h                     |     6 +-
 src/activitygen/city/AGBus.cpp                     |     4 +-
 src/activitygen/city/AGBus.h                       |     4 +-
 src/activitygen/city/AGBusLine.cpp                 |     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                     |     4 +-
 src/activitygen/city/AGCity.cpp                    |    41 +-
 src/activitygen/city/AGCity.h                      |     4 +-
 src/activitygen/city/AGDataAndStatistics.cpp       |    64 +-
 src/activitygen/city/AGDataAndStatistics.h         |    52 +-
 src/activitygen/city/AGHousehold.cpp               |    10 +-
 src/activitygen/city/AGHousehold.h                 |     6 +-
 src/activitygen/city/AGPerson.cpp                  |     6 +-
 src/activitygen/city/AGPerson.h                    |     6 +-
 src/activitygen/city/AGPosition.cpp                |    24 +-
 src/activitygen/city/AGPosition.h                  |    18 +-
 src/activitygen/city/AGSchool.cpp                  |     4 +-
 src/activitygen/city/AGSchool.h                    |     4 +-
 src/activitygen/city/AGStreet.cpp                  |    12 +-
 src/activitygen/city/AGStreet.h                    |    16 +-
 src/activitygen/city/AGTime.cpp                    |     6 +-
 src/activitygen/city/AGTime.h                      |     6 +-
 src/activitygen/city/AGWorkPosition.cpp            |    18 +-
 src/activitygen/city/AGWorkPosition.h              |     6 +-
 src/config.h                                       |    27 +-
 src/config.h.in                                    |    15 -
 src/dfrouter/Makefile.am                           |     6 +-
 src/dfrouter/Makefile.in                           |     6 +-
 src/dfrouter/RODFDetFlowLoader.cpp                 |    18 +-
 src/dfrouter/RODFDetFlowLoader.h                   |     4 +-
 src/dfrouter/RODFDetector.cpp                      |   118 +-
 src/dfrouter/RODFDetector.h                        |    28 +-
 src/dfrouter/RODFDetectorFlow.cpp                  |    22 +-
 src/dfrouter/RODFDetectorFlow.h                    |    22 +-
 src/dfrouter/RODFDetectorHandler.cpp               |    10 +-
 src/dfrouter/RODFDetectorHandler.h                 |     4 +-
 src/dfrouter/RODFEdge.cpp                          |     8 +-
 src/dfrouter/RODFEdge.h                            |     4 +-
 src/dfrouter/RODFEdgeBuilder.cpp                   |     8 +-
 src/dfrouter/RODFEdgeBuilder.h                     |     4 +-
 src/dfrouter/RODFFrame.cpp                         |     8 +-
 src/dfrouter/RODFFrame.h                           |     4 +-
 src/dfrouter/RODFNet.cpp                           |   100 +-
 src/dfrouter/RODFNet.h                             |    22 +-
 src/dfrouter/RODFRouteCont.cpp                     |     8 +-
 src/dfrouter/RODFRouteCont.h                       |     4 +-
 src/dfrouter/RODFRouteDesc.h                       |    14 +-
 src/dfrouter/dfrouter_main.cpp                     |     8 +-
 src/duarouter/Makefile.am                          |     6 +-
 src/duarouter/Makefile.in                          |     6 +-
 src/duarouter/RODUAEdgeBuilder.cpp                 |     8 +-
 src/duarouter/RODUAEdgeBuilder.h                   |     4 +-
 src/duarouter/RODUAFrame.cpp                       |    21 +-
 src/duarouter/RODUAFrame.h                         |     4 +-
 src/duarouter/duarouter_main.cpp                   |    18 +-
 src/foreign/Makefile.am                            |     6 +-
 src/foreign/Makefile.in                            |     7 +-
 src/foreign/nvwa/Makefile.am                       |     3 -
 src/foreign/nvwa/Makefile.in                       |   615 -
 src/foreign/nvwa/debug_new.cpp                     |  1004 -
 src/foreign/nvwa/debug_new.h                       |   181 -
 src/foreign/nvwa/fast_mutex.h                      |   412 -
 src/foreign/nvwa/static_assert.h                   |    62 -
 src/foreign/polyfonts/pfPSansBold16.c              |     2 +-
 src/foreign/polyfonts/polyfonts.c                  |   106 +-
 src/foreign/polyfonts/polyfonts.h                  |    42 +-
 src/foreign/polyfonts/polyfonttypes.h              |    18 +-
 src/foreign/rtree/LayeredRTree.h                   |     4 +-
 src/foreign/rtree/SUMORTree.h                      |     4 +-
 src/gui/GUIApplicationWindow.cpp                   |   293 +-
 src/gui/GUIApplicationWindow.h                     |    18 +-
 src/gui/GUIEvent_Screenshot.h                      |     4 +-
 src/gui/GUIEvent_SimulationEnded.h                 |     4 +-
 src/gui/GUIEvent_SimulationLoaded.h                |     4 +-
 src/gui/GUIGlobals.cpp                             |     8 +-
 src/gui/GUIGlobals.h                               |     4 +-
 src/gui/GUILoadThread.cpp                          |    14 +-
 src/gui/GUILoadThread.h                            |     4 +-
 src/gui/GUIManipulator.cpp                         |    16 +-
 src/gui/GUIManipulator.h                           |     4 +-
 src/gui/GUIRunThread.cpp                           |    29 +-
 src/gui/GUIRunThread.h                             |     7 +-
 src/gui/GUISUMOViewParent.cpp                      |    11 +-
 src/gui/GUISUMOViewParent.h                        |     4 +-
 src/gui/GUITLLogicPhasesTrackerWindow.cpp          |    76 +-
 src/gui/GUITLLogicPhasesTrackerWindow.h            |    11 +-
 src/gui/GUIViewTraffic.cpp                         |    12 +-
 src/gui/GUIViewTraffic.h                           |     4 +-
 src/gui/TraCIServerAPI_GUI.cpp                     |    22 +-
 src/gui/TraCIServerAPI_GUI.h                       |     6 +-
 src/gui/dialogs/GUIDialog_AboutSUMO.cpp            |   115 +-
 src/gui/dialogs/GUIDialog_AboutSUMO.h              |    20 +-
 src/gui/dialogs/GUIDialog_AppSettings.cpp          |     8 +-
 src/gui/dialogs/GUIDialog_AppSettings.h            |     4 +-
 src/gui/dialogs/GUIDialog_Breakpoints.cpp          |    31 +-
 src/gui/dialogs/GUIDialog_Breakpoints.h            |     4 +-
 src/guinetload/GUIDetectorBuilder.cpp              |    43 +-
 src/guinetload/GUIDetectorBuilder.h                |    57 +-
 src/guinetload/GUIEdgeControlBuilder.cpp           |    16 +-
 src/guinetload/GUIEdgeControlBuilder.h             |    10 +-
 src/guinetload/GUITriggerBuilder.cpp               |    57 +-
 src/guinetload/GUITriggerBuilder.h                 |    57 +-
 src/guisim/GUIBaseVehicle.cpp                      |   150 +-
 src/guisim/GUIBaseVehicle.h                        |    47 +-
 src/guisim/GUIBusStop.cpp                          |    34 +-
 src/guisim/GUIBusStop.h                            |    14 +-
 src/guisim/GUICalibrator.cpp                       |    28 +-
 src/guisim/GUICalibrator.h                         |    10 +-
 src/guisim/GUIChargingStation.cpp                  |    20 +-
 src/guisim/GUIChargingStation.h                    |    14 +-
 src/guisim/GUIContainer.cpp                        |    44 +-
 src/guisim/GUIContainer.h                          |    14 +-
 src/guisim/GUIContainerStop.cpp                    |    22 +-
 src/guisim/GUIContainerStop.h                      |    12 +-
 src/guisim/GUIDetectorWrapper.cpp                  |     8 +-
 src/guisim/GUIDetectorWrapper.h                    |     4 +-
 src/guisim/GUIE2Collector.cpp                      |   198 +
 src/guisim/GUIE2Collector.h                        |   192 +
 src/guisim/GUIE3Collector.cpp                      |    20 +-
 src/guisim/GUIE3Collector.h                        |    12 +-
 src/guisim/GUIEdge.cpp                             |    87 +-
 src/guisim/GUIEdge.h                               |    30 +-
 src/guisim/GUIEventControl.cpp                     |    16 +-
 src/guisim/GUIEventControl.h                       |    10 +-
 src/guisim/GUIInductLoop.cpp                       |    34 +-
 src/guisim/GUIInductLoop.h                         |    20 +-
 src/guisim/GUIInstantInductLoop.cpp                |    20 +-
 src/guisim/GUIInstantInductLoop.h                  |    12 +-
 src/guisim/GUIJunctionWrapper.cpp                  |    20 +-
 src/guisim/GUIJunctionWrapper.h                    |     8 +-
 src/guisim/GUILane.cpp                             |   256 +-
 src/guisim/GUILane.h                               |    47 +-
 src/guisim/GUILaneSpeedTrigger.cpp                 |    38 +-
 src/guisim/GUILaneSpeedTrigger.h                   |    10 +-
 src/guisim/GUINet.cpp                              |    53 +-
 src/guisim/GUINet.h                                |    25 +-
 src/guisim/GUIParkingArea.cpp                      |   211 +
 src/guisim/GUIParkingArea.h                        |   156 +
 src/guisim/GUIPerson.cpp                           |    74 +-
 src/guisim/GUIPerson.h                             |    21 +-
 src/guisim/GUITrafficLightLogicWrapper.cpp         |     8 +-
 src/guisim/GUITrafficLightLogicWrapper.h           |     4 +-
 src/guisim/GUITransportableControl.cpp             |     8 +-
 src/guisim/GUITransportableControl.h               |     4 +-
 src/guisim/GUITriggeredRerouter.cpp                |    28 +-
 src/guisim/GUITriggeredRerouter.h                  |    10 +-
 src/guisim/GUIVehicle.cpp                          |   192 +-
 src/guisim/GUIVehicle.h                            |    25 +-
 src/guisim/GUIVehicleControl.cpp                   |    12 +-
 src/guisim/GUIVehicleControl.h                     |     8 +-
 src/guisim/GUI_E2_ZS_Collector.cpp                 |   191 -
 src/guisim/GUI_E2_ZS_Collector.h                   |   185 -
 src/guisim/GUI_E2_ZS_CollectorOverLanes.cpp        |   181 -
 src/guisim/GUI_E2_ZS_CollectorOverLanes.h          |   198 -
 src/guisim/Makefile.am                             |     4 +-
 src/guisim/Makefile.in                             |    13 +-
 src/guisim_main.cpp                                |    13 +-
 src/jtrrouter/Makefile.am                          |     6 +-
 src/jtrrouter/Makefile.in                          |     6 +-
 src/jtrrouter/ROJTREdge.cpp                        |    32 +-
 src/jtrrouter/ROJTREdge.h                          |    14 +-
 src/jtrrouter/ROJTREdgeBuilder.cpp                 |     8 +-
 src/jtrrouter/ROJTREdgeBuilder.h                   |     4 +-
 src/jtrrouter/ROJTRFrame.cpp                       |     8 +-
 src/jtrrouter/ROJTRFrame.h                         |     4 +-
 src/jtrrouter/ROJTRRouter.cpp                      |    16 +-
 src/jtrrouter/ROJTRRouter.h                        |     6 +-
 src/jtrrouter/ROJTRTurnDefLoader.cpp               |    12 +-
 src/jtrrouter/ROJTRTurnDefLoader.h                 |     6 +-
 src/jtrrouter/jtrrouter_main.cpp                   |    20 +-
 src/marouter/Makefile.am                           |     5 -
 src/marouter/Makefile.in                           |     4 +-
 src/marouter/ROMAAssignments.cpp                   |   228 +-
 src/marouter/ROMAAssignments.h                     |    30 +-
 src/marouter/ROMAEdge.cpp                          |     8 +-
 src/marouter/ROMAEdge.h                            |    16 +-
 src/marouter/ROMAEdgeBuilder.cpp                   |     8 +-
 src/marouter/ROMAEdgeBuilder.h                     |     4 +-
 src/marouter/ROMAFrame.cpp                         |    28 +-
 src/marouter/ROMAFrame.h                           |     4 +-
 src/marouter/ROMARouteHandler.cpp                  |     6 +-
 src/marouter/ROMARouteHandler.h                    |     4 +-
 src/marouter/marouter_main.cpp                     |    28 +-
 src/mesogui/GUIMEInductLoop.cpp                    |    32 +-
 src/mesogui/GUIMEInductLoop.h                      |    12 +-
 src/mesogui/GUIMEVehicle.cpp                       |    59 +-
 src/mesogui/GUIMEVehicle.h                         |    16 +-
 src/mesogui/GUIMEVehicleControl.cpp                |     8 +-
 src/mesogui/GUIMEVehicleControl.h                  |     4 +-
 src/mesosim/MEInductLoop.cpp                       |    12 +-
 src/mesosim/MEInductLoop.h                         |    14 +-
 src/mesosim/MELoop.cpp                             |    22 +-
 src/mesosim/MELoop.h                               |     8 +-
 src/mesosim/MESegment.cpp                          |   228 +-
 src/mesosim/MESegment.h                            |   101 +-
 src/mesosim/METriggeredCalibrator.cpp              |    24 +-
 src/mesosim/METriggeredCalibrator.h                |    10 +-
 src/mesosim/MEVehicle.cpp                          |    47 +-
 src/mesosim/MEVehicle.h                            |    52 +-
 src/mesosim/MEVehicleControl.cpp                   |     8 +-
 src/mesosim/MEVehicleControl.h                     |     4 +-
 src/microsim/MSBaseVehicle.cpp                     |   126 +-
 src/microsim/MSBaseVehicle.h                       |    57 +-
 src/microsim/MSBitSetLogic.h                       |     4 +-
 src/microsim/MSCModel_NonInteracting.cpp           |    21 +-
 src/microsim/MSCModel_NonInteracting.h             |    20 +-
 src/microsim/MSContainer.cpp                       |    26 +-
 src/microsim/MSContainer.h                         |    27 +-
 src/microsim/MSEdge.cpp                            |   281 +-
 src/microsim/MSEdge.h                              |    97 +-
 src/microsim/MSEdgeControl.cpp                     |    18 +-
 src/microsim/MSEdgeControl.h                       |     7 +-
 src/microsim/MSEdgeWeightsStorage.cpp              |    40 +-
 src/microsim/MSEdgeWeightsStorage.h                |    17 +-
 src/microsim/MSEventControl.cpp                    |    36 +-
 src/microsim/MSEventControl.h                      |    31 +-
 src/microsim/MSFrame.cpp                           |    68 +-
 src/microsim/MSFrame.h                             |     4 +-
 src/microsim/MSGlobals.cpp                         |    14 +-
 src/microsim/MSGlobals.h                           |    14 +-
 src/microsim/MSInsertionControl.cpp                |    17 +-
 src/microsim/MSInsertionControl.h                  |     6 +-
 src/microsim/MSInternalJunction.cpp                |    12 +-
 src/microsim/MSInternalJunction.h                  |     6 +-
 src/microsim/MSJunction.cpp                        |     8 +-
 src/microsim/MSJunction.h                          |    10 +-
 src/microsim/MSJunctionControl.cpp                 |    14 +-
 src/microsim/MSJunctionControl.h                   |     4 +-
 src/microsim/MSJunctionLogic.cpp                   |     8 +-
 src/microsim/MSJunctionLogic.h                     |     4 +-
 src/microsim/MSLane.cpp                            |   977 +-
 src/microsim/MSLane.h                              |   258 +-
 src/microsim/MSLaneChanger.cpp                     |   367 +-
 src/microsim/MSLaneChanger.h                       |    28 +-
 src/microsim/MSLaneChangerSublane.cpp              |    57 +-
 src/microsim/MSLaneChangerSublane.h                |     8 +-
 src/microsim/MSLeaderInfo.cpp                      |    58 +-
 src/microsim/MSLeaderInfo.h                        |    48 +-
 src/microsim/MSLink.cpp                            |   261 +-
 src/microsim/MSLink.h                              |   145 +-
 src/microsim/MSLinkCont.cpp                        |    10 +-
 src/microsim/MSLinkCont.h                          |     6 +-
 src/microsim/MSLogicJunction.cpp                   |    20 +-
 src/microsim/MSLogicJunction.h                     |    20 +-
 src/microsim/MSMoveReminder.cpp                    |    16 +-
 src/microsim/MSMoveReminder.h                      |    48 +-
 src/microsim/MSNet.cpp                             |   249 +-
 src/microsim/MSNet.h                               |    81 +-
 src/microsim/MSNoLogicJunction.cpp                 |    22 +-
 src/microsim/MSNoLogicJunction.h                   |    19 +-
 src/microsim/MSParkingArea.cpp                     |   220 +
 src/microsim/MSParkingArea.h                       |   259 +
 src/microsim/MSRightOfWayJunction.cpp              |    28 +-
 src/microsim/MSRightOfWayJunction.h                |     5 +-
 src/microsim/MSRoute.cpp                           |    30 +-
 src/microsim/MSRoute.h                             |    16 +-
 src/microsim/MSRouteHandler.cpp                    |   104 +-
 src/microsim/MSRouteHandler.h                      |    13 +-
 src/microsim/MSStateHandler.cpp                    |   174 +-
 src/microsim/MSStateHandler.h                      |    24 +-
 src/microsim/MSStoppingPlace.cpp                   |    36 +-
 src/microsim/MSStoppingPlace.h                     |    36 +-
 src/microsim/MSTransportable.cpp                   |   125 +-
 src/microsim/MSTransportable.h                     |   122 +-
 src/microsim/MSTransportableControl.cpp            |    14 +-
 src/microsim/MSTransportableControl.h              |     4 +-
 src/microsim/MSVehicle.cpp                         |  1063 +-
 src/microsim/MSVehicle.h                           |   432 +-
 src/microsim/MSVehicleContainer.cpp                |     8 +-
 src/microsim/MSVehicleContainer.h                  |     4 +-
 src/microsim/MSVehicleControl.cpp                  |    27 +-
 src/microsim/MSVehicleControl.h                    |    46 +-
 src/microsim/MSVehicleTransfer.cpp                 |    60 +-
 src/microsim/MSVehicleTransfer.h                   |    18 +-
 src/microsim/MSVehicleType.cpp                     |   127 +-
 src/microsim/MSVehicleType.h                       |    77 +-
 src/microsim/Makefile.am                           |     1 +
 src/microsim/Makefile.in                           |    12 +-
 src/microsim/actions/Command_SaveTLCoupledDet.cpp  |     8 +-
 src/microsim/actions/Command_SaveTLCoupledDet.h    |     4 +-
 .../actions/Command_SaveTLCoupledLaneDet.cpp       |     8 +-
 .../actions/Command_SaveTLCoupledLaneDet.h         |     4 +-
 src/microsim/actions/Command_SaveTLSState.cpp      |    12 +-
 src/microsim/actions/Command_SaveTLSState.h        |     4 +-
 .../actions/Command_SaveTLSSwitchStates.cpp        |    14 +-
 src/microsim/actions/Command_SaveTLSSwitchStates.h |     4 +-
 src/microsim/actions/Command_SaveTLSSwitches.cpp   |    12 +-
 src/microsim/actions/Command_SaveTLSSwitches.h     |     4 +-
 src/microsim/cfmodels/MSCFModel.cpp                |   269 +-
 src/microsim/cfmodels/MSCFModel.h                  |    96 +-
 src/microsim/cfmodels/MSCFModel_Daniel1.cpp        |    54 +-
 src/microsim/cfmodels/MSCFModel_Daniel1.h          |    33 +-
 src/microsim/cfmodels/MSCFModel_IDM.cpp            |    82 +-
 src/microsim/cfmodels/MSCFModel_IDM.h              |    37 +-
 src/microsim/cfmodels/MSCFModel_Kerner.cpp         |    42 +-
 src/microsim/cfmodels/MSCFModel_Kerner.h           |    23 +-
 src/microsim/cfmodels/MSCFModel_Krauss.cpp         |    35 +-
 src/microsim/cfmodels/MSCFModel_Krauss.h           |    17 +-
 src/microsim/cfmodels/MSCFModel_KraussOrig1.cpp    |    64 +-
 src/microsim/cfmodels/MSCFModel_KraussOrig1.h      |    35 +-
 src/microsim/cfmodels/MSCFModel_KraussPS.cpp       |    24 +-
 src/microsim/cfmodels/MSCFModel_KraussPS.h         |     9 +-
 src/microsim/cfmodels/MSCFModel_KraussX.cpp        |   132 +
 src/microsim/cfmodels/MSCFModel_KraussX.h          |   111 +
 src/microsim/cfmodels/MSCFModel_PWag2009.cpp       |    75 +-
 src/microsim/cfmodels/MSCFModel_PWag2009.h         |    34 +-
 src/microsim/cfmodels/MSCFModel_Rail.cpp           |   249 +
 src/microsim/cfmodels/MSCFModel_Rail.h             |   736 +
 src/microsim/cfmodels/MSCFModel_SmartSK.cpp        |    72 +-
 src/microsim/cfmodels/MSCFModel_SmartSK.h          |    43 +-
 src/microsim/cfmodels/MSCFModel_Wiedemann.cpp      |    96 +-
 src/microsim/cfmodels/MSCFModel_Wiedemann.h        |    43 +-
 src/microsim/cfmodels/Makefile.am                  |     4 +-
 src/microsim/cfmodels/Makefile.in                  |    11 +-
 src/microsim/devices/MSDevice.cpp                  |    27 +-
 src/microsim/devices/MSDevice.h                    |    44 +-
 src/microsim/devices/MSDevice_BTreceiver.cpp       |    32 +-
 src/microsim/devices/MSDevice_BTreceiver.h         |    42 +-
 src/microsim/devices/MSDevice_BTsender.cpp         |    14 +-
 src/microsim/devices/MSDevice_BTsender.h           |    22 +-
 src/microsim/devices/MSDevice_Battery.cpp          |   585 +-
 src/microsim/devices/MSDevice_Battery.h            |   206 +-
 src/microsim/devices/MSDevice_Emissions.cpp        |    15 +-
 src/microsim/devices/MSDevice_Emissions.h          |    10 +-
 src/microsim/devices/MSDevice_Example.cpp          |    54 +-
 src/microsim/devices/MSDevice_Example.h            |    32 +-
 src/microsim/devices/MSDevice_Routing.cpp          |    97 +-
 src/microsim/devices/MSDevice_Routing.h            |    23 +-
 src/microsim/devices/MSDevice_SSM.cpp              |  1217 ++
 src/microsim/devices/MSDevice_SSM.h                |   428 +
 src/microsim/devices/MSDevice_Transportable.cpp    |    57 +-
 src/microsim/devices/MSDevice_Transportable.h      |    26 +-
 src/microsim/devices/MSDevice_Tripinfo.cpp         |   108 +-
 src/microsim/devices/MSDevice_Tripinfo.h           |    67 +-
 src/microsim/devices/MSDevice_Vehroutes.cpp        |   140 +-
 src/microsim/devices/MSDevice_Vehroutes.h          |    52 +-
 src/microsim/devices/Makefile.am                   |     1 +
 src/microsim/devices/Makefile.in                   |    12 +-
 .../lcmodels/MSAbstractLaneChangeModel.cpp         |    53 +-
 src/microsim/lcmodels/MSAbstractLaneChangeModel.h  |    75 +-
 src/microsim/lcmodels/MSLCM_DK2008.cpp             |   145 +-
 src/microsim/lcmodels/MSLCM_DK2008.h               |    44 +-
 src/microsim/lcmodels/MSLCM_LC2013.cpp             |   452 +-
 src/microsim/lcmodels/MSLCM_LC2013.h               |    91 +-
 src/microsim/lcmodels/MSLCM_SL2015.cpp             |   908 +-
 src/microsim/lcmodels/MSLCM_SL2015.h               |   140 +-
 src/microsim/logging/CastingFunctionBinding.h      |     8 +-
 src/microsim/logging/FuncBinding_IntParam.h        |    10 +-
 src/microsim/logging/FuncBinding_StringParam.h     |     6 +-
 src/microsim/logging/FunctionBinding.h             |     6 +-
 src/microsim/output/MSAmitranTrajectories.cpp      |    10 +-
 src/microsim/output/MSAmitranTrajectories.h        |     4 +-
 src/microsim/output/MSBatteryExport.cpp            |    62 +-
 src/microsim/output/MSBatteryExport.h              |     4 +-
 src/microsim/output/MSCrossSection.h               |     8 +-
 src/microsim/output/MSDetectorControl.cpp          |     8 +-
 src/microsim/output/MSDetectorControl.h            |     5 +-
 src/microsim/output/MSDetectorFileOutput.h         |     4 +-
 src/microsim/output/MSE2Collector.cpp              |  1461 +-
 src/microsim/output/MSE2Collector.h                |   586 +-
 src/microsim/output/MSE3Collector.cpp              |   148 +-
 src/microsim/output/MSE3Collector.h                |    46 +-
 src/microsim/output/MSEmissionExport.cpp           |    10 +-
 src/microsim/output/MSFCDExport.cpp                |    12 +-
 src/microsim/output/MSFCDExport.h                  |     4 +-
 src/microsim/output/MSFullExport.cpp               |     8 +-
 src/microsim/output/MSFullExport.h                 |     4 +-
 src/microsim/output/MSInductLoop.cpp               |    90 +-
 src/microsim/output/MSInductLoop.h                 |    55 +-
 src/microsim/output/MSInstantInductLoop.cpp        |    40 +-
 src/microsim/output/MSInstantInductLoop.h          |    16 +-
 src/microsim/output/MSMeanData.cpp                 |    84 +-
 src/microsim/output/MSMeanData.h                   |    54 +-
 src/microsim/output/MSMeanData_Amitran.cpp         |    30 +-
 src/microsim/output/MSMeanData_Amitran.h           |    24 +-
 src/microsim/output/MSMeanData_Emissions.cpp       |    28 +-
 src/microsim/output/MSMeanData_Emissions.h         |    14 +-
 src/microsim/output/MSMeanData_Harmonoise.cpp      |    34 +-
 src/microsim/output/MSMeanData_Harmonoise.h        |    18 +-
 src/microsim/output/MSMeanData_Net.cpp             |    38 +-
 src/microsim/output/MSMeanData_Net.h               |    30 +-
 src/microsim/output/MSQueueExport.cpp              |    20 +-
 src/microsim/output/MSQueueExport.h                |     4 +-
 src/microsim/output/MSRouteProbe.cpp               |    16 +-
 src/microsim/output/MSRouteProbe.h                 |     8 +-
 src/microsim/output/MSStopOut.cpp                  |   128 +
 src/microsim/output/MSStopOut.h                    |   142 +
 src/microsim/output/MSVTKExport.cpp                |     8 +-
 src/microsim/output/MSVTKExport.h                  |     4 +-
 src/microsim/output/MSVTypeProbe.cpp               |    14 +-
 src/microsim/output/MSVTypeProbe.h                 |     4 +-
 src/microsim/output/MSXMLRawOut.cpp                |    12 +-
 src/microsim/output/MSXMLRawOut.h                  |     4 +-
 .../output/MS_E2_ZS_CollectorOverLanes.cpp         |   269 -
 src/microsim/output/MS_E2_ZS_CollectorOverLanes.h  |   263 -
 src/microsim/output/Makefile.am                    |     2 +-
 src/microsim/output/Makefile.in                    |    20 +-
 src/microsim/pedestrians/MSPModel.cpp              |     8 +-
 src/microsim/pedestrians/MSPModel.h                |    19 +-
 .../pedestrians/MSPModel_NonInteracting.cpp        |    29 +-
 src/microsim/pedestrians/MSPModel_NonInteracting.h |    29 +-
 src/microsim/pedestrians/MSPModel_Striping.cpp     |   461 +-
 src/microsim/pedestrians/MSPModel_Striping.h       |   107 +-
 src/microsim/pedestrians/MSPerson.cpp              |    41 +-
 src/microsim/pedestrians/MSPerson.h                |    46 +-
 .../traffic_lights/MSActuatedTrafficLightLogic.cpp |    42 +-
 .../traffic_lights/MSActuatedTrafficLightLogic.h   |    16 +-
 .../MSDelayBasedTrafficLightLogic.cpp              |   247 +
 .../traffic_lights/MSDelayBasedTrafficLightLogic.h |   153 +
 .../MSDeterministicHiLevelTrafficLightLogic.cpp    |    28 +-
 .../MSDeterministicHiLevelTrafficLightLogic.h      |    10 +-
 .../traffic_lights/MSOffTrafficLightLogic.cpp      |     8 +-
 .../traffic_lights/MSOffTrafficLightLogic.h        |     4 +-
 src/microsim/traffic_lights/MSPhaseDefinition.h    |     5 +-
 .../traffic_lights/MSPhasedTrafficLightLogic.cpp   |    11 +-
 .../traffic_lights/MSPhasedTrafficLightLogic.h     |     4 +-
 src/microsim/traffic_lights/MSPushButton.cpp       |     8 +-
 src/microsim/traffic_lights/MSPushButton.h         |     4 +-
 src/microsim/traffic_lights/MSRailCrossing.cpp     |    10 +-
 src/microsim/traffic_lights/MSRailCrossing.h       |     4 +-
 src/microsim/traffic_lights/MSRailSignal.cpp       |    14 +-
 src/microsim/traffic_lights/MSRailSignal.h         |     6 +-
 .../traffic_lights/MSSOTLCongestionPolicy.cpp      |     4 +-
 .../traffic_lights/MSSOTLCongestionPolicy.h        |     4 +-
 src/microsim/traffic_lights/MSSOTLDefinitions.h    |    12 +-
 src/microsim/traffic_lights/MSSOTLE2Sensors.cpp    |   212 +-
 src/microsim/traffic_lights/MSSOTLE2Sensors.h      |    28 +-
 .../MSSOTLHiLevelTrafficLightLogic.cpp             |     4 +-
 .../MSSOTLHiLevelTrafficLightLogic.h               |     4 +-
 .../traffic_lights/MSSOTLMarchingPolicy.cpp        |     4 +-
 src/microsim/traffic_lights/MSSOTLMarchingPolicy.h |     4 +-
 src/microsim/traffic_lights/MSSOTLPhasePolicy.cpp  |     4 +-
 src/microsim/traffic_lights/MSSOTLPhasePolicy.h    |     4 +-
 .../MSSOTLPhaseTrafficLightLogic.cpp               |     4 +-
 .../traffic_lights/MSSOTLPhaseTrafficLightLogic.h  |     4 +-
 .../traffic_lights/MSSOTLPlatoonPolicy.cpp         |     4 +-
 src/microsim/traffic_lights/MSSOTLPlatoonPolicy.h  |     4 +-
 .../MSSOTLPlatoonTrafficLightLogic.cpp             |     4 +-
 .../MSSOTLPlatoonTrafficLightLogic.h               |     4 +-
 src/microsim/traffic_lights/MSSOTLPolicy.cpp       |    20 +-
 src/microsim/traffic_lights/MSSOTLPolicy.h         |    18 +-
 .../traffic_lights/MSSOTLPolicy3DStimulus.cpp      |     4 +-
 .../traffic_lights/MSSOTLPolicy3DStimulus.h        |     4 +-
 .../MSSOTLPolicy5DFamilyStimulus.cpp               |    42 +-
 .../traffic_lights/MSSOTLPolicy5DFamilyStimulus.h  |    12 +-
 .../traffic_lights/MSSOTLPolicy5DStimulus.cpp      |    38 +-
 .../traffic_lights/MSSOTLPolicy5DStimulus.h        |    70 +-
 .../MSSOTLPolicyBasedTrafficLightLogic.cpp         |     4 +-
 .../MSSOTLPolicyBasedTrafficLightLogic.h           |     4 +-
 .../traffic_lights/MSSOTLPolicyDesirability.cpp    |     4 +-
 .../traffic_lights/MSSOTLPolicyDesirability.h      |    18 +-
 .../traffic_lights/MSSOTLRequestPolicy.cpp         |     4 +-
 src/microsim/traffic_lights/MSSOTLRequestPolicy.h  |     4 +-
 .../MSSOTLRequestTrafficLightLogic.cpp             |     4 +-
 .../MSSOTLRequestTrafficLightLogic.h               |     4 +-
 src/microsim/traffic_lights/MSSOTLSensors.cpp      |     4 +-
 src/microsim/traffic_lights/MSSOTLSensors.h        |    10 +-
 .../traffic_lights/MSSOTLTrafficLightLogic.cpp     |    12 +-
 .../traffic_lights/MSSOTLTrafficLightLogic.h       |    22 +-
 .../traffic_lights/MSSOTLWaveTrafficLightLogic.cpp |     4 +-
 .../traffic_lights/MSSOTLWaveTrafficLightLogic.h   |     4 +-
 .../traffic_lights/MSSimpleTrafficLightLogic.cpp   |    11 +-
 .../traffic_lights/MSSimpleTrafficLightLogic.h     |     4 +-
 .../traffic_lights/MSSwarmTrafficLightLogic.cpp    |   146 +-
 .../traffic_lights/MSSwarmTrafficLightLogic.h      |   108 +-
 src/microsim/traffic_lights/MSTLLogicControl.cpp   |    30 +-
 src/microsim/traffic_lights/MSTLLogicControl.h     |    12 +-
 .../traffic_lights/MSTrafficLightLogic.cpp         |    35 +-
 src/microsim/traffic_lights/MSTrafficLightLogic.h  |    10 +-
 src/microsim/traffic_lights/Makefile.am            |     1 +
 src/microsim/traffic_lights/Makefile.in            |     3 +
 src/microsim/trigger/MSCalibrator.cpp              |    36 +-
 src/microsim/trigger/MSCalibrator.h                |    18 +-
 src/microsim/trigger/MSChargingStation.cpp         |   197 +-
 src/microsim/trigger/MSChargingStation.h           |    77 +-
 src/microsim/trigger/MSLaneSpeedTrigger.cpp        |    22 +-
 src/microsim/trigger/MSLaneSpeedTrigger.h          |    22 +-
 src/microsim/trigger/MSTrigger.cpp                 |     4 +-
 src/microsim/trigger/MSTrigger.h                   |     4 +-
 src/microsim/trigger/MSTriggeredRerouter.cpp       |   324 +-
 src/microsim/trigger/MSTriggeredRerouter.h         |    35 +-
 src/netbuild/Makefile.am                           |     4 +-
 src/netbuild/Makefile.in                           |    20 +-
 src/netbuild/NBAlgorithms.cpp                      |   163 +-
 src/netbuild/NBAlgorithms.h                        |    36 +-
 src/netbuild/NBAlgorithms_Ramps.cpp                |    71 +-
 src/netbuild/NBAlgorithms_Ramps.h                  |    14 +-
 src/netbuild/NBCapacity2Lanes.h                    |    10 +-
 src/netbuild/NBConnection.cpp                      |    16 +-
 src/netbuild/NBConnection.h                        |     4 +-
 src/netbuild/NBConnectionDefs.h                    |     4 +-
 src/netbuild/NBCont.h                              |    14 +-
 src/netbuild/NBContHelper.cpp                      |    64 +-
 src/netbuild/NBContHelper.h                        |    40 +-
 src/netbuild/NBDistribution.cpp                    |    93 -
 src/netbuild/NBDistribution.h                      |    63 -
 src/netbuild/NBDistrict.cpp                        |    22 +-
 src/netbuild/NBDistrict.h                          |    16 +-
 src/netbuild/NBDistrictCont.cpp                    |    12 +-
 src/netbuild/NBDistrictCont.h                      |     8 +-
 src/netbuild/NBEdge.cpp                            |   538 +-
 src/netbuild/NBEdge.h                              |   212 +-
 src/netbuild/NBEdgeCont.cpp                        |   226 +-
 src/netbuild/NBEdgeCont.h                          |    65 +-
 src/netbuild/NBFrame.cpp                           |    36 +-
 src/netbuild/NBFrame.h                             |     4 +-
 src/netbuild/NBHeightMapper.cpp                    |    27 +-
 src/netbuild/NBHeightMapper.h                      |     8 +-
 src/netbuild/NBHelpers.cpp                         |    34 +-
 src/netbuild/NBHelpers.h                           |    22 +-
 src/netbuild/NBLinkPossibilityMatrix.h             |     4 +-
 src/netbuild/NBLoadedSUMOTLDef.cpp                 |    14 +-
 src/netbuild/NBLoadedSUMOTLDef.h                   |     4 +-
 src/netbuild/NBLoadedTLDef.cpp                     |    26 +-
 src/netbuild/NBLoadedTLDef.h                       |     6 +-
 src/netbuild/NBNetBuilder.cpp                      |   409 +-
 src/netbuild/NBNetBuilder.h                        |    75 +-
 src/netbuild/NBNode.cpp                            |   328 +-
 src/netbuild/NBNode.h                              |   331 +-
 src/netbuild/NBNodeCont.cpp                        |    96 +-
 src/netbuild/NBNodeCont.h                          |   113 +-
 src/netbuild/NBNodeShapeComputer.cpp               |   215 +-
 src/netbuild/NBNodeShapeComputer.h                 |    12 +-
 src/netbuild/NBOwnTLDef.cpp                        |   108 +-
 src/netbuild/NBOwnTLDef.h                          |     8 +-
 src/netbuild/NBPTStop.cpp                          |    99 +
 src/netbuild/NBPTStop.h                            |    92 +
 src/netbuild/NBPTStopCont.cpp                      |    58 +
 src/netbuild/NBPTStopCont.h                        |    71 +
 src/netbuild/NBRequest.cpp                         |    16 +-
 src/netbuild/NBRequest.h                           |     4 +-
 src/netbuild/NBSign.cpp                            |    10 +-
 src/netbuild/NBSign.h                              |     8 +-
 src/netbuild/NBTrafficLightDefinition.cpp          |    19 +-
 src/netbuild/NBTrafficLightDefinition.h            |    12 +-
 src/netbuild/NBTrafficLightLogic.cpp               |     8 +-
 src/netbuild/NBTrafficLightLogic.h                 |     4 +-
 src/netbuild/NBTrafficLightLogicCont.cpp           |    12 +-
 src/netbuild/NBTrafficLightLogicCont.h             |     4 +-
 src/netbuild/NBTypeCont.cpp                        |    28 +-
 src/netbuild/NBTypeCont.h                          |    46 +-
 src/netconvert_main.cpp                            |    13 +-
 src/netedit/GNEAdditional.cpp                      |   110 +-
 src/netedit/GNEAdditional.h                        |    89 +-
 src/netedit/GNEAdditionalDialog.cpp                |    48 +-
 src/netedit/GNEAdditionalDialog.h                  |    21 +-
 src/netedit/GNEAdditionalFrame.cpp                 |  1289 +-
 src/netedit/GNEAdditionalFrame.h                   |   334 +-
 src/netedit/GNEAdditionalHandler.cpp               |  1577 +-
 src/netedit/GNEAdditionalHandler.h                 |   147 +-
 src/netedit/GNEAdditionalSet.cpp                   |   388 -
 src/netedit/GNEAdditionalSet.h                     |   240 -
 src/netedit/GNEApplicationWindow.cpp               |   467 +-
 src/netedit/GNEApplicationWindow.h                 |    34 +-
 src/netedit/GNEAttributeCarrier.cpp                |  1178 +-
 src/netedit/GNEAttributeCarrier.h                  |   124 +-
 src/netedit/GNEBusStop.cpp                         |    86 +-
 src/netedit/GNEBusStop.h                           |    11 +-
 src/netedit/GNECalibrator.cpp                      |   368 +-
 src/netedit/GNECalibrator.h                        |   129 +-
 src/netedit/GNECalibratorDialog.cpp                |   737 +-
 src/netedit/GNECalibratorDialog.h                  |   137 +-
 src/netedit/GNECalibratorFlow.cpp                  |   662 +
 src/netedit/GNECalibratorFlow.h                    |   394 +
 src/netedit/GNECalibratorFlowDialog.cpp            |   497 +
 src/netedit/GNECalibratorFlowDialog.h              |   188 +
 src/netedit/GNECalibratorRoute.cpp                 |   216 +
 src/netedit/GNECalibratorRoute.h                   |   131 +
 src/netedit/GNECalibratorRouteDialog.cpp           |   225 +
 src/netedit/GNECalibratorRouteDialog.h             |   125 +
 src/netedit/GNECalibratorVehicleType.cpp           |   767 +
 src/netedit/GNECalibratorVehicleType.h             |   463 +
 src/netedit/GNECalibratorVehicleTypeDialog.cpp     |   607 +
 src/netedit/GNECalibratorVehicleTypeDialog.h       |   197 +
 src/netedit/GNEChange.cpp                          |     8 +-
 src/netedit/GNEChange.h                            |     6 +-
 src/netedit/GNEChange_Additional.cpp               |   269 +-
 src/netedit/GNEChange_Additional.h                 |    36 +-
 src/netedit/GNEChange_Attribute.cpp                |    17 +-
 src/netedit/GNEChange_Attribute.h                  |     7 +-
 NEWS => src/netedit/GNEChange_CalibratorItem.cpp   |     0
 NEWS => src/netedit/GNEChange_CalibratorItem.h     |     0
 src/netedit/GNEChange_Connection.cpp               |    56 +-
 src/netedit/GNEChange_Connection.h                 |     4 +-
 src/netedit/GNEChange_Crossing.cpp                 |   130 +
 src/netedit/GNEChange_Crossing.h                   |   100 +
 src/netedit/GNEChange_Edge.cpp                     |   164 +-
 src/netedit/GNEChange_Edge.h                       |    15 +-
 src/netedit/GNEChange_Junction.cpp                 |    64 +-
 src/netedit/GNEChange_Junction.h                   |    10 +-
 src/netedit/GNEChange_Lane.cpp                     |   105 +-
 src/netedit/GNEChange_Lane.h                       |     7 +-
 NEWS => src/netedit/GNEChange_POI.cpp              |     0
 NEWS => src/netedit/GNEChange_POI.h                |     0
 NEWS => src/netedit/GNEChange_RerouterInterval.cpp |     0
 NEWS => src/netedit/GNEChange_RerouterInterval.h   |     0
 src/netedit/GNEChange_Selection.cpp                |    23 +-
 src/netedit/GNEChange_Selection.h                  |     5 +-
 src/netedit/GNEChange_TLS.cpp                      |    64 +-
 src/netedit/GNEChange_TLS.h                        |    12 +-
 src/netedit/GNEChargingStation.cpp                 |   103 +-
 src/netedit/GNEChargingStation.h                   |    29 +-
 src/netedit/GNEClosingLaneReroute.cpp              |   111 +
 src/netedit/GNEClosingLaneReroute.h                |   107 +
 src/netedit/GNEClosingReroute.cpp                  |   113 +
 src/netedit/GNEClosingReroute.h                    |   108 +
 src/netedit/GNEConnection.cpp                      |    54 +-
 src/netedit/GNEConnection.h                        |    23 +-
 src/netedit/GNEConnectorFrame.cpp                  |   189 +-
 src/netedit/GNEConnectorFrame.h                    |    76 +-
 src/netedit/GNEContainerStop.cpp                   |    85 +-
 src/netedit/GNEContainerStop.h                     |    11 +-
 src/netedit/GNECrossing.cpp                        |   171 +-
 src/netedit/GNECrossing.h                          |    28 +-
 src/netedit/GNECrossingFrame.cpp                   |   654 +
 src/netedit/GNECrossingFrame.h                     |   314 +
 src/netedit/GNEDeleteFrame.cpp                     |   566 +
 src/netedit/GNEDeleteFrame.h                       |   148 +
 src/netedit/GNEDestProbReroute.cpp                 |   107 +
 src/netedit/GNEDestProbReroute.h                   |    96 +
 src/netedit/GNEDetector.cpp                        |    48 +-
 src/netedit/GNEDetector.h                          |    29 +-
 src/netedit/GNEDetectorE1.cpp                      |    45 +-
 src/netedit/GNEDetectorE1.h                        |    11 +-
 src/netedit/GNEDetectorE2.cpp                      |    67 +-
 src/netedit/GNEDetectorE2.h                        |    23 +-
 src/netedit/GNEDetectorE3.cpp                      |   276 +-
 src/netedit/GNEDetectorE3.h                        |    74 +-
 src/netedit/GNEDetectorEntry.cpp                   |    72 +-
 src/netedit/GNEDetectorEntry.h                     |    29 +-
 src/netedit/GNEDetectorExit.cpp                    |    72 +-
 src/netedit/GNEDetectorExit.h                      |    29 +-
 src/netedit/GNEDialog_About.cpp                    |   113 +-
 src/netedit/GNEDialog_About.h                      |    10 +-
 src/netedit/GNEDialog_AllowDisallow.cpp            |   245 +
 src/netedit/GNEDialog_AllowDisallow.h              |   120 +
 src/netedit/GNEDialog_Wizard.cpp                   |    44 +-
 src/netedit/GNEDialog_Wizard.h                     |     4 +-
 src/netedit/GNEEdge.cpp                            |   356 +-
 src/netedit/GNEEdge.h                              |    52 +-
 src/netedit/GNEEvent_NetworkLoaded.h               |     4 +-
 src/netedit/GNEFrame.cpp                           |    73 +-
 src/netedit/GNEFrame.h                             |    35 +-
 src/netedit/GNEInspectorFrame.cpp                  |   970 +-
 src/netedit/GNEInspectorFrame.h                    |   208 +-
 src/netedit/GNEInternalLane.cpp                    |    12 +-
 src/netedit/GNEInternalLane.h                      |     8 +-
 src/netedit/GNEJunction.cpp                        |   323 +-
 src/netedit/GNEJunction.h                          |    67 +-
 src/netedit/GNELane.cpp                            |   321 +-
 src/netedit/GNELane.h                              |    85 +-
 src/netedit/GNELoadThread.cpp                      |    45 +-
 src/netedit/GNELoadThread.h                        |    10 +-
 src/netedit/GNENet.cpp                             |   564 +-
 src/netedit/GNENet.h                               |    92 +-
 src/netedit/GNENetElement.cpp                      |    31 +-
 src/netedit/GNENetElement.h                        |     7 +-
 src/netedit/GNEPOI.cpp                             |    40 +-
 src/netedit/GNEPOI.h                               |    16 +-
 src/netedit/GNEPoly.cpp                            |    17 +-
 src/netedit/GNEPoly.h                              |     8 +-
 src/netedit/GNEProhibition.cpp                     |     8 +-
 src/netedit/GNEProhibition.h                       |     4 +-
 src/netedit/GNEReferenceCounter.h                  |     8 +-
 src/netedit/GNERerouter.cpp                        |   519 +-
 src/netedit/GNERerouter.h                          |   244 +-
 src/netedit/GNERerouterDialog.cpp                  |   169 +-
 src/netedit/GNERerouterDialog.h                    |    41 +-
 src/netedit/GNERerouterInterval.cpp                |   303 +
 src/netedit/GNERerouterInterval.h                  |   186 +
 src/netedit/GNERerouterIntervalDialog.cpp          |   768 +
 src/netedit/GNERerouterIntervalDialog.h            |   210 +
 src/netedit/GNERouteProbReroute.cpp                |   106 +
 src/netedit/GNERouteProbReroute.h                  |    98 +
 src/netedit/GNERouteProbe.cpp                      |    72 +-
 src/netedit/GNERouteProbe.h                        |    36 +-
 src/netedit/GNESelectorFrame.cpp                   |   327 +-
 src/netedit/GNESelectorFrame.h                     |    98 +-
 src/netedit/GNEStoppingPlace.cpp                   |    46 +-
 src/netedit/GNEStoppingPlace.h                     |    28 +-
 src/netedit/GNETLSEditorFrame.cpp                  |   197 +-
 src/netedit/GNETLSEditorFrame.h                    |    92 +-
 src/netedit/GNEUndoList.cpp                        |     8 +-
 src/netedit/GNEUndoList.h                          |     4 +-
 src/netedit/GNEVaporizer.cpp                       |    91 +-
 src/netedit/GNEVaporizer.h                         |    38 +-
 src/netedit/GNEVariableSpeedSign.cpp               |   428 +
 src/netedit/GNEVariableSpeedSign.h                 |   156 +
 src/netedit/GNEVariableSpeedSignDialog.cpp         |   203 +
 src/netedit/GNEVariableSpeedSignDialog.h           |   117 +
 src/netedit/GNEVariableSpeedSignStep.cpp           |   143 +
 src/netedit/GNEVariableSpeedSignStep.h             |   117 +
 src/netedit/GNEVariableSpeedSignal.cpp             |   439 -
 src/netedit/GNEVariableSpeedSignal.h               |   156 -
 src/netedit/GNEVariableSpeedSignalDialog.cpp       |   210 -
 src/netedit/GNEVariableSpeedSignalDialog.h         |   117 -
 src/netedit/GNEViewNet.cpp                         |   943 +-
 src/netedit/GNEViewNet.h                           |   161 +-
 src/netedit/GNEViewParent.cpp                      |   157 +-
 src/netedit/GNEViewParent.h                        |    39 +-
 src/netedit/Makefile.am                            |    34 +-
 src/netedit/Makefile.in                            |   151 +-
 src/netedit/netedit.rc                             |     2 +-
 src/netedit/netedit_main.cpp                       |    10 +-
 src/netgen/Makefile.am                             |     5 -
 src/netgen/Makefile.in                             |     4 +-
 src/netgen/NGEdge.cpp                              |     8 +-
 src/netgen/NGEdge.h                                |     4 +-
 src/netgen/NGFrame.cpp                             |    10 +-
 src/netgen/NGFrame.h                               |     4 +-
 src/netgen/NGNet.cpp                               |    22 +-
 src/netgen/NGNet.h                                 |    12 +-
 src/netgen/NGNode.cpp                              |     8 +-
 src/netgen/NGNode.h                                |    14 +-
 src/netgen/NGRandomNetBuilder.cpp                  |    72 +-
 src/netgen/NGRandomNetBuilder.h                    |    55 +-
 src/netgen/netgen_main.cpp                         |    17 +-
 src/netimport/NIFrame.cpp                          |    38 +-
 src/netimport/NIFrame.h                            |     4 +-
 src/netimport/NIImporter_ArcView.cpp               |    42 +-
 src/netimport/NIImporter_ArcView.h                 |     8 +-
 src/netimport/NIImporter_DlrNavteq.cpp             |   388 +-
 src/netimport/NIImporter_DlrNavteq.h               |   175 +-
 src/netimport/NIImporter_ITSUMO.cpp                |    20 +-
 src/netimport/NIImporter_ITSUMO.h                  |    12 +-
 src/netimport/NIImporter_MATSim.cpp                |    26 +-
 src/netimport/NIImporter_MATSim.h                  |     6 +-
 src/netimport/NIImporter_OpenDrive.cpp             |   387 +-
 src/netimport/NIImporter_OpenDrive.h               |    79 +-
 src/netimport/NIImporter_OpenStreetMap.cpp         |   384 +-
 src/netimport/NIImporter_OpenStreetMap.h           |    40 +-
 src/netimport/NIImporter_RobocupRescue.cpp         |    14 +-
 src/netimport/NIImporter_RobocupRescue.h           |     4 +-
 src/netimport/NIImporter_SUMO.cpp                  |    55 +-
 src/netimport/NIImporter_SUMO.h                    |    25 +-
 src/netimport/NIImporter_VISUM.cpp                 |   101 +-
 src/netimport/NIImporter_VISUM.h                   |    20 +-
 src/netimport/NILoader.cpp                         |    32 +-
 src/netimport/NILoader.h                           |     4 +-
 src/netimport/NINavTeqHelper.cpp                   |    30 +-
 src/netimport/NINavTeqHelper.h                     |    10 +-
 src/netimport/NIVisumTL.cpp                        |     8 +-
 src/netimport/NIVisumTL.h                          |     4 +-
 src/netimport/NIXMLConnectionsHandler.cpp          |    14 +-
 src/netimport/NIXMLConnectionsHandler.h            |     4 +-
 src/netimport/NIXMLEdgesHandler.cpp                |    71 +-
 src/netimport/NIXMLEdgesHandler.h                  |    30 +-
 src/netimport/NIXMLNodesHandler.cpp                |    18 +-
 src/netimport/NIXMLNodesHandler.h                  |     4 +-
 src/netimport/NIXMLTrafficLightsHandler.cpp        |    15 +-
 src/netimport/NIXMLTrafficLightsHandler.h          |     4 +-
 src/netimport/NIXMLTypesHandler.cpp                |    18 +-
 src/netimport/NIXMLTypesHandler.h                  |     4 +-
 src/netimport/vissim/NIImporter_Vissim.cpp         |    50 +-
 src/netimport/vissim/NIImporter_Vissim.h           |     6 +-
 src/netimport/vissim/NIVissimElements.h            |     4 +-
 .../vissim/tempstructs/NIVissimAbstractEdge.cpp    |    18 +-
 .../vissim/tempstructs/NIVissimAbstractEdge.h      |    10 +-
 .../tempstructs/NIVissimBoundedClusterObject.cpp   |    10 +-
 .../tempstructs/NIVissimBoundedClusterObject.h     |     6 +-
 .../vissim/tempstructs/NIVissimClosedLaneDef.cpp   |     8 +-
 .../vissim/tempstructs/NIVissimClosedLaneDef.h     |     4 +-
 .../vissim/tempstructs/NIVissimClosedLanesVector.h |     4 +-
 .../vissim/tempstructs/NIVissimClosures.cpp        |     8 +-
 .../vissim/tempstructs/NIVissimClosures.h          |     4 +-
 .../vissim/tempstructs/NIVissimConflictArea.cpp    |     8 +-
 .../vissim/tempstructs/NIVissimConflictArea.h      |     4 +-
 .../vissim/tempstructs/NIVissimConnection.cpp      |    12 +-
 .../vissim/tempstructs/NIVissimConnection.h        |     8 +-
 .../tempstructs/NIVissimConnectionCluster.cpp      |    48 +-
 .../vissim/tempstructs/NIVissimConnectionCluster.h |    22 +-
 .../tempstructs/NIVissimDistrictConnection.cpp     |    64 +-
 .../tempstructs/NIVissimDistrictConnection.h       |    24 +-
 .../vissim/tempstructs/NIVissimDisturbance.cpp     |     8 +-
 .../vissim/tempstructs/NIVissimDisturbance.h       |     4 +-
 src/netimport/vissim/tempstructs/NIVissimEdge.cpp  |   113 +-
 src/netimport/vissim/tempstructs/NIVissimEdge.h    |    45 +-
 .../vissim/tempstructs/NIVissimEdgePosMap.cpp      |    18 +-
 .../vissim/tempstructs/NIVissimEdgePosMap.h        |    10 +-
 .../tempstructs/NIVissimExtendedEdgePoint.cpp      |    12 +-
 .../vissim/tempstructs/NIVissimExtendedEdgePoint.h |    10 +-
 .../tempstructs/NIVissimExtendedEdgePointVector.h  |     4 +-
 .../vissim/tempstructs/NIVissimNodeCluster.cpp     |     8 +-
 .../vissim/tempstructs/NIVissimNodeCluster.h       |     4 +-
 .../vissim/tempstructs/NIVissimNodeDef.cpp         |    12 +-
 src/netimport/vissim/tempstructs/NIVissimNodeDef.h |    10 +-
 .../vissim/tempstructs/NIVissimNodeDef_Edges.cpp   |    12 +-
 .../vissim/tempstructs/NIVissimNodeDef_Edges.h     |     6 +-
 .../vissim/tempstructs/NIVissimNodeDef_Poly.cpp    |     8 +-
 .../vissim/tempstructs/NIVissimNodeDef_Poly.h      |     8 +-
 .../tempstructs/NIVissimNodeParticipatingEdge.cpp  |    16 +-
 .../tempstructs/NIVissimNodeParticipatingEdge.h    |    14 +-
 .../NIVissimNodeParticipatingEdgeVector.h          |     4 +-
 .../vissim/tempstructs/NIVissimSource.cpp          |     8 +-
 src/netimport/vissim/tempstructs/NIVissimSource.h  |     4 +-
 src/netimport/vissim/tempstructs/NIVissimTL.cpp    |    14 +-
 src/netimport/vissim/tempstructs/NIVissimTL.h      |    12 +-
 .../tempstructs/NIVissimTrafficDescription.cpp     |    16 +-
 .../tempstructs/NIVissimTrafficDescription.h       |     8 +-
 .../vissim/tempstructs/NIVissimVehTypeClass.cpp    |     8 +-
 .../vissim/tempstructs/NIVissimVehTypeClass.h      |     6 +-
 .../vissim/tempstructs/NIVissimVehicleClass.cpp    |     8 +-
 .../vissim/tempstructs/NIVissimVehicleClass.h      |     4 +-
 .../tempstructs/NIVissimVehicleClassVector.h       |     4 +-
 .../vissim/tempstructs/NIVissimVehicleType.cpp     |     8 +-
 .../vissim/tempstructs/NIVissimVehicleType.h       |     4 +-
 ...issimSingleTypeParser_Auswertungsdefinition.cpp |     8 +-
 ...IVissimSingleTypeParser_Auswertungsdefinition.h |     4 +-
 ...NIVissimSingleTypeParser_Detektordefinition.cpp |     8 +-
 .../NIVissimSingleTypeParser_Detektordefinition.h  |     4 +-
 .../typeloader/NIVissimSingleTypeParser_DynUml.cpp |     8 +-
 .../typeloader/NIVissimSingleTypeParser_DynUml.h   |     4 +-
 ...IVissimSingleTypeParser_Einheitendefinition.cpp |     8 +-
 .../NIVissimSingleTypeParser_Einheitendefinition.h |     4 +-
 .../NIVissimSingleTypeParser_Emission.cpp          |     8 +-
 .../typeloader/NIVissimSingleTypeParser_Emission.h |     4 +-
 ...IVissimSingleTypeParser_Fahrtverlaufdateien.cpp |     8 +-
 .../NIVissimSingleTypeParser_Fahrtverlaufdateien.h |     4 +-
 ...simSingleTypeParser_Fahrverhaltendefinition.cpp |     8 +-
 ...issimSingleTypeParser_Fahrverhaltendefinition.h |     4 +-
 ...mSingleTypeParser_Fahrzeugklassendefinition.cpp |     8 +-
 ...simSingleTypeParser_Fahrzeugklassendefinition.h |     4 +-
 ...issimSingleTypeParser_Fahrzeugtypdefinition.cpp |    12 +-
 ...IVissimSingleTypeParser_Fahrzeugtypdefinition.h |     4 +-
 .../NIVissimSingleTypeParser_Fensterdefinition.cpp |     8 +-
 .../NIVissimSingleTypeParser_Fensterdefinition.h   |     4 +-
 ...imSingleTypeParser_Gefahrwarnungsdefinition.cpp |     8 +-
 ...ssimSingleTypeParser_Gefahrwarnungsdefinition.h |     4 +-
 ...simSingleTypeParser_Gelbverhaltendefinition.cpp |     8 +-
 ...arser_Geschwindigkeitsverteilungsdefinition.cpp |    21 +-
 ...eParser_Geschwindigkeitsverteilungsdefinition.h |     4 +-
 ...ssimSingleTypeParser_Haltestellendefinition.cpp |     8 +-
 ...VissimSingleTypeParser_Haltestellendefinition.h |     4 +-
 .../NIVissimSingleTypeParser_Kantensperrung.cpp    |     8 +-
 .../NIVissimSingleTypeParser_Kantensperrung.h      |     4 +-
 .../NIVissimSingleTypeParser_Kennungszeile.cpp     |     8 +-
 .../NIVissimSingleTypeParser_Kennungszeile.h       |     4 +-
 .../NIVissimSingleTypeParser_Knotendefinition.cpp  |    10 +-
 .../NIVissimSingleTypeParser_Knotendefinition.h    |     4 +-
 ...ssimSingleTypeParser_LSAKopplungsdefinition.cpp |     8 +-
 ...VissimSingleTypeParser_LSAKopplungsdefinition.h |     4 +-
 ...ngleTypeParser_Laengenverteilungsdefinition.cpp |    21 +-
 ...SingleTypeParser_Laengenverteilungsdefinition.h |     4 +-
 ...ngleTypeParser_Langsamfahrbereichdefinition.cpp |     8 +-
 ...SingleTypeParser_Langsamfahrbereichdefinition.h |     4 +-
 ...ngleTypeParser_Lichtsignalanlagendefinition.cpp |    18 +-
 ...SingleTypeParser_Lichtsignalanlagendefinition.h |     4 +-
 .../NIVissimSingleTypeParser_Liniendefinition.cpp  |     8 +-
 .../NIVissimSingleTypeParser_Liniendefinition.h    |     4 +-
 .../NIVissimSingleTypeParser_Linksverkehr.cpp      |     8 +-
 .../NIVissimSingleTypeParser_Linksverkehr.h        |     4 +-
 ...NIVissimSingleTypeParser_Messungsdefinition.cpp |     8 +-
 .../NIVissimSingleTypeParser_Messungsdefinition.h  |     4 +-
 ...VissimSingleTypeParser_Netzobjektdefinition.cpp |     8 +-
 ...NIVissimSingleTypeParser_Netzobjektdefinition.h |     4 +-
 ...IVissimSingleTypeParser_Parkplatzdefinition.cpp |    16 +-
 .../NIVissimSingleTypeParser_Parkplatzdefinition.h |     4 +-
 ...leTypeParser_Querschnittsmessungsdefinition.cpp |     8 +-
 ...ngleTypeParser_Querschnittsmessungsdefinition.h |     4 +-
 ...eTypeParser_Querverkehrsstoerungsdefinition.cpp |    22 +-
 ...gleTypeParser_Querverkehrsstoerungsdefinition.h |     4 +-
 .../NIVissimSingleTypeParser_Rautedefinition.cpp   |     8 +-
 ...ingleTypeParser_Reisezeitmessungsdefinition.cpp |     8 +-
 ...mSingleTypeParser_Reisezeitmessungsdefinition.h |     4 +-
 ...TypeParser_Richtungsentscheidungsdefinition.cpp |     8 +-
 ...leTypeParser_Richtungsentscheidungsdefinition.h |     4 +-
 ...imSingleTypeParser_Richtungspfeildefinition.cpp |     8 +-
 ...ssimSingleTypeParser_Richtungspfeildefinition.h |     4 +-
 ...gleTypeParser_Routenentscheidungsdefinition.cpp |     8 +-
 ...ingleTypeParser_Routenentscheidungsdefinition.h |     4 +-
 ...issimSingleTypeParser_Signalgeberdefinition.cpp |    10 +-
 ...IVissimSingleTypeParser_Signalgeberdefinition.h |     4 +-
 ...simSingleTypeParser_Signalgruppendefinition.cpp |    14 +-
 ...issimSingleTypeParser_Signalgruppendefinition.h |     4 +-
 .../NIVissimSingleTypeParser_SimRate.cpp           |     8 +-
 .../typeloader/NIVissimSingleTypeParser_SimRate.h  |     4 +-
 .../NIVissimSingleTypeParser_Simdauer.cpp          |    10 +-
 .../typeloader/NIVissimSingleTypeParser_Simdauer.h |     4 +-
 .../NIVissimSingleTypeParser_Startuhrzeit.cpp      |     6 +-
 .../NIVissimSingleTypeParser_Startuhrzeit.h        |     4 +-
 .../NIVissimSingleTypeParser_Startzufallszahl.cpp  |     8 +-
 .../NIVissimSingleTypeParser_Startzufallszahl.h    |     4 +-
 ...simSingleTypeParser_Stauparameterdefinition.cpp |     8 +-
 ...issimSingleTypeParser_Stauparameterdefinition.h |     4 +-
 ...issimSingleTypeParser_Stauzaehlerdefinition.cpp |     8 +-
 ...IVissimSingleTypeParser_Stauzaehlerdefinition.h |     4 +-
 ...VissimSingleTypeParser_Stopschilddefinition.cpp |     8 +-
 ...NIVissimSingleTypeParser_Stopschilddefinition.h |     4 +-
 ...NIVissimSingleTypeParser_Streckendefinition.cpp |    14 +-
 .../NIVissimSingleTypeParser_Streckendefinition.h  |     4 +-
 ...issimSingleTypeParser_Streckentypdefinition.cpp |     8 +-
 ...IVissimSingleTypeParser_Streckentypdefinition.h |     4 +-
 .../NIVissimSingleTypeParser_TEAPACDefinition.cpp  |     8 +-
 .../NIVissimSingleTypeParser_TEAPACDefinition.h    |     4 +-
 ...leTypeParser_VWunschentscheidungsdefinition.cpp |     8 +-
 ...ngleTypeParser_VWunschentscheidungsdefinition.h |     4 +-
 ...issimSingleTypeParser_Verbindungsdefinition.cpp |    22 +-
 ...IVissimSingleTypeParser_Verbindungsdefinition.h |     4 +-
 ...peParser_Verkehrszusammensetzungsdefinition.cpp |    10 +-
 ...TypeParser_Verkehrszusammensetzungsdefinition.h |     4 +-
 ...gleTypeParser_Verlustzeitmessungsdefinition.cpp |     8 +-
 ...ingleTypeParser_Verlustzeitmessungsdefinition.h |     4 +-
 ...ingleTypeParser_Zeitenverteilungsdefinition.cpp |    32 +-
 ...mSingleTypeParser_Zeitenverteilungsdefinition.h |     4 +-
 .../NIVissimSingleTypeParser_Zeitschrittfaktor.cpp |     8 +-
 .../NIVissimSingleTypeParser_Zeitschrittfaktor.h   |     4 +-
 .../NIVissimSingleTypeParser_Zuflussdefinition.cpp |    12 +-
 .../NIVissimSingleTypeParser_Zuflussdefinition.h   |     4 +-
 ...SingleTypeParser_Zusammensetzungsdefinition.cpp |     8 +-
 ...imSingleTypeParser_Zusammensetzungsdefinition.h |     4 +-
 .../NIVissimSingleTypeParser__XKurvedefinition.cpp |     8 +-
 .../NIVissimSingleTypeParser__XKurvedefinition.h   |     4 +-
 ...simSingleTypeParser__XVerteilungsdefinition.cpp |     8 +-
 ...issimSingleTypeParser__XVerteilungsdefinition.h |     4 +-
 src/netload/NLBuilder.cpp                          |   164 +-
 src/netload/NLBuilder.h                            |    13 +-
 src/netload/NLDetectorBuilder.cpp                  |   335 +-
 src/netload/NLDetectorBuilder.h                    |   249 +-
 src/netload/NLDiscreteEventBuilder.cpp             |     8 +-
 src/netload/NLDiscreteEventBuilder.h               |     4 +-
 src/netload/NLEdgeControlBuilder.cpp               |    20 +-
 src/netload/NLEdgeControlBuilder.h                 |    10 +-
 src/netload/NLHandler.cpp                          |   293 +-
 src/netload/NLHandler.h                            |    17 +-
 src/netload/NLJunctionControlBuilder.cpp           |    35 +-
 src/netload/NLJunctionControlBuilder.h             |    10 +-
 src/netload/NLTriggerBuilder.cpp                   |   155 +-
 src/netload/NLTriggerBuilder.h                     |    89 +-
 src/netwrite/NWFrame.cpp                           |    25 +-
 src/netwrite/NWFrame.h                             |     4 +-
 src/netwrite/NWWriter_Amitran.cpp                  |     8 +-
 src/netwrite/NWWriter_Amitran.h                    |     4 +-
 src/netwrite/NWWriter_DlrNavteq.cpp                |   234 +-
 src/netwrite/NWWriter_DlrNavteq.h                  |    34 +-
 src/netwrite/NWWriter_MATSim.cpp                   |     8 +-
 src/netwrite/NWWriter_MATSim.h                     |     4 +-
 src/netwrite/NWWriter_OpenDrive.cpp                |   232 +-
 src/netwrite/NWWriter_OpenDrive.h                  |    29 +-
 src/netwrite/NWWriter_SUMO.cpp                     |    78 +-
 src/netwrite/NWWriter_SUMO.h                       |    13 +-
 src/netwrite/NWWriter_XML.cpp                      |    56 +-
 src/netwrite/NWWriter_XML.h                        |    10 +-
 src/od/ODAmitranHandler.cpp                        |    10 +-
 src/od/ODAmitranHandler.h                          |     4 +-
 src/od/ODCell.h                                    |     6 +-
 src/od/ODDistrict.cpp                              |    16 +-
 src/od/ODDistrict.h                                |    10 +-
 src/od/ODDistrictCont.cpp                          |     8 +-
 src/od/ODDistrictCont.h                            |     4 +-
 src/od/ODDistrictHandler.cpp                       |    24 +-
 src/od/ODDistrictHandler.h                         |     6 +-
 src/od/ODMatrix.cpp                                |    98 +-
 src/od/ODMatrix.h                                  |    36 +-
 src/od2trips_main.cpp                              |    14 +-
 src/osgview/GUIOSGBoundingBoxCalculator.h          |     4 +-
 src/osgview/GUIOSGBuilder.cpp                      |    96 +-
 src/osgview/GUIOSGBuilder.h                        |     6 +-
 src/osgview/GUIOSGView.cpp                         |    59 +-
 src/osgview/GUIOSGView.h                           |     6 +-
 src/polyconvert/Makefile.am                        |     5 -
 src/polyconvert/Makefile.in                        |     4 +-
 src/polyconvert/PCLoaderArcView.cpp                |    29 +-
 src/polyconvert/PCLoaderArcView.h                  |     4 +-
 src/polyconvert/PCLoaderDlrNavteq.cpp              |    16 +-
 src/polyconvert/PCLoaderDlrNavteq.h                |     4 +-
 src/polyconvert/PCLoaderOSM.cpp                    |    42 +-
 src/polyconvert/PCLoaderOSM.h                      |     8 +-
 src/polyconvert/PCLoaderVisum.cpp                  |    32 +-
 src/polyconvert/PCLoaderVisum.h                    |     4 +-
 src/polyconvert/PCLoaderXML.cpp                    |    10 +-
 src/polyconvert/PCLoaderXML.h                      |     6 +-
 src/polyconvert/PCNetProjectionLoader.cpp          |     8 +-
 src/polyconvert/PCNetProjectionLoader.h            |     4 +-
 src/polyconvert/PCPolyContainer.cpp                |    92 +-
 src/polyconvert/PCPolyContainer.h                  |    14 +-
 src/polyconvert/PCTypeDefHandler.cpp               |    10 +-
 src/polyconvert/PCTypeDefHandler.h                 |     4 +-
 src/polyconvert/PCTypeMap.cpp                      |    10 +-
 src/polyconvert/PCTypeMap.h                        |     8 +-
 src/polyconvert/polyconvert_main.cpp               |    32 +-
 src/router/ROAbstractEdgeBuilder.h                 |     4 +-
 src/router/ROEdge.cpp                              |    65 +-
 src/router/ROEdge.h                                |    68 +-
 src/router/ROFrame.cpp                             |     8 +-
 src/router/ROFrame.h                               |     4 +-
 src/router/ROHelper.cpp                            |     4 +-
 src/router/ROHelper.h                              |     4 +-
 src/router/ROLane.h                                |    14 +-
 src/router/ROLoader.cpp                            |    14 +-
 src/router/ROLoader.h                              |     8 +-
 src/router/RONet.cpp                               |    75 +-
 src/router/RONet.h                                 |    39 +-
 src/router/RONetHandler.cpp                        |    28 +-
 src/router/RONetHandler.h                          |     4 +-
 src/router/RONode.cpp                              |     8 +-
 src/router/RONode.h                                |     4 +-
 src/router/ROPerson.cpp                            |    26 +-
 src/router/ROPerson.h                              |    39 +-
 src/router/RORoutable.h                            |     6 +-
 src/router/RORoute.cpp                             |    18 +-
 src/router/RORoute.h                               |    20 +-
 src/router/RORouteDef.cpp                          |    24 +-
 src/router/RORouteDef.h                            |     6 +-
 src/router/RORouteHandler.cpp                      |    50 +-
 src/router/RORouteHandler.h                        |     6 +-
 src/router/ROVehicle.cpp                           |    15 +-
 src/router/ROVehicle.h                             |     8 +-
 src/sumo_main.cpp                                  |    84 +-
 src/tools/Makefile.am                              |     5 -
 src/tools/Makefile.in                              |     6 +-
 src/tools/TrajectoriesHandler.cpp                  |    36 +-
 src/tools/TrajectoriesHandler.h                    |    26 +-
 src/tools/emissionsDrivingCycle_main.cpp           |    24 +-
 src/tools/emissionsMap_main.cpp                    |    36 +-
 src/traci-server/Makefile.am                       |     7 +-
 src/traci-server/Makefile.in                       |   211 +-
 src/traci-server/TraCIConstants.h                  |   106 +-
 src/traci-server/TraCIDefs.h                       |   183 +
 src/traci-server/TraCIException.h                  |    57 -
 src/traci-server/TraCIServer.cpp                   |   114 +-
 src/traci-server/TraCIServer.h                     |    19 +-
 src/traci-server/TraCIServerAPI_ArealDetector.cpp  |   151 -
 src/traci-server/TraCIServerAPI_ArealDetector.h    |    80 -
 src/traci-server/TraCIServerAPI_Edge.cpp           |    46 +-
 src/traci-server/TraCIServerAPI_Edge.h             |     6 +-
 src/traci-server/TraCIServerAPI_InductionLoop.cpp  |    84 +-
 src/traci-server/TraCIServerAPI_InductionLoop.h    |     6 +-
 src/traci-server/TraCIServerAPI_Junction.cpp       |    59 +-
 src/traci-server/TraCIServerAPI_Junction.h         |     6 +-
 src/traci-server/TraCIServerAPI_Lane.cpp           |   156 +-
 src/traci-server/TraCIServerAPI_Lane.h             |     8 +-
 src/traci-server/TraCIServerAPI_LaneArea.cpp       |   141 +
 src/traci-server/TraCIServerAPI_LaneArea.h         |    80 +
 src/traci-server/TraCIServerAPI_MeMeDetector.cpp   |   113 -
 src/traci-server/TraCIServerAPI_MeMeDetector.h     |    76 -
 src/traci-server/TraCIServerAPI_MultiEntryExit.cpp |   102 +
 src/traci-server/TraCIServerAPI_MultiEntryExit.h   |    76 +
 src/traci-server/TraCIServerAPI_POI.cpp            |   253 +-
 src/traci-server/TraCIServerAPI_POI.h              |     6 +-
 src/traci-server/TraCIServerAPI_Person.cpp         |   331 +-
 src/traci-server/TraCIServerAPI_Person.h           |     6 +-
 src/traci-server/TraCIServerAPI_Polygon.cpp        |   286 +-
 src/traci-server/TraCIServerAPI_Polygon.h          |     6 +-
 src/traci-server/TraCIServerAPI_Route.cpp          |   118 +-
 src/traci-server/TraCIServerAPI_Route.h            |     6 +-
 src/traci-server/TraCIServerAPI_Simulation.cpp     |    64 +-
 src/traci-server/TraCIServerAPI_Simulation.h       |     9 +-
 src/traci-server/TraCIServerAPI_TLS.cpp            |    12 +-
 src/traci-server/TraCIServerAPI_TLS.h              |     6 +-
 src/traci-server/TraCIServerAPI_Vehicle.cpp        |  2255 +-
 src/traci-server/TraCIServerAPI_Vehicle.h          |    24 +-
 src/traci-server/TraCIServerAPI_VehicleType.cpp    |   293 +-
 src/traci-server/TraCIServerAPI_VehicleType.h      |    10 +-
 src/traci-server/lib/Makefile.am                   |    24 +
 src/traci-server/lib/Makefile.in                   |   652 +
 src/traci-server/lib/TraCI.cpp                     |   209 +
 src/traci-server/lib/TraCI.h                       |   124 +
 src/traci-server/lib/TraCI_InductionLoop.cpp       |   134 +
 src/traci-server/lib/TraCI_InductionLoop.h         |    82 +
 src/traci-server/lib/TraCI_Junction.cpp            |    78 +
 src/traci-server/lib/TraCI_Junction.h              |    85 +
 src/traci-server/lib/TraCI_Lane.cpp                |   326 +
 src/traci-server/lib/TraCI_Lane.h                  |   115 +
 src/traci-server/lib/TraCI_LaneArea.cpp            |   130 +
 src/traci-server/lib/TraCI_LaneArea.h              |    82 +
 src/traci-server/lib/TraCI_MultiEntryExit.cpp      |    93 +
 src/traci-server/lib/TraCI_MultiEntryExit.h        |    76 +
 src/traci-server/lib/TraCI_POI.cpp                 |   140 +
 src/traci-server/lib/TraCI_POI.h                   |    89 +
 src/traci-server/lib/TraCI_Polygon.cpp             |   100 +
 src/traci-server/lib/TraCI_Polygon.h               |    67 +
 src/traci-server/lib/TraCI_Route.cpp               |   108 +
 src/traci-server/lib/TraCI_Route.h                 |    82 +
 src/traci-server/lib/TraCI_Vehicle.cpp             |   770 +
 src/traci-server/lib/TraCI_Vehicle.h               |   220 +
 src/traci-server/lib/TraCI_VehicleType.cpp         |   195 +
 src/traci-server/lib/TraCI_VehicleType.h           |    88 +
 src/traci_testclient/Makefile.am                   |     7 +-
 src/traci_testclient/Makefile.in                   |     8 +-
 src/traci_testclient/TraCITestClient.cpp           |   122 +-
 src/traci_testclient/TraCITestClient.h             |     9 +-
 src/traci_testclient/tracitestclient_main.cpp      |     4 +-
 src/utils/common/AbstractMutex.h                   |     4 +-
 src/utils/common/Command.h                         |     4 +-
 src/utils/common/FileHelpers.cpp                   |    21 +-
 src/utils/common/FileHelpers.h                     |    25 +-
 src/utils/common/IDSupplier.cpp                    |    12 +-
 src/utils/common/IDSupplier.h                      |     8 +-
 src/utils/common/Makefile.am                       |     2 +-
 src/utils/common/Makefile.in                       |     2 +-
 src/utils/common/MsgHandler.cpp                    |     8 +-
 src/utils/common/MsgHandler.h                      |     4 +-
 src/utils/common/MsgRetrievingFunction.h           |     4 +-
 src/utils/common/Named.h                           |     6 +-
 src/utils/common/NamedObjectCont.h                 |     4 +-
 src/utils/common/NamedRTree.h                      |     4 +-
 src/utils/common/Parameterised.cpp                 |    29 +-
 src/utils/common/Parameterised.h                   |    18 +-
 src/utils/common/RGBColor.cpp                      |    22 +-
 src/utils/common/RGBColor.h                        |    12 +-
 src/utils/common/RandHelper.cpp                    |     8 +-
 src/utils/common/RandHelper.h                      |    16 +-
 src/utils/common/RandomDistributor.h               |   169 -
 src/utils/common/SUMOTime.cpp                      |     7 +-
 src/utils/common/SUMOTime.h                        |    10 +-
 src/utils/common/SUMOVehicleClass.cpp              |    28 +-
 src/utils/common/SUMOVehicleClass.h                |    41 +-
 src/utils/common/StaticCommand.h                   |     2 +-
 src/utils/common/StdDefs.cpp                       |    68 +-
 src/utils/common/StdDefs.h                         |    33 +-
 src/utils/common/StringBijection.h                 |     4 +-
 src/utils/common/StringTokenizer.cpp               |    12 +-
 src/utils/common/StringTokenizer.h                 |     7 +-
 src/utils/common/StringUtils.cpp                   |    13 +-
 src/utils/common/StringUtils.h                     |     7 +-
 src/utils/common/SysUtils.cpp                      |     8 +-
 src/utils/common/SysUtils.h                        |     4 +-
 src/utils/common/SystemFrame.cpp                   |    24 +-
 src/utils/common/SystemFrame.h                     |     6 +-
 src/utils/common/ToString.h                        |    68 +-
 src/utils/common/TplCheck.h                        |     9 +-
 src/utils/common/TplConvert.h                      |    49 +-
 src/utils/common/UtilExceptions.h                  |     4 +-
 src/utils/common/ValueRetriever.h                  |     4 +-
 src/utils/common/ValueSource.h                     |     6 +-
 src/utils/common/ValueTimeLine.h                   |    14 +-
 src/utils/common/VectorHelper.h                    |     6 +-
 src/utils/common/WrappingCommand.h                 |     4 +-
 src/utils/distribution/Distribution.h              |    24 +-
 src/utils/distribution/DistributionCont.cpp        |    19 +-
 src/utils/distribution/DistributionCont.h          |     7 +-
 src/utils/distribution/Distribution_MeanDev.cpp    |    58 -
 src/utils/distribution/Distribution_MeanDev.h      |    71 -
 .../distribution/Distribution_Parameterized.cpp    |   113 +
 .../distribution/Distribution_Parameterized.h      |   101 +
 src/utils/distribution/Distribution_Points.cpp     |    88 +-
 src/utils/distribution/Distribution_Points.h       |    44 +-
 src/utils/distribution/Makefile.am                 |    12 +-
 src/utils/distribution/Makefile.in                 |    18 +-
 src/utils/distribution/RandomDistributor.h         |   167 +
 src/utils/emissions/HelpersEnergy.cpp              |   130 +
 src/utils/emissions/HelpersEnergy.h                |    87 +
 src/utils/emissions/HelpersHBEFA.cpp               |    12 +-
 src/utils/emissions/HelpersHBEFA.h                 |    15 +-
 src/utils/emissions/HelpersHBEFA3.cpp              |    10 +-
 src/utils/emissions/HelpersHBEFA3.h                |    11 +-
 src/utils/emissions/HelpersHarmonoise.cpp          |    12 +-
 src/utils/emissions/HelpersHarmonoise.h            |    10 +-
 src/utils/emissions/HelpersPHEMlight.cpp           |    17 +-
 src/utils/emissions/HelpersPHEMlight.h             |     8 +-
 src/utils/emissions/Makefile.am                    |     3 +-
 src/utils/emissions/Makefile.in                    |    13 +-
 src/utils/emissions/PHEMCEP.cpp                    |     8 +-
 src/utils/emissions/PHEMCEP.h                      |     2 +-
 src/utils/emissions/PHEMCEPHandler.cpp             |     2 +-
 src/utils/emissions/PHEMCEPHandler.h               |     2 +-
 src/utils/emissions/PHEMConstants.h                |     2 +-
 src/utils/emissions/PollutantsInterface.cpp        |    40 +-
 src/utils/emissions/PollutantsInterface.h          |    46 +-
 src/utils/foxtools/FXBaseObject.cpp                |     7 +-
 src/utils/foxtools/FXBaseObject.h                  |     4 +-
 src/utils/foxtools/FXLCDLabel.cpp                  |     7 +-
 src/utils/foxtools/FXLCDLabel.h                    |     4 +-
 src/utils/foxtools/FXLinkLabel.cpp                 |    11 +-
 src/utils/foxtools/FXLinkLabel.h                   |     4 +-
 src/utils/foxtools/FXRealSpinDial.cpp              |     9 +-
 src/utils/foxtools/FXRealSpinDial.h                |     4 +-
 src/utils/foxtools/FXSevenSegment.cpp              |     5 +-
 src/utils/foxtools/FXSevenSegment.h                |     4 +-
 src/utils/foxtools/FXSingleEventThread.cpp         |     8 +-
 src/utils/foxtools/FXSingleEventThread.h           |     4 +-
 src/utils/foxtools/FXThreadEvent.cpp               |     7 +-
 src/utils/foxtools/FXThreadEvent.h                 |     4 +-
 src/utils/foxtools/FXThreadMessageRetriever.h      |     4 +-
 src/utils/foxtools/FXWorkerThread.h                |     4 +-
 src/utils/foxtools/MFXAddEditTypedTable.cpp        |    12 +-
 src/utils/foxtools/MFXAddEditTypedTable.h          |     4 +-
 src/utils/foxtools/MFXCheckableButton.cpp          |     8 +-
 src/utils/foxtools/MFXCheckableButton.h            |    43 +-
 src/utils/foxtools/MFXEditableTable.cpp            |     8 +-
 src/utils/foxtools/MFXEditableTable.h              |     4 +-
 src/utils/foxtools/MFXEventQue.cpp                 |     6 +-
 src/utils/foxtools/MFXEventQue.h                   |     4 +-
 src/utils/foxtools/MFXImageHelper.cpp              |    15 +-
 src/utils/foxtools/MFXImageHelper.h                |     4 +-
 src/utils/foxtools/MFXInterThreadEventClient.h     |     4 +-
 src/utils/foxtools/MFXMenuHeader.cpp               |    17 +-
 src/utils/foxtools/MFXMenuHeader.h                 |     9 +-
 src/utils/foxtools/MFXMutex.cpp                    |     8 +-
 src/utils/foxtools/MFXMutex.h                      |     4 +-
 src/utils/foxtools/MFXUtils.cpp                    |     8 +-
 src/utils/foxtools/MFXUtils.h                      |     4 +-
 src/utils/foxtools/fxexdefs.h                      |     4 +-
 src/utils/geom/AbstractPoly.h                      |    10 +-
 src/utils/geom/Boundary.cpp                        |    56 +-
 src/utils/geom/Boundary.h                          |    47 +-
 src/utils/geom/Bresenham.cpp                       |     8 +-
 src/utils/geom/Bresenham.h                         |     4 +-
 src/utils/geom/GeoConvHelper.cpp                   |    20 +-
 src/utils/geom/GeoConvHelper.h                     |     6 +-
 src/utils/geom/GeomConvHelper.cpp                  |    22 +-
 src/utils/geom/GeomConvHelper.h                    |     8 +-
 src/utils/geom/GeomHelper.cpp                      |    86 +-
 src/utils/geom/GeomHelper.h                        |    30 +-
 src/utils/geom/Helper_ConvexHull.cpp               |    10 +-
 src/utils/geom/Helper_ConvexHull.h                 |     8 +-
 src/utils/geom/Position.cpp                        |     8 +-
 src/utils/geom/Position.h                          |   142 +-
 src/utils/geom/PositionVector.cpp                  |   381 +-
 src/utils/geom/PositionVector.h                    |    95 +-
 src/utils/geom/bezier.cpp                          |    38 +-
 src/utils/geom/bezier.h                            |     6 +-
 src/utils/gui/div/GLHelper.cpp                     |   132 +-
 src/utils/gui/div/GLHelper.h                       |    63 +-
 src/utils/gui/div/GLObjectValuePassConnector.h     |     6 +-
 src/utils/gui/div/GUIDesigns.h                     |   429 +
 src/utils/gui/div/GUIDialog_GLChosenEditor.cpp     |    13 +-
 src/utils/gui/div/GUIDialog_GLChosenEditor.h       |     4 +-
 src/utils/gui/div/GUIGlobalSelection.cpp           |     8 +-
 src/utils/gui/div/GUIGlobalSelection.h             |     4 +-
 src/utils/gui/div/GUIIOGlobals.cpp                 |     8 +-
 src/utils/gui/div/GUIIOGlobals.h                   |     4 +-
 src/utils/gui/div/GUIMessageWindow.cpp             |     8 +-
 src/utils/gui/div/GUIMessageWindow.h               |     4 +-
 src/utils/gui/div/GUIParam_PopupMenu.cpp           |    10 +-
 src/utils/gui/div/GUIParam_PopupMenu.h             |     8 +-
 src/utils/gui/div/GUIParameterTableItem.h          |    18 +-
 src/utils/gui/div/GUIParameterTableWindow.cpp      |    32 +-
 src/utils/gui/div/GUIParameterTableWindow.h        |    12 +-
 src/utils/gui/div/GUISelectedStorage.cpp           |    14 +-
 src/utils/gui/div/GUISelectedStorage.h             |    47 +-
 src/utils/gui/div/GUIUserIO.cpp                    |     8 +-
 src/utils/gui/div/GUIUserIO.h                      |     4 +-
 src/utils/gui/div/GUIVideoEncoder.h                |    19 +-
 src/utils/gui/div/Makefile.am                      |     1 +
 src/utils/gui/div/Makefile.in                      |     1 +
 src/utils/gui/events/GUIEvent.h                    |     4 +-
 src/utils/gui/events/GUIEvent_Message.h            |     4 +-
 src/utils/gui/events/GUIEvent_SimulationStep.h     |     4 +-
 src/utils/gui/globjects/GLIncludes.h               |     4 +-
 src/utils/gui/globjects/GUIGLObjectPopupMenu.cpp   |     8 +-
 src/utils/gui/globjects/GUIGLObjectPopupMenu.h     |     4 +-
 src/utils/gui/globjects/GUIGlObject.cpp            |    10 +-
 src/utils/gui/globjects/GUIGlObject.h              |     6 +-
 src/utils/gui/globjects/GUIGlObjectStorage.cpp     |     8 +-
 src/utils/gui/globjects/GUIGlObjectStorage.h       |     4 +-
 src/utils/gui/globjects/GUIGlObjectTypes.h         |     4 +-
 .../gui/globjects/GUIGlObject_AbstractAdd.cpp      |     8 +-
 src/utils/gui/globjects/GUIGlObject_AbstractAdd.h  |     4 +-
 src/utils/gui/globjects/GUIPointOfInterest.cpp     |    16 +-
 src/utils/gui/globjects/GUIPointOfInterest.h       |     8 +-
 src/utils/gui/globjects/GUIPolygon.cpp             |    14 +-
 src/utils/gui/globjects/GUIPolygon.h               |    14 +-
 src/utils/gui/globjects/GUIShapeContainer.cpp      |    16 +-
 src/utils/gui/globjects/GUIShapeContainer.h        |    12 +-
 src/utils/gui/images/GNETexture_E1.cpp             |     4 +-
 src/utils/gui/images/GNETexture_E2.cpp             |     4 +-
 src/utils/gui/images/GNETexture_E3.cpp             |     4 +-
 src/utils/gui/images/GNETexture_E3Selected.cpp     |     4 +-
 src/utils/gui/images/GNETexture_Empty.cpp          |     4 +-
 src/utils/gui/images/GNETexture_EmptySelected.cpp  |     4 +-
 src/utils/gui/images/GNETexture_Entry.cpp          |     4 +-
 src/utils/gui/images/GNETexture_Exit.cpp           |     4 +-
 src/utils/gui/images/GNETexture_LaneBike.cpp       |     4 +-
 src/utils/gui/images/GNETexture_LaneBus.cpp        |     4 +-
 src/utils/gui/images/GNETexture_LanePedestrian.cpp |     7 +-
 src/utils/gui/images/GNETexture_Lock.cpp           |     4 +-
 src/utils/gui/images/GNETexture_LockSelected.cpp   |     4 +-
 src/utils/gui/images/GNETexture_NotMoving.cpp      |     4 +-
 .../gui/images/GNETexture_NotMovingSelected.cpp    |     4 +-
 src/utils/gui/images/GNETexture_Rerouter.cpp       |     4 +-
 .../gui/images/GNETexture_RerouterSelected.cpp     |     4 +-
 src/utils/gui/images/GNETexture_RouteProbe.cpp     |     4 +-
 .../gui/images/GNETexture_RouteProbeSelected.cpp   |     4 +-
 src/utils/gui/images/GNETexture_TLS.cpp            |     4 +-
 src/utils/gui/images/GNETexture_Vaporizer.cpp      |     4 +-
 .../gui/images/GNETexture_VaporizerSelected.cpp    |     4 +-
 .../gui/images/GNETexture_VariableSpeedSign.cpp    |   149 +
 .../GNETexture_VariableSpeedSignSelected.cpp       |   149 +
 .../gui/images/GNETexture_VariableSpeedSignal.cpp  |   149 -
 .../GNETexture_VariableSpeedSignalSelected.cpp     |   149 -
 src/utils/gui/images/GUIIconSubSys.cpp             |   201 +-
 src/utils/gui/images/GUIIconSubSys.h               |    19 +-
 src/utils/gui/images/GUIIcons.h                    |   152 +-
 src/utils/gui/images/GUITextureSubSys.cpp          |    34 +-
 src/utils/gui/images/GUITextureSubSys.h            |    28 +-
 src/utils/gui/images/GUITextures.h                 |     8 +-
 src/utils/gui/images/GUITexturesHelper.cpp         |    15 +-
 src/utils/gui/images/GUITexturesHelper.h           |    19 +-
 src/utils/gui/images/Makefile.am                   |    22 +-
 src/utils/gui/images/Makefile.in                   |    22 +-
 src/utils/gui/images/accept.xpm                    |    52 +
 src/utils/gui/images/busstop.xpm                   |    76 +
 src/utils/gui/images/calibrator.xpm                |   278 +
 src/utils/gui/images/cancel.xpm                    |    31 +
 src/utils/gui/images/chargingstation.xpm           |    89 +
 src/utils/gui/images/cleanjunctions.xpm            |   107 +
 src/utils/gui/images/computejunctions.xpm          |    96 +
 src/utils/gui/images/connection.xpm                |   278 +
 src/utils/gui/images/containerstop.xpm             |    69 +
 src/utils/gui/images/correct.xpm                   |    31 +
 src/utils/gui/images/crossing.xpm                  |   278 +
 src/utils/gui/images/dlr.xpm                       |   327 +
 src/utils/gui/images/e1.xpm                        |   278 +
 src/utils/gui/images/e2.xpm                        |   278 +
 src/utils/gui/images/e3.xpm                        |   278 +
 src/utils/gui/images/e3entry.xpm                   |   278 +
 src/utils/gui/images/e3exit.xpm                    |   278 +
 src/utils/gui/images/edge.xpm                      |   278 +
 src/utils/gui/images/empty.xpm                     |   278 +
 src/utils/gui/images/error.xpm                     |    32 +
 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/grid1.xpm                     |   280 +
 src/utils/gui/images/grid2.xpm                     |   280 +
 src/utils/gui/images/grid3.xpm                     |   280 +
 src/utils/gui/images/joinjunctions.xpm             |    62 +
 src/utils/gui/images/junction.xpm                  |   278 +
 src/utils/gui/images/lane.xpm                      |   278 +
 src/utils/gui/images/lanebike.xpm                  |     2 +-
 src/utils/gui/images/lanebus.xpm                   |     2 +-
 src/utils/gui/images/lanepedestrian.xpm            |     2 +-
 src/utils/gui/images/manip.cpp                     |     4 +-
 src/utils/gui/images/modeadditional.xpm            |    31 +
 src/utils/gui/images/modeconnection.xpm            |   278 +
 src/utils/gui/images/modecreateedge.xpm            |    34 +
 src/utils/gui/images/modecrossing.xpm              |   278 +
 src/utils/gui/images/modedelete.xpm                |   126 +
 src/utils/gui/images/modeinspect.xpm               |    24 +
 src/utils/gui/images/modemove.xpm                  |    24 +
 src/utils/gui/images/modeselect.xpm                |   278 +
 src/utils/gui/images/modetrafficlight.xpm          |   278 +
 src/utils/gui/images/neteditarrow.xpm              |     2 +-
 src/utils/gui/images/options.xpm                   |    95 +
 src/utils/gui/images/prohibition.xpm               |   278 +
 src/utils/gui/images/recenter_view.xpm             |     4 +-
 src/utils/gui/images/rerouter.xpm                  |   278 +
 src/utils/gui/images/reset.xpm                     |    35 +
 src/utils/gui/images/routeprobe.xpm                |   278 +
 src/utils/gui/images/sumo.xpm                      |   327 +
 src/utils/gui/images/vaporizer.xpm                 |   278 +
 src/utils/gui/images/variablespeedsign.xpm         |   278 +
 src/utils/gui/images/vclass_army.xpm               |   294 +
 src/utils/gui/images/vclass_authority.xpm          |   294 +
 src/utils/gui/images/vclass_bicycle.xpm            |   294 +
 src/utils/gui/images/vclass_bus.xpm                |   294 +
 src/utils/gui/images/vclass_coach.xpm              |   294 +
 src/utils/gui/images/vclass_custom1.xpm            |   294 +
 src/utils/gui/images/vclass_custom2.xpm            |   294 +
 src/utils/gui/images/vclass_delivery.xpm           |   294 +
 src/utils/gui/images/vclass_emergency.xpm          |   294 +
 src/utils/gui/images/vclass_evehicle.xpm           |   294 +
 src/utils/gui/images/vclass_hov.xpm                |   294 +
 src/utils/gui/images/vclass_ignoring.xpm           |   294 +
 src/utils/gui/images/vclass_moped.xpm              |   294 +
 src/utils/gui/images/vclass_motorcycle.xpm         |   294 +
 src/utils/gui/images/vclass_passenger.xpm          |   282 +
 src/utils/gui/images/vclass_pedestrian.xpm         |   288 +
 src/utils/gui/images/vclass_private.xpm            |   284 +
 src/utils/gui/images/vclass_rail.xpm               |   290 +
 src/utils/gui/images/vclass_rail_electric.xpm      |   294 +
 src/utils/gui/images/vclass_rail_urban.xpm         |   284 +
 src/utils/gui/images/vclass_ship.xpm               |   282 +
 src/utils/gui/images/vclass_taxi.xpm               |   294 +
 src/utils/gui/images/vclass_trailer.xpm            |   294 +
 src/utils/gui/images/vclass_tram.xpm               |   288 +
 src/utils/gui/images/vclass_truck.xpm              |   294 +
 src/utils/gui/images/vclass_vip.xpm                |   294 +
 src/utils/gui/images/warning.xpm                   |    31 +
 .../gui/settings/GUICompleteSchemeStorage.cpp      |    10 +-
 src/utils/gui/settings/GUICompleteSchemeStorage.h  |     6 +-
 src/utils/gui/settings/GUIPropertyScheme.h         |    34 +-
 src/utils/gui/settings/GUIPropertySchemeStorage.h  |     4 +-
 src/utils/gui/settings/GUISettingsHandler.cpp      |    92 +-
 src/utils/gui/settings/GUISettingsHandler.h        |    14 +-
 .../gui/settings/GUIVisualizationSettings.cpp      |   485 +-
 src/utils/gui/settings/GUIVisualizationSettings.h  |    32 +-
 src/utils/gui/tracker/GUIParameterTracker.cpp      |    58 +-
 src/utils/gui/tracker/GUIParameterTracker.h        |    17 +-
 src/utils/gui/tracker/TrackerValueDesc.cpp         |    28 +-
 src/utils/gui/tracker/TrackerValueDesc.h           |    30 +-
 src/utils/gui/windows/GUIAppEnum.h                 |   580 +-
 .../gui/windows/GUIDanielPerspectiveChanger.cpp    |    77 +-
 .../gui/windows/GUIDanielPerspectiveChanger.h      |    32 +-
 src/utils/gui/windows/GUIDialog_EditViewport.cpp   |   112 +-
 src/utils/gui/windows/GUIDialog_EditViewport.h     |    20 +-
 src/utils/gui/windows/GUIDialog_GLObjChooser.cpp   |    35 +-
 src/utils/gui/windows/GUIDialog_GLObjChooser.h     |     7 +-
 src/utils/gui/windows/GUIDialog_ViewSettings.cpp   |   605 +-
 src/utils/gui/windows/GUIDialog_ViewSettings.h     |     6 +-
 src/utils/gui/windows/GUIGlChildWindow.cpp         |    56 +-
 src/utils/gui/windows/GUIGlChildWindow.h           |    11 +-
 src/utils/gui/windows/GUIMainWindow.cpp            |    72 +-
 src/utils/gui/windows/GUIMainWindow.h              |    28 +-
 src/utils/gui/windows/GUIPerspectiveChanger.cpp    |    12 +-
 src/utils/gui/windows/GUIPerspectiveChanger.h      |    26 +-
 src/utils/gui/windows/GUISUMOAbstractView.cpp      |   154 +-
 src/utils/gui/windows/GUISUMOAbstractView.h        |    43 +-
 src/utils/importio/LineHandler.h                   |     4 +-
 src/utils/importio/LineReader.cpp                  |     8 +-
 src/utils/importio/LineReader.h                    |     4 +-
 src/utils/importio/NamedColumnsParser.cpp          |     8 +-
 src/utils/importio/NamedColumnsParser.h            |     4 +-
 src/utils/iodevices/BinaryFormatter.cpp            |    36 +-
 src/utils/iodevices/BinaryFormatter.h              |    27 +-
 src/utils/iodevices/BinaryInputDevice.cpp          |    20 +-
 src/utils/iodevices/BinaryInputDevice.h            |    23 +-
 src/utils/iodevices/OutputDevice.cpp               |    28 +-
 src/utils/iodevices/OutputDevice.h                 |    15 +-
 src/utils/iodevices/OutputDevice_CERR.cpp          |     6 +-
 src/utils/iodevices/OutputDevice_CERR.h            |     4 +-
 src/utils/iodevices/OutputDevice_COUT.cpp          |     8 +-
 src/utils/iodevices/OutputDevice_COUT.h            |     4 +-
 src/utils/iodevices/OutputDevice_File.cpp          |     8 +-
 src/utils/iodevices/OutputDevice_File.h            |     4 +-
 src/utils/iodevices/OutputDevice_Network.cpp       |    15 +-
 src/utils/iodevices/OutputDevice_Network.h         |     4 +-
 src/utils/iodevices/OutputDevice_String.cpp        |     8 +-
 src/utils/iodevices/OutputDevice_String.h          |     4 +-
 src/utils/iodevices/OutputFormatter.h              |     8 +-
 src/utils/iodevices/PlainXMLFormatter.cpp          |    17 +-
 src/utils/iodevices/PlainXMLFormatter.h            |     9 +-
 src/utils/options/Option.cpp                       |    18 +-
 src/utils/options/Option.h                         |    26 +-
 src/utils/options/OptionsCont.cpp                  |    44 +-
 src/utils/options/OptionsCont.h                    |    24 +-
 src/utils/options/OptionsIO.cpp                    |    24 +-
 src/utils/options/OptionsIO.h                      |    18 +-
 src/utils/options/OptionsLoader.cpp                |     4 +-
 src/utils/options/OptionsLoader.h                  |     4 +-
 src/utils/options/OptionsParser.cpp                |     8 +-
 src/utils/options/OptionsParser.h                  |     4 +-
 src/utils/shapes/PointOfInterest.h                 |    24 +-
 src/utils/shapes/Polygon.cpp                       |    17 +-
 src/utils/shapes/Polygon.h                         |     8 +-
 src/utils/shapes/Shape.cpp                         |    20 +-
 src/utils/shapes/Shape.h                           |    28 +-
 src/utils/shapes/ShapeContainer.cpp                |    16 +-
 src/utils/shapes/ShapeContainer.h                  |    12 +-
 src/utils/shapes/ShapeHandler.cpp                  |    36 +-
 src/utils/shapes/ShapeHandler.h                    |    10 +-
 src/utils/traci/Makefile.am                        |     4 +-
 src/utils/traci/Makefile.in                        |    24 +-
 src/utils/traci/TraCIAPI.cpp                       |   763 +-
 src/utils/traci/TraCIAPI.h                         |   416 +-
 src/utils/vehicle/AStarRouter.h                    |    85 +-
 src/utils/vehicle/CHBuilder.h                      |   528 +
 src/utils/vehicle/CHRouter.h                       |   554 +-
 src/utils/vehicle/CHRouterWrapper.h                |   110 +-
 src/utils/vehicle/CarEdge.h                        |    47 +-
 src/utils/vehicle/DijkstraRouterEffort.h           |    32 +-
 src/utils/vehicle/DijkstraRouterTT.h               |    35 +-
 src/utils/vehicle/GawronCalculator.h               |    38 +-
 src/utils/vehicle/IntermodalEdge.h                 |    36 +-
 src/utils/vehicle/IntermodalNetwork.h              |    12 +-
 src/utils/vehicle/IntermodalRouter.h               |   133 +-
 src/utils/vehicle/LogitCalculator.h                |    52 +-
 src/utils/vehicle/Makefile.am                      |     2 +-
 src/utils/vehicle/Makefile.in                      |     2 +-
 src/utils/vehicle/PedestrianRouter.h               |    10 +-
 src/utils/vehicle/RouteCostCalculator.h            |     6 +-
 src/utils/vehicle/SPTree.h                         |    24 +-
 src/utils/vehicle/SUMOAbstractRouter.h             |    12 +-
 src/utils/vehicle/SUMOVTypeParameter.cpp           |   108 +-
 src/utils/vehicle/SUMOVTypeParameter.h             |   101 +-
 src/utils/vehicle/SUMOVehicle.h                    |    58 +-
 src/utils/vehicle/SUMOVehicleParameter.cpp         |    67 +-
 src/utils/vehicle/SUMOVehicleParameter.h           |    59 +-
 src/utils/xml/GenericSAXHandler.cpp                |     8 +-
 src/utils/xml/GenericSAXHandler.h                  |     4 +-
 src/utils/xml/Makefile.am                          |     1 +
 src/utils/xml/Makefile.in                          |     3 +
 src/utils/xml/SAXWeightsHandler.cpp                |    14 +-
 src/utils/xml/SAXWeightsHandler.h                  |    12 +-
 src/utils/xml/SUMORouteHandler.cpp                 |    20 +-
 src/utils/xml/SUMORouteHandler.h                   |    12 +-
 src/utils/xml/SUMORouteLoader.cpp                  |     8 +-
 src/utils/xml/SUMORouteLoader.h                    |     4 +-
 src/utils/xml/SUMORouteLoaderControl.cpp           |     6 +-
 src/utils/xml/SUMORouteLoaderControl.h             |     4 +-
 src/utils/xml/SUMOSAXAttributes.cpp                |    14 +-
 src/utils/xml/SUMOSAXAttributes.h                  |    35 +-
 src/utils/xml/SUMOSAXAttributesImpl_Binary.cpp     |    60 +-
 src/utils/xml/SUMOSAXAttributesImpl_Binary.h       |    37 +-
 src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp     |   245 +
 src/utils/xml/SUMOSAXAttributesImpl_Cached.h       |   321 +
 src/utils/xml/SUMOSAXAttributesImpl_Xerces.cpp     |    40 +-
 src/utils/xml/SUMOSAXAttributesImpl_Xerces.h       |    30 +-
 src/utils/xml/SUMOSAXHandler.cpp                   |     8 +-
 src/utils/xml/SUMOSAXHandler.h                     |     4 +-
 src/utils/xml/SUMOSAXReader.cpp                    |    40 +-
 src/utils/xml/SUMOSAXReader.h                      |     9 +-
 src/utils/xml/SUMOVehicleParserHelper.cpp          |    71 +-
 src/utils/xml/SUMOVehicleParserHelper.h            |     4 +-
 src/utils/xml/SUMOXMLDefinitions.cpp               |    83 +-
 src/utils/xml/SUMOXMLDefinitions.h                 |   593 +-
 src/utils/xml/XMLSubSys.cpp                        |     8 +-
 src/utils/xml/XMLSubSys.h                          |     4 +-
 src/version.h                                      |     2 +-
 src/windows_config.h                               |    30 +-
 tools/assign/Assignment.py                         |     6 +-
 tools/assign/assign.py                             |     4 +-
 tools/assign/cadytsIterate.py                      |     4 +-
 tools/assign/costFunctionChecker.py                |     4 +-
 tools/assign/costMemory.py                         |     4 +-
 tools/assign/dijkstra.py                           |     4 +-
 tools/assign/duaIterate.py                         |    34 +-
 tools/assign/duaIterate_analysis.py                |     4 +-
 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                           |     4 +-
 tools/assign/outputs.py                            |     6 +-
 tools/assign/routeChoices.py                       |     4 +-
 tools/assign/run.py                                |     4 +-
 tools/assign/statisticsElements.py                 |     4 +-
 tools/assign/tables.py                             |     2 +-
 tools/build/apply_astyle.py                        |    20 +-
 tools/build/buildHTMLDocs.py                       |    35 +-
 tools/build/checkAuthors.py                        |     4 +-
 tools/build/checkImages.py                         |     4 +-
 tools/build/checkStyle.py                          |   191 +
 tools/build/checkSvnProps.py                       |   170 -
 tools/build/configTemplateToWiki.py                |     4 +-
 tools/build/dailyBuildMSVC.py                      |    34 +-
 tools/build/dailyUpdateMakeGCC.sh                  |     7 +-
 tools/build/history.py                             |    60 +-
 tools/build/mirrorWiki.py                          |    31 +-
 tools/build/pythonPropsMSVC.py                     |     4 +-
 tools/build/runSikulixServer.pyw                   |   152 +
 tools/build/setup-sumolib.py                       |    65 +
 tools/build/setup-traci.py                         |    65 +
 tools/build/status.py                              |     4 +-
 tools/build/typemap.py                             |     8 +-
 tools/build/version.py                             |    15 +-
 tools/build/wix.py                                 |     4 +-
 .../sumolib4matlab/+sumolib/+demand/BusStop.m      |    84 +-
 .../sumolib4matlab/+sumolib/+demand/Flow.m         |   216 +-
 .../sumolib4matlab/+sumolib/+demand/Stop.m         |   136 +-
 .../+sumolib/+demand/TurnProbability.m             |    86 +-
 .../sumolib4matlab/+sumolib/+demand/VehicleType.m  |   206 +-
 .../+sumolib/+demand/generateDemand.m              |   516 +-
 .../inter_palmas/generateDemand_inter_palmas.m     |   134 +-
 .../inter_palmas/inter_palmas_notls.net.xml        |   652 +-
 .../edu/unalmed/gaunal/sumolib/net/Connection.java |    80 +-
 .../co/edu/unalmed/gaunal/sumolib/net/Edge.java    |   278 +-
 .../co/edu/unalmed/gaunal/sumolib/net/Lane.java    |   122 +-
 .../src/co/edu/unalmed/gaunal/sumolib/net/Net.java |   450 +-
 .../edu/unalmed/gaunal/sumolib/net/NetReader.java  |   494 +-
 .../co/edu/unalmed/gaunal/sumolib/net/Node.java    |   168 +-
 .../edu/unalmed/gaunal/sumolib/net/Roundabout.java |    50 +-
 .../src/co/edu/unalmed/gaunal/sumolib/net/TLS.java |   108 +-
 .../edu/unalmed/gaunal/sumolib/net/TLSProgram.java |    80 +-
 .../unalmed/gaunal/sumolib/net/NetReaderTest.java  |   600 +-
 .../co/edu/unalmed/gaunal/sumolib/net/NetTest.java |  1006 +-
 tools/contributed/sumopy/__init__.py               |     1 -
 tools/contributed/sumopy/agilepy/__init__.py       |     1 -
 .../sumopy/agilepy/lib_base/__init__.py            |     1 -
 .../sumopy/agilepy/lib_base/arrayman.py            |  1245 +-
 tools/contributed/sumopy/agilepy/lib_base/base.py  |  4214 ++--
 .../sumopy/agilepy/lib_base/classman.py            |  2687 ++-
 .../sumopy/agilepy/lib_base/geometry.py            |   444 +-
 .../contributed/sumopy/agilepy/lib_base/logger.py  |    57 +-
 tools/contributed/sumopy/agilepy/lib_base/misc.py  |    54 +-
 .../sumopy/agilepy/lib_base/processes.py           |   968 +-
 .../agilepy/lib_base/test_classman_classes.py      |  1237 +-
 .../sumopy/agilepy/lib_base/test_classman_misc.py  |    14 +-
 .../sumopy/agilepy/lib_base/test_classman_save.py  |  1163 +-
 .../agilepy/lib_base/test_classman_tables.py       |   915 +-
 .../contributed/sumopy/agilepy/lib_base/xmlman.py  |   192 +-
 .../contributed/sumopy/agilepy/lib_wx/__init__.py  |     1 -
 .../contributed/sumopy/agilepy/lib_wx/mainframe.py |   444 +-
 .../contributed/sumopy/agilepy/lib_wx/modulegui.py |   279 +-
 .../contributed/sumopy/agilepy/lib_wx/objpanel.py  |  4688 ++--
 .../contributed/sumopy/agilepy/lib_wx/ogleditor.py |  5890 +++--
 .../sumopy/agilepy/lib_wx/processdialog.py         |   184 +-
 .../contributed/sumopy/agilepy/lib_wx/test_app.py  |   320 +-
 .../sumopy/agilepy/lib_wx/test_glcanvas.py         |  1881 +-
 .../sumopy/agilepy/lib_wx/test_notebook.py         |    75 +-
 tools/contributed/sumopy/agilepy/lib_wx/toolbox.py |   509 +-
 tools/contributed/sumopy/agilepy/lib_wx/wxmisc.py  |  1126 +-
 tools/contributed/sumopy/coremodules/__init__.py   |     1 -
 .../sumopy/coremodules/demand/__init__.py          |    18 +-
 .../sumopy/coremodules/demand/demand.py            |  1445 +-
 .../coremodules/demand/origin_to_destination.py    |   828 +-
 .../demand/origin_to_destination_wxgui.py          |   406 +-
 .../sumopy/coremodules/demand/turnflows.py         |   918 +-
 .../sumopy/coremodules/demand/turnflows_wxgui.py   |   240 +-
 .../sumopy/coremodules/demand/vehicles.py          |  1656 +-
 .../sumopy/coremodules/demand/virtualpop.py        |  1570 +-
 .../contributed/sumopy/coremodules/demand/wxgui.py |   949 +-
 .../sumopy/coremodules/landuse/__init__.py         |    18 +-
 .../sumopy/coremodules/landuse/landuse.py          |  1779 +-
 .../contributed/sumopy/coremodules/landuse/maps.py |   684 +-
 .../sumopy/coremodules/landuse/wxgui.py            |   927 +-
 .../sumopy/coremodules/modules_common.py           |     1 -
 .../sumopy/coremodules/network/__init__.py         |    18 +-
 .../sumopy/coremodules/network/network.py          |  6018 +++--
 .../sumopy/coremodules/network/network_editor.py   |  1136 +-
 .../sumopy/coremodules/network/routing.py          |    67 +-
 .../sumopy/coremodules/network/wxgui.py            |   386 +-
 .../sumopy/coremodules/scenario/__init__.py        |    18 +-
 .../sumopy/coremodules/scenario/scenario.py        |   423 +-
 .../sumopy/coremodules/scenario/wxgui.py           |   291 +-
 .../sumopy/coremodules/simulation/__init__.py      |    18 +-
 .../coremodules/simulation/result_oglviewer.py     |  1405 +-
 .../sumopy/coremodules/simulation/results.py       |   557 +-
 .../sumopy/coremodules/simulation/results_mpl.py   |   464 +-
 .../sumopy/coremodules/simulation/sumo.py          |   992 +-
 .../sumopy/coremodules/simulation/wxgui.py         |   463 +-
 tools/contributed/sumopy/sumopy_gui.py             |    92 +-
 tools/contributed/traas/.classpath                 |    12 +-
 tools/contributed/traas/.project                   |    34 +-
 .../.settings/org.eclipse.core.resources.prefs     |     4 +-
 .../traas/.settings/org.eclipse.jdt.core.prefs     |    22 +-
 .../traas/examples/java_library/Main.java          |   108 +-
 .../traas/examples/java_wsclient/Main.java         |   108 +-
 .../java_wsclient/de/tudresden/ws/AddOption.java   |   174 +-
 .../de/tudresden/ws/AddOptionResponse.java         |    64 +-
 .../de/tudresden/ws/ArealDetectorGetIDCount.java   |    64 +-
 .../ws/ArealDetectorGetIDCountResponse.java        |   108 +-
 .../de/tudresden/ws/ArealDetectorGetIDList.java    |    64 +-
 .../ws/ArealDetectorGetIDListResponse.java         |   138 +-
 .../ws/ArealDetectorGetJamLengthMeters.java        |   120 +-
 .../ArealDetectorGetJamLengthMetersResponse.java   |   108 +-
 .../ws/ArealDetectorGetJamLengthVehicle.java       |   120 +-
 .../ArealDetectorGetJamLengthVehicleResponse.java  |   108 +-
 .../ws/ArealDetectorGetLastStepMeanSpeed.java      |   120 +-
 .../ArealDetectorGetLastStepMeanSpeedResponse.java |   108 +-
 .../ws/ArealDetectorGetLastStepOccupancy.java      |   120 +-
 .../ArealDetectorGetLastStepOccupancyResponse.java |   108 +-
 .../java_wsclient/de/tudresden/ws/DoTimestep.java  |    64 +-
 .../de/tudresden/ws/DoTimestepResponse.java        |    64 +-
 .../de/tudresden/ws/EdgeAdaptTraveltime.java       |   158 +-
 .../tudresden/ws/EdgeAdaptTraveltimeResponse.java  |    64 +-
 .../de/tudresden/ws/EdgeGetAdaptedTraveltime.java  |   158 +-
 .../ws/EdgeGetAdaptedTraveltimeResponse.java       |   108 +-
 .../de/tudresden/ws/EdgeGetCO2Emission.java        |   120 +-
 .../tudresden/ws/EdgeGetCO2EmissionResponse.java   |   108 +-
 .../de/tudresden/ws/EdgeGetCOEmission.java         |   120 +-
 .../de/tudresden/ws/EdgeGetCOEmissionResponse.java |   108 +-
 .../de/tudresden/ws/EdgeGetEffort.java             |   158 +-
 .../de/tudresden/ws/EdgeGetEffortResponse.java     |   108 +-
 .../ws/EdgeGetElectricityConsumption.java          |   120 +-
 .../ws/EdgeGetElectricityConsumptionResponse.java  |   108 +-
 .../de/tudresden/ws/EdgeGetFuelConsumption.java    |   120 +-
 .../ws/EdgeGetFuelConsumptionResponse.java         |   108 +-
 .../de/tudresden/ws/EdgeGetHCEmission.java         |   120 +-
 .../de/tudresden/ws/EdgeGetHCEmissionResponse.java |   108 +-
 .../de/tudresden/ws/EdgeGetIDCount.java            |    64 +-
 .../de/tudresden/ws/EdgeGetIDCountResponse.java    |   108 +-
 .../de/tudresden/ws/EdgeGetIDList.java             |    64 +-
 .../de/tudresden/ws/EdgeGetIDListResponse.java     |   138 +-
 .../tudresden/ws/EdgeGetLastStepHaltingNumber.java |   120 +-
 .../ws/EdgeGetLastStepHaltingNumberResponse.java   |   108 +-
 .../de/tudresden/ws/EdgeGetLastStepLength.java     |   120 +-
 .../ws/EdgeGetLastStepLengthResponse.java          |   108 +-
 .../de/tudresden/ws/EdgeGetLastStepMeanSpeed.java  |   120 +-
 .../ws/EdgeGetLastStepMeanSpeedResponse.java       |   108 +-
 .../de/tudresden/ws/EdgeGetLastStepOccupancy.java  |   120 +-
 .../ws/EdgeGetLastStepOccupancyResponse.java       |   108 +-
 .../de/tudresden/ws/EdgeGetLastStepVehicleIDs.java |   120 +-
 .../ws/EdgeGetLastStepVehicleIDsResponse.java      |   138 +-
 .../tudresden/ws/EdgeGetLastStepVehicleNumber.java |   120 +-
 .../ws/EdgeGetLastStepVehicleNumberResponse.java   |   108 +-
 .../de/tudresden/ws/EdgeGetNOxEmission.java        |   120 +-
 .../tudresden/ws/EdgeGetNOxEmissionResponse.java   |   108 +-
 .../de/tudresden/ws/EdgeGetNoiseEmission.java      |   120 +-
 .../tudresden/ws/EdgeGetNoiseEmissionResponse.java |   108 +-
 .../de/tudresden/ws/EdgeGetPMxEmission.java        |   120 +-
 .../tudresden/ws/EdgeGetPMxEmissionResponse.java   |   108 +-
 .../de/tudresden/ws/EdgeGetTraveltime.java         |   120 +-
 .../de/tudresden/ws/EdgeGetTraveltimeResponse.java |   108 +-
 .../de/tudresden/ws/EdgeGetWaitingTime.java        |   120 +-
 .../tudresden/ws/EdgeGetWaitingTimeResponse.java   |   108 +-
 .../de/tudresden/ws/EdgeSetEffort.java             |   158 +-
 .../de/tudresden/ws/EdgeSetEffortResponse.java     |    64 +-
 .../de/tudresden/ws/EdgeSetMaxSpeed.java           |   158 +-
 .../de/tudresden/ws/EdgeSetMaxSpeedResponse.java   |    64 +-
 .../de/tudresden/ws/GUIClearPending.java           |   120 +-
 .../de/tudresden/ws/GUIClearPendingResponse.java   |    64 +-
 .../de/tudresden/ws/GUIGetBoundary.java            |   120 +-
 .../de/tudresden/ws/GUIGetBoundaryResponse.java    |   124 +-
 .../de/tudresden/ws/GUIGetIDList.java              |    64 +-
 .../de/tudresden/ws/GUIGetIDListResponse.java      |   138 +-
 .../de/tudresden/ws/GUIGetOffset.java              |   120 +-
 .../de/tudresden/ws/GUIGetOffsetResponse.java      |   124 +-
 .../de/tudresden/ws/GUIGetSchema.java              |   120 +-
 .../de/tudresden/ws/GUIGetSchemaResponse.java      |   124 +-
 .../java_wsclient/de/tudresden/ws/GUIGetZoom.java  |   120 +-
 .../de/tudresden/ws/GUIGetZoomResponse.java        |   108 +-
 .../de/tudresden/ws/GUIScreenshot.java             |   174 +-
 .../de/tudresden/ws/GUIScreenshotResponse.java     |    64 +-
 .../de/tudresden/ws/GUISetBoundary.java            |   272 +-
 .../de/tudresden/ws/GUISetBoundaryResponse.java    |    64 +-
 .../de/tudresden/ws/GUISetOffset.java              |   196 +-
 .../de/tudresden/ws/GUISetOffsetResponse.java      |    64 +-
 .../de/tudresden/ws/GUISetSchema.java              |   174 +-
 .../de/tudresden/ws/GUISetSchemaResponse.java      |    64 +-
 .../java_wsclient/de/tudresden/ws/GUISetZoom.java  |   158 +-
 .../de/tudresden/ws/GUISetZoomResponse.java        |    64 +-
 .../de/tudresden/ws/GUITrackVehicle.java           |   174 +-
 .../de/tudresden/ws/GUITrackVehicleResponse.java   |    64 +-
 .../java_wsclient/de/tudresden/ws/GetStatus.java   |   120 +-
 .../de/tudresden/ws/GetStatusResponse.java         |   124 +-
 .../de/tudresden/ws/InductionloopGetIDCount.java   |    64 +-
 .../ws/InductionloopGetIDCountResponse.java        |   108 +-
 .../de/tudresden/ws/InductionloopGetIDList.java    |    64 +-
 .../ws/InductionloopGetIDListResponse.java         |   138 +-
 .../de/tudresden/ws/InductionloopGetLaneID.java    |   120 +-
 .../ws/InductionloopGetLaneIDResponse.java         |   124 +-
 .../ws/InductionloopGetLastStepMeanLength.java     |   120 +-
 ...InductionloopGetLastStepMeanLengthResponse.java |   108 +-
 .../ws/InductionloopGetLastStepMeanSpeed.java      |   120 +-
 .../InductionloopGetLastStepMeanSpeedResponse.java |   108 +-
 .../ws/InductionloopGetLastStepOccupancy.java      |   120 +-
 .../InductionloopGetLastStepOccupancyResponse.java |   108 +-
 .../ws/InductionloopGetLastStepVehicleIDs.java     |   120 +-
 ...InductionloopGetLastStepVehicleIDsResponse.java |   138 +-
 .../ws/InductionloopGetLastStepVehicleNumber.java  |   120 +-
 ...uctionloopGetLastStepVehicleNumberResponse.java |   108 +-
 .../de/tudresden/ws/InductionloopGetPosition.java  |   120 +-
 .../ws/InductionloopGetPositionResponse.java       |   108 +-
 .../ws/InductionloopGetTimeSinceDetection.java     |   120 +-
 ...InductionloopGetTimeSinceDetectionResponse.java |   108 +-
 .../tudresden/ws/InductionloopGetVehicleData.java  |   120 +-
 .../ws/InductionloopGetVehicleDataResponse.java    |   124 +-
 .../de/tudresden/ws/JunctionGetIDCount.java        |    64 +-
 .../tudresden/ws/JunctionGetIDCountResponse.java   |   108 +-
 .../de/tudresden/ws/JunctionGetIDList.java         |    64 +-
 .../de/tudresden/ws/JunctionGetIDListResponse.java |   138 +-
 .../de/tudresden/ws/JunctionGetPosition.java       |   120 +-
 .../tudresden/ws/JunctionGetPositionResponse.java  |   124 +-
 .../de/tudresden/ws/JunctionGetShape.java          |   120 +-
 .../de/tudresden/ws/JunctionGetShapeResponse.java  |   124 +-
 .../de/tudresden/ws/LaneGetAllowed.java            |   120 +-
 .../de/tudresden/ws/LaneGetAllowedResponse.java    |   138 +-
 .../de/tudresden/ws/LaneGetCO2Emission.java        |   120 +-
 .../tudresden/ws/LaneGetCO2EmissionResponse.java   |   108 +-
 .../de/tudresden/ws/LaneGetCOEmission.java         |   120 +-
 .../de/tudresden/ws/LaneGetCOEmissionResponse.java |   108 +-
 .../de/tudresden/ws/LaneGetDisallowed.java         |   120 +-
 .../de/tudresden/ws/LaneGetDisallowedResponse.java |   138 +-
 .../de/tudresden/ws/LaneGetEdgeID.java             |   120 +-
 .../de/tudresden/ws/LaneGetEdgeIDResponse.java     |   124 +-
 .../ws/LaneGetElectricityConsumption.java          |   120 +-
 .../ws/LaneGetElectricityConsumptionResponse.java  |   124 +-
 .../de/tudresden/ws/LaneGetFuelConsumption.java    |   120 +-
 .../ws/LaneGetFuelConsumptionResponse.java         |   108 +-
 .../de/tudresden/ws/LaneGetHCEmission.java         |   120 +-
 .../de/tudresden/ws/LaneGetHCEmissionResponse.java |   108 +-
 .../de/tudresden/ws/LaneGetIDCount.java            |    64 +-
 .../de/tudresden/ws/LaneGetIDCountResponse.java    |   108 +-
 .../de/tudresden/ws/LaneGetIDList.java             |    64 +-
 .../de/tudresden/ws/LaneGetIDListResponse.java     |   138 +-
 .../tudresden/ws/LaneGetLastStepHaltingNumber.java |   120 +-
 .../ws/LaneGetLastStepHaltingNumberResponse.java   |   108 +-
 .../de/tudresden/ws/LaneGetLastStepLength.java     |   120 +-
 .../ws/LaneGetLastStepLengthResponse.java          |   108 +-
 .../de/tudresden/ws/LaneGetLastStepMeanSpeed.java  |   120 +-
 .../ws/LaneGetLastStepMeanSpeedResponse.java       |   108 +-
 .../de/tudresden/ws/LaneGetLastStepOccupancy.java  |   120 +-
 .../ws/LaneGetLastStepOccupancyResponse.java       |   108 +-
 .../de/tudresden/ws/LaneGetLastStepVehicleIDs.java |   120 +-
 .../ws/LaneGetLastStepVehicleIDsResponse.java      |   138 +-
 .../tudresden/ws/LaneGetLastStepVehicleNumber.java |   120 +-
 .../ws/LaneGetLastStepVehicleNumberResponse.java   |   108 +-
 .../de/tudresden/ws/LaneGetLength.java             |   120 +-
 .../de/tudresden/ws/LaneGetLengthResponse.java     |   108 +-
 .../de/tudresden/ws/LaneGetLinkNumber.java         |   120 +-
 .../de/tudresden/ws/LaneGetLinkNumberResponse.java |   108 +-
 .../de/tudresden/ws/LaneGetLinks.java              |   120 +-
 .../de/tudresden/ws/LaneGetLinksResponse.java      |   138 +-
 .../de/tudresden/ws/LaneGetMaxSpeed.java           |   120 +-
 .../de/tudresden/ws/LaneGetMaxSpeedResponse.java   |   108 +-
 .../de/tudresden/ws/LaneGetNOxEmission.java        |   120 +-
 .../tudresden/ws/LaneGetNOxEmissionResponse.java   |   108 +-
 .../de/tudresden/ws/LaneGetNoiseEmission.java      |   120 +-
 .../tudresden/ws/LaneGetNoiseEmissionResponse.java |   108 +-
 .../de/tudresden/ws/LaneGetPMxEmission.java        |   120 +-
 .../tudresden/ws/LaneGetPMxEmissionResponse.java   |   108 +-
 .../de/tudresden/ws/LaneGetShape.java              |   120 +-
 .../de/tudresden/ws/LaneGetShapeResponse.java      |   124 +-
 .../de/tudresden/ws/LaneGetTraveltime.java         |   120 +-
 .../de/tudresden/ws/LaneGetTraveltimeResponse.java |   108 +-
 .../de/tudresden/ws/LaneGetWaitingTime.java        |   120 +-
 .../tudresden/ws/LaneGetWaitingTimeResponse.java   |   108 +-
 .../de/tudresden/ws/LaneGetWidth.java              |   120 +-
 .../de/tudresden/ws/LaneGetWidthResponse.java      |   108 +-
 .../de/tudresden/ws/LaneSetAllowed.java            |   188 +-
 .../de/tudresden/ws/LaneSetAllowedResponse.java    |    64 +-
 .../de/tudresden/ws/LaneSetDisallowed.java         |   188 +-
 .../de/tudresden/ws/LaneSetDisallowedResponse.java |    64 +-
 .../de/tudresden/ws/LaneSetLength.java             |   158 +-
 .../de/tudresden/ws/LaneSetLengthResponse.java     |    64 +-
 .../de/tudresden/ws/LaneSetMaxSpeed.java           |   158 +-
 .../de/tudresden/ws/LaneSetMaxSpeedResponse.java   |    64 +-
 .../de/tudresden/ws/LastActionTime.java            |    64 +-
 .../de/tudresden/ws/LastActionTimeResponse.java    |   124 +-
 .../de/tudresden/ws/MultientryexitGetIDCount.java  |    64 +-
 .../ws/MultientryexitGetIDCountResponse.java       |   108 +-
 .../de/tudresden/ws/MultientryexitGetIDList.java   |    64 +-
 .../ws/MultientryexitGetIDListResponse.java        |   138 +-
 .../ws/MultientryexitGetLastStepHaltingNumber.java |   120 +-
 ...ientryexitGetLastStepHaltingNumberResponse.java |   108 +-
 .../ws/MultientryexitGetLastStepMeanSpeed.java     |   120 +-
 ...MultientryexitGetLastStepMeanSpeedResponse.java |   108 +-
 .../ws/MultientryexitGetLastStepVehicleIDs.java    |   120 +-
 ...ultientryexitGetLastStepVehicleIDsResponse.java |   138 +-
 .../ws/MultientryexitGetLastStepVehicleNumber.java |   120 +-
 ...ientryexitGetLastStepVehicleNumberResponse.java |   108 +-
 .../de/tudresden/ws/ObjectFactory.java             | 21678 +++++++++----------
 .../de/tudresden/ws/PersonGetAngle.java            |   120 +-
 .../de/tudresden/ws/PersonGetAngleResponse.java    |   108 +-
 .../de/tudresden/ws/PersonGetColor.java            |   120 +-
 .../de/tudresden/ws/PersonGetColorResponse.java    |   124 +-
 .../de/tudresden/ws/PersonGetIDCount.java          |    64 +-
 .../de/tudresden/ws/PersonGetIDCountResponse.java  |   108 +-
 .../de/tudresden/ws/PersonGetIDList.java           |    64 +-
 .../de/tudresden/ws/PersonGetIDListResponse.java   |   138 +-
 .../de/tudresden/ws/PersonGetLanePosition.java     |   120 +-
 .../ws/PersonGetLanePositionResponse.java          |   108 +-
 .../de/tudresden/ws/PersonGetLength.java           |   120 +-
 .../de/tudresden/ws/PersonGetLengthResponse.java   |   108 +-
 .../de/tudresden/ws/PersonGetMinGap.java           |   120 +-
 .../de/tudresden/ws/PersonGetMinGapResponse.java   |   108 +-
 .../de/tudresden/ws/PersonGetPersonNumber.java     |   120 +-
 .../ws/PersonGetPersonNumberResponse.java          |   108 +-
 .../de/tudresden/ws/PersonGetPosition.java         |   120 +-
 .../de/tudresden/ws/PersonGetPosition3D.java       |   120 +-
 .../tudresden/ws/PersonGetPosition3DResponse.java  |   124 +-
 .../de/tudresden/ws/PersonGetPositionResponse.java |   124 +-
 .../de/tudresden/ws/PersonGetRoadID.java           |   120 +-
 .../de/tudresden/ws/PersonGetRoadIDResponse.java   |   124 +-
 .../de/tudresden/ws/PersonGetSpeed.java            |   120 +-
 .../de/tudresden/ws/PersonGetSpeedResponse.java    |   108 +-
 .../de/tudresden/ws/PersonGetTypeID.java           |   120 +-
 .../de/tudresden/ws/PersonGetTypeIDResponse.java   |   124 +-
 .../de/tudresden/ws/PersonGetWaitingTime.java      |   120 +-
 .../tudresden/ws/PersonGetWaitingTimeResponse.java |   108 +-
 .../java_wsclient/de/tudresden/ws/PoiAdd.java      |   342 +-
 .../de/tudresden/ws/PoiAddResponse.java            |    64 +-
 .../java_wsclient/de/tudresden/ws/PoiGetColor.java |   120 +-
 .../de/tudresden/ws/PoiGetColorResponse.java       |   124 +-
 .../de/tudresden/ws/PoiGetIDCount.java             |    64 +-
 .../de/tudresden/ws/PoiGetIDCountResponse.java     |   108 +-
 .../de/tudresden/ws/PoiGetIDList.java              |    64 +-
 .../de/tudresden/ws/PoiGetIDListResponse.java      |   138 +-
 .../de/tudresden/ws/PoiGetPosition.java            |   120 +-
 .../de/tudresden/ws/PoiGetPositionResponse.java    |   124 +-
 .../java_wsclient/de/tudresden/ws/PoiGetType.java  |   120 +-
 .../de/tudresden/ws/PoiGetTypeResponse.java        |   124 +-
 .../java_wsclient/de/tudresden/ws/PoiRemove.java   |   158 +-
 .../de/tudresden/ws/PoiRemoveResponse.java         |    64 +-
 .../java_wsclient/de/tudresden/ws/PoiSetColor.java |   174 +-
 .../de/tudresden/ws/PoiSetColorResponse.java       |    64 +-
 .../de/tudresden/ws/PoiSetPosition.java            |   196 +-
 .../de/tudresden/ws/PoiSetPositionResponse.java    |    64 +-
 .../java_wsclient/de/tudresden/ws/PoiSetType.java  |   174 +-
 .../de/tudresden/ws/PoiSetTypeResponse.java        |    64 +-
 .../java_wsclient/de/tudresden/ws/PolygonAdd.java  |   358 +-
 .../de/tudresden/ws/PolygonAddResponse.java        |    64 +-
 .../de/tudresden/ws/PolygonGetColor.java           |   120 +-
 .../de/tudresden/ws/PolygonGetColorResponse.java   |   124 +-
 .../de/tudresden/ws/PolygonGetIDCount.java         |    64 +-
 .../de/tudresden/ws/PolygonGetIDCountResponse.java |   108 +-
 .../de/tudresden/ws/PolygonGetIDList.java          |    64 +-
 .../de/tudresden/ws/PolygonGetIDListResponse.java  |   138 +-
 .../de/tudresden/ws/PolygonGetShape.java           |   120 +-
 .../de/tudresden/ws/PolygonGetShapeResponse.java   |   124 +-
 .../de/tudresden/ws/PolygonGetType.java            |   120 +-
 .../de/tudresden/ws/PolygonGetTypeResponse.java    |   124 +-
 .../de/tudresden/ws/PolygonRemove.java             |   158 +-
 .../de/tudresden/ws/PolygonRemoveResponse.java     |    64 +-
 .../de/tudresden/ws/PolygonSetColor.java           |   174 +-
 .../de/tudresden/ws/PolygonSetColorResponse.java   |    64 +-
 .../de/tudresden/ws/PolygonSetShape.java           |   188 +-
 .../de/tudresden/ws/PolygonSetShapeResponse.java   |    64 +-
 .../de/tudresden/ws/PolygonSetType.java            |   174 +-
 .../de/tudresden/ws/PolygonSetTypeResponse.java    |    64 +-
 .../java_wsclient/de/tudresden/ws/RouteAdd.java    |   188 +-
 .../de/tudresden/ws/RouteAddResponse.java          |    64 +-
 .../de/tudresden/ws/RouteGetEdges.java             |   120 +-
 .../de/tudresden/ws/RouteGetEdgesResponse.java     |   138 +-
 .../de/tudresden/ws/RouteGetIDCount.java           |    64 +-
 .../de/tudresden/ws/RouteGetIDCountResponse.java   |   108 +-
 .../de/tudresden/ws/RouteGetIDList.java            |    64 +-
 .../de/tudresden/ws/RouteGetIDListResponse.java    |   138 +-
 .../java_wsclient/de/tudresden/ws/ServiceImpl.java |  8978 ++++----
 .../java_wsclient/de/tudresden/ws/SetConfig.java   |   120 +-
 .../de/tudresden/ws/SetConfigResponse.java         |    64 +-
 .../de/tudresden/ws/SetSumoBinary.java             |   120 +-
 .../de/tudresden/ws/SetSumoBinaryResponse.java     |    64 +-
 .../de/tudresden/ws/SimulationConvert2D.java       |   250 +-
 .../tudresden/ws/SimulationConvert2DResponse.java  |   138 +-
 .../de/tudresden/ws/SimulationConvert3D.java       |   250 +-
 .../tudresden/ws/SimulationConvert3DResponse.java  |   138 +-
 .../de/tudresden/ws/SimulationConvertGeo.java      |   196 +-
 .../tudresden/ws/SimulationConvertGeoResponse.java |   138 +-
 .../de/tudresden/ws/SimulationConvertRoad.java     |   196 +-
 .../ws/SimulationConvertRoadResponse.java          |   124 +-
 .../tudresden/ws/SimulationGetArrivedIDList.java   |    64 +-
 .../ws/SimulationGetArrivedIDListResponse.java     |   138 +-
 .../tudresden/ws/SimulationGetArrivedNumber.java   |    64 +-
 .../ws/SimulationGetArrivedNumberResponse.java     |   108 +-
 .../tudresden/ws/SimulationGetBusStopWaiting.java  |    64 +-
 .../ws/SimulationGetBusStopWaitingResponse.java    |   108 +-
 .../de/tudresden/ws/SimulationGetCurrentTime.java  |    64 +-
 .../ws/SimulationGetCurrentTimeResponse.java       |   108 +-
 .../de/tudresden/ws/SimulationGetDeltaT.java       |    64 +-
 .../tudresden/ws/SimulationGetDeltaTResponse.java  |   108 +-
 .../tudresden/ws/SimulationGetDepartedIDList.java  |    64 +-
 .../ws/SimulationGetDepartedIDListResponse.java    |   138 +-
 .../tudresden/ws/SimulationGetDepartedNumber.java  |    64 +-
 .../ws/SimulationGetDepartedNumberResponse.java    |   108 +-
 .../de/tudresden/ws/SimulationGetDistance2D.java   |   294 +-
 .../ws/SimulationGetDistance2DResponse.java        |   108 +-
 .../de/tudresden/ws/SimulationGetDistanceRoad.java |   288 +-
 .../ws/SimulationGetDistanceRoadResponse.java      |   108 +-
 .../ws/SimulationGetEndingTeleportIDList.java      |    64 +-
 .../SimulationGetEndingTeleportIDListResponse.java |   138 +-
 .../ws/SimulationGetEndingTeleportNumber.java      |    64 +-
 .../SimulationGetEndingTeleportNumberResponse.java |   108 +-
 .../de/tudresden/ws/SimulationGetLoadedIDList.java |    64 +-
 .../ws/SimulationGetLoadedIDListResponse.java      |   138 +-
 .../de/tudresden/ws/SimulationGetLoadedNumber.java |    64 +-
 .../ws/SimulationGetLoadedNumberResponse.java      |   108 +-
 .../ws/SimulationGetMinExpectedNumber.java         |    64 +-
 .../ws/SimulationGetMinExpectedNumberResponse.java |   108 +-
 .../de/tudresden/ws/SimulationGetNetBoundary.java  |    64 +-
 .../ws/SimulationGetNetBoundaryResponse.java       |   138 +-
 .../SimulationGetParkingEndingVehiclesIDList.java  |    64 +-
 ...tionGetParkingEndingVehiclesIDListResponse.java |   138 +-
 .../SimulationGetParkingEndingVehiclesNumber.java  |    64 +-
 ...tionGetParkingEndingVehiclesNumberResponse.java |   108 +-
 ...SimulationGetParkingStartingVehiclesIDList.java |    64 +-
 ...onGetParkingStartingVehiclesIDListResponse.java |   138 +-
 ...SimulationGetParkingStartingVehiclesNumber.java |    64 +-
 ...onGetParkingStartingVehiclesNumberResponse.java |   108 +-
 .../ws/SimulationGetStartingTeleportIDList.java    |    64 +-
 ...imulationGetStartingTeleportIDListResponse.java |   138 +-
 .../ws/SimulationGetStartingTeleportNumber.java    |    64 +-
 ...imulationGetStartingTeleportNumberResponse.java |   108 +-
 .../ws/SimulationGetStopEndingVehiclesIDList.java  |    64 +-
 ...ulationGetStopEndingVehiclesIDListResponse.java |   138 +-
 .../ws/SimulationGetStopEndingVehiclesNumber.java  |    64 +-
 ...ulationGetStopEndingVehiclesNumberResponse.java |   108 +-
 .../SimulationGetStopStartingVehiclesIDList.java   |    64 +-
 ...ationGetStopStartingVehiclesIDListResponse.java |   138 +-
 .../SimulationGetStopStartingVehiclesNumber.java   |    64 +-
 ...ationGetStopStartingVehiclesNumberResponse.java |   108 +-
 .../java_wsclient/de/tudresden/ws/Start.java       |   120 +-
 .../de/tudresden/ws/StartResponse.java             |   124 +-
 .../java_wsclient/de/tudresden/ws/Stop.java        |   120 +-
 .../de/tudresden/ws/StopResponse.java              |   124 +-
 .../de/tudresden/ws/SumoBoundingBox.java           |   228 +-
 .../java_wsclient/de/tudresden/ws/SumoColor.java   |   218 +-
 .../de/tudresden/ws/SumoGeometry.java              |   138 +-
 .../java_wsclient/de/tudresden/ws/SumoLink.java    |   596 +-
 .../de/tudresden/ws/SumoPosition2D.java            |   142 +-
 .../de/tudresden/ws/SumoPosition3D.java            |   180 +-
 .../de/tudresden/ws/SumoStopFlags.java             |   294 +-
 .../de/tudresden/ws/SumoTLSController.java         |   472 +-
 .../de/tudresden/ws/SumoTLSPhase.java              |   234 +-
 .../de/tudresden/ws/SumoTLSProgram.java            |   306 +-
 .../de/tudresden/ws/SumoVehicleData.java           |   138 +-
 .../java_wsclient/de/tudresden/ws/TXTOutput.java   |   104 +-
 .../de/tudresden/ws/TXTOutputResponse.java         |   124 +-
 .../java_wsclient/de/tudresden/ws/TraasWS.java     |   188 +-
 ...clightsGetCompleteRedYellowGreenDefinition.java |   120 +-
 ...etCompleteRedYellowGreenDefinitionResponse.java |   124 +-
 .../ws/TrafficlightsGetControlledLanes.java        |   120 +-
 .../TrafficlightsGetControlledLanesResponse.java   |   138 +-
 .../ws/TrafficlightsGetControlledLinks.java        |   120 +-
 .../TrafficlightsGetControlledLinksResponse.java   |   138 +-
 .../de/tudresden/ws/TrafficlightsGetIDCount.java   |    64 +-
 .../ws/TrafficlightsGetIDCountResponse.java        |   108 +-
 .../de/tudresden/ws/TrafficlightsGetIDList.java    |    64 +-
 .../ws/TrafficlightsGetIDListResponse.java         |   138 +-
 .../tudresden/ws/TrafficlightsGetNextSwitch.java   |   120 +-
 .../ws/TrafficlightsGetNextSwitchResponse.java     |   108 +-
 .../de/tudresden/ws/TrafficlightsGetPhase.java     |   120 +-
 .../ws/TrafficlightsGetPhaseDuration.java          |   120 +-
 .../ws/TrafficlightsGetPhaseDurationResponse.java  |   108 +-
 .../ws/TrafficlightsGetPhaseResponse.java          |   108 +-
 .../de/tudresden/ws/TrafficlightsGetProgram.java   |   120 +-
 .../ws/TrafficlightsGetProgramResponse.java        |   124 +-
 .../ws/TrafficlightsGetRedYellowGreenState.java    |   120 +-
 ...rafficlightsGetRedYellowGreenStateResponse.java |   124 +-
 ...clightsSetCompleteRedYellowGreenDefinition.java |   174 +-
 ...etCompleteRedYellowGreenDefinitionResponse.java |    64 +-
 .../de/tudresden/ws/TrafficlightsSetPhase.java     |   158 +-
 .../ws/TrafficlightsSetPhaseDuration.java          |   158 +-
 .../ws/TrafficlightsSetPhaseDurationResponse.java  |    64 +-
 .../ws/TrafficlightsSetPhaseResponse.java          |    64 +-
 .../de/tudresden/ws/TrafficlightsSetProgram.java   |   174 +-
 .../ws/TrafficlightsSetProgramResponse.java        |    64 +-
 .../ws/TrafficlightsSetRedYellowGreenState.java    |   174 +-
 ...rafficlightsSetRedYellowGreenStateResponse.java |    64 +-
 .../java_wsclient/de/tudresden/ws/VehicleAdd.java  |   380 +-
 .../de/tudresden/ws/VehicleAddResponse.java        |    64 +-
 .../de/tudresden/ws/VehicleChangeLane.java         |   196 +-
 .../de/tudresden/ws/VehicleChangeLaneResponse.java |    64 +-
 .../de/tudresden/ws/VehicleChangeTarget.java       |   174 +-
 .../tudresden/ws/VehicleChangeTargetResponse.java  |    64 +-
 .../java_wsclient/de/tudresden/ws/VehicleData.java |   294 +-
 .../de/tudresden/ws/VehicleGetAccel.java           |   120 +-
 .../de/tudresden/ws/VehicleGetAccelResponse.java   |   108 +-
 .../tudresden/ws/VehicleGetAdaptedTraveltime.java  |   212 +-
 .../ws/VehicleGetAdaptedTraveltimeResponse.java    |   108 +-
 .../de/tudresden/ws/VehicleGetAllowedSpeed.java    |   120 +-
 .../ws/VehicleGetAllowedSpeedResponse.java         |   108 +-
 .../de/tudresden/ws/VehicleGetAngle.java           |   120 +-
 .../de/tudresden/ws/VehicleGetAngleResponse.java   |   108 +-
 .../de/tudresden/ws/VehicleGetBestLanes.java       |   120 +-
 .../tudresden/ws/VehicleGetBestLanesResponse.java  |   138 +-
 .../de/tudresden/ws/VehicleGetCO2Emission.java     |   120 +-
 .../ws/VehicleGetCO2EmissionResponse.java          |   108 +-
 .../de/tudresden/ws/VehicleGetCOEmission.java      |   120 +-
 .../tudresden/ws/VehicleGetCOEmissionResponse.java |   108 +-
 .../de/tudresden/ws/VehicleGetColor.java           |   120 +-
 .../de/tudresden/ws/VehicleGetColorResponse.java   |   124 +-
 .../de/tudresden/ws/VehicleGetDecel.java           |   120 +-
 .../de/tudresden/ws/VehicleGetDecelResponse.java   |   108 +-
 .../de/tudresden/ws/VehicleGetDistance.java        |   120 +-
 .../tudresden/ws/VehicleGetDistanceResponse.java   |   108 +-
 .../de/tudresden/ws/VehicleGetDrivingDistance.java |   250 +-
 .../tudresden/ws/VehicleGetDrivingDistance2D.java  |   196 +-
 .../ws/VehicleGetDrivingDistance2DResponse.java    |   108 +-
 .../ws/VehicleGetDrivingDistanceResponse.java      |   108 +-
 .../de/tudresden/ws/VehicleGetEffort.java          |   212 +-
 .../de/tudresden/ws/VehicleGetEffortResponse.java  |   108 +-
 .../ws/VehicleGetElectricityConsumption.java       |   120 +-
 .../VehicleGetElectricityConsumptionResponse.java  |   108 +-
 .../de/tudresden/ws/VehicleGetEmissionClass.java   |   120 +-
 .../ws/VehicleGetEmissionClassResponse.java        |   124 +-
 .../de/tudresden/ws/VehicleGetFuelConsumption.java |   120 +-
 .../ws/VehicleGetFuelConsumptionResponse.java      |   108 +-
 .../de/tudresden/ws/VehicleGetHCEmission.java      |   120 +-
 .../tudresden/ws/VehicleGetHCEmissionResponse.java |   108 +-
 .../de/tudresden/ws/VehicleGetIDCount.java         |    64 +-
 .../de/tudresden/ws/VehicleGetIDCountResponse.java |   108 +-
 .../de/tudresden/ws/VehicleGetIDList.java          |    64 +-
 .../de/tudresden/ws/VehicleGetIDListResponse.java  |   138 +-
 .../de/tudresden/ws/VehicleGetImperfection.java    |   120 +-
 .../ws/VehicleGetImperfectionResponse.java         |   108 +-
 .../de/tudresden/ws/VehicleGetLaneID.java          |   120 +-
 .../de/tudresden/ws/VehicleGetLaneIDResponse.java  |   124 +-
 .../de/tudresden/ws/VehicleGetLaneIndex.java       |   120 +-
 .../tudresden/ws/VehicleGetLaneIndexResponse.java  |   108 +-
 .../de/tudresden/ws/VehicleGetLanePosition.java    |   120 +-
 .../ws/VehicleGetLanePositionResponse.java         |   108 +-
 .../de/tudresden/ws/VehicleGetLeader.java          |   158 +-
 .../de/tudresden/ws/VehicleGetLeaderResponse.java  |   124 +-
 .../de/tudresden/ws/VehicleGetLength.java          |   120 +-
 .../de/tudresden/ws/VehicleGetLengthResponse.java  |   108 +-
 .../de/tudresden/ws/VehicleGetMaxSpeed.java        |   120 +-
 .../tudresden/ws/VehicleGetMaxSpeedResponse.java   |   108 +-
 .../de/tudresden/ws/VehicleGetMinGap.java          |   120 +-
 .../de/tudresden/ws/VehicleGetMinGapResponse.java  |   108 +-
 .../de/tudresden/ws/VehicleGetNOxEmission.java     |   120 +-
 .../ws/VehicleGetNOxEmissionResponse.java          |   108 +-
 .../de/tudresden/ws/VehicleGetNoiseEmission.java   |   120 +-
 .../ws/VehicleGetNoiseEmissionResponse.java        |   108 +-
 .../de/tudresden/ws/VehicleGetPMxEmission.java     |   120 +-
 .../ws/VehicleGetPMxEmissionResponse.java          |   108 +-
 .../de/tudresden/ws/VehicleGetPersonNumber.java    |   120 +-
 .../ws/VehicleGetPersonNumberResponse.java         |   108 +-
 .../de/tudresden/ws/VehicleGetPosition.java        |   120 +-
 .../de/tudresden/ws/VehicleGetPosition3D.java      |   120 +-
 .../tudresden/ws/VehicleGetPosition3DResponse.java |   124 +-
 .../tudresden/ws/VehicleGetPositionResponse.java   |   124 +-
 .../de/tudresden/ws/VehicleGetRoadID.java          |   120 +-
 .../de/tudresden/ws/VehicleGetRoadIDResponse.java  |   124 +-
 .../de/tudresden/ws/VehicleGetRoute.java           |   120 +-
 .../de/tudresden/ws/VehicleGetRouteID.java         |   120 +-
 .../de/tudresden/ws/VehicleGetRouteIDResponse.java |   124 +-
 .../de/tudresden/ws/VehicleGetRouteResponse.java   |   138 +-
 .../de/tudresden/ws/VehicleGetShapeClass.java      |   120 +-
 .../tudresden/ws/VehicleGetShapeClassResponse.java |   124 +-
 .../de/tudresden/ws/VehicleGetSignals.java         |   120 +-
 .../de/tudresden/ws/VehicleGetSignalsResponse.java |   108 +-
 .../de/tudresden/ws/VehicleGetSlope.java           |   120 +-
 .../de/tudresden/ws/VehicleGetSlopeResponse.java   |   108 +-
 .../de/tudresden/ws/VehicleGetSpeed.java           |   120 +-
 .../de/tudresden/ws/VehicleGetSpeedDeviation.java  |   120 +-
 .../ws/VehicleGetSpeedDeviationResponse.java       |   108 +-
 .../de/tudresden/ws/VehicleGetSpeedFactor.java     |   120 +-
 .../ws/VehicleGetSpeedFactorResponse.java          |   108 +-
 .../de/tudresden/ws/VehicleGetSpeedMode.java       |   120 +-
 .../tudresden/ws/VehicleGetSpeedModeResponse.java  |   108 +-
 .../de/tudresden/ws/VehicleGetSpeedResponse.java   |   108 +-
 .../tudresden/ws/VehicleGetSpeedWithoutTraCI.java  |   120 +-
 .../ws/VehicleGetSpeedWithoutTraCIResponse.java    |   108 +-
 .../de/tudresden/ws/VehicleGetTau.java             |   120 +-
 .../de/tudresden/ws/VehicleGetTauResponse.java     |   108 +-
 .../de/tudresden/ws/VehicleGetTypeID.java          |   120 +-
 .../de/tudresden/ws/VehicleGetTypeIDResponse.java  |   124 +-
 .../de/tudresden/ws/VehicleGetVehicleClass.java    |   120 +-
 .../ws/VehicleGetVehicleClassResponse.java         |   124 +-
 .../de/tudresden/ws/VehicleGetWaitingTime.java     |   120 +-
 .../ws/VehicleGetWaitingTimeResponse.java          |   108 +-
 .../de/tudresden/ws/VehicleGetWidth.java           |   120 +-
 .../de/tudresden/ws/VehicleGetWidthResponse.java   |   108 +-
 .../de/tudresden/ws/VehicleIsRouteValid.java       |   120 +-
 .../tudresden/ws/VehicleIsRouteValidResponse.java  |   108 +-
 .../de/tudresden/ws/VehicleMoveTo.java             |   212 +-
 .../de/tudresden/ws/VehicleMoveToResponse.java     |    64 +-
 .../de/tudresden/ws/VehicleRemove.java             |   158 +-
 .../de/tudresden/ws/VehicleRemoveResponse.java     |    64 +-
 .../de/tudresden/ws/VehicleRerouteEffort.java      |   120 +-
 .../tudresden/ws/VehicleRerouteEffortResponse.java |    64 +-
 .../de/tudresden/ws/VehicleRerouteTraveltime.java  |   120 +-
 .../ws/VehicleRerouteTraveltimeResponse.java       |    64 +-
 .../de/tudresden/ws/VehicleResume.java             |   120 +-
 .../de/tudresden/ws/VehicleResumeResponse.java     |    64 +-
 .../de/tudresden/ws/VehicleSetAccel.java           |   158 +-
 .../de/tudresden/ws/VehicleSetAccelResponse.java   |    64 +-
 .../tudresden/ws/VehicleSetAdaptedTraveltime.java  |   288 +-
 .../ws/VehicleSetAdaptedTraveltimeResponse.java    |    64 +-
 .../de/tudresden/ws/VehicleSetColor.java           |   174 +-
 .../de/tudresden/ws/VehicleSetColorResponse.java   |    64 +-
 .../de/tudresden/ws/VehicleSetDecel.java           |   158 +-
 .../de/tudresden/ws/VehicleSetDecelResponse.java   |    64 +-
 .../de/tudresden/ws/VehicleSetEffort.java          |   288 +-
 .../de/tudresden/ws/VehicleSetEffortResponse.java  |    64 +-
 .../de/tudresden/ws/VehicleSetEmissionClass.java   |   174 +-
 .../ws/VehicleSetEmissionClassResponse.java        |    64 +-
 .../de/tudresden/ws/VehicleSetImperfection.java    |   158 +-
 .../ws/VehicleSetImperfectionResponse.java         |    64 +-
 .../de/tudresden/ws/VehicleSetLaneChangeMode.java  |   158 +-
 .../ws/VehicleSetLaneChangeModeResponse.java       |    64 +-
 .../de/tudresden/ws/VehicleSetLength.java          |   158 +-
 .../de/tudresden/ws/VehicleSetLengthResponse.java  |    64 +-
 .../de/tudresden/ws/VehicleSetMaxSpeed.java        |   158 +-
 .../tudresden/ws/VehicleSetMaxSpeedResponse.java   |    64 +-
 .../de/tudresden/ws/VehicleSetMinGap.java          |   158 +-
 .../de/tudresden/ws/VehicleSetMinGapResponse.java  |    64 +-
 .../de/tudresden/ws/VehicleSetRoute.java           |   188 +-
 .../de/tudresden/ws/VehicleSetRouteID.java         |   174 +-
 .../de/tudresden/ws/VehicleSetRouteIDResponse.java |    64 +-
 .../de/tudresden/ws/VehicleSetRouteResponse.java   |    64 +-
 .../de/tudresden/ws/VehicleSetShapeClass.java      |   174 +-
 .../tudresden/ws/VehicleSetShapeClassResponse.java |    64 +-
 .../de/tudresden/ws/VehicleSetSignals.java         |   158 +-
 .../de/tudresden/ws/VehicleSetSignalsResponse.java |    64 +-
 .../de/tudresden/ws/VehicleSetSpeed.java           |   158 +-
 .../de/tudresden/ws/VehicleSetSpeedDeviation.java  |   158 +-
 .../ws/VehicleSetSpeedDeviationResponse.java       |    64 +-
 .../de/tudresden/ws/VehicleSetSpeedFactor.java     |   158 +-
 .../ws/VehicleSetSpeedFactorResponse.java          |    64 +-
 .../de/tudresden/ws/VehicleSetSpeedResponse.java   |    64 +-
 .../de/tudresden/ws/VehicleSetStop.java            |   342 +-
 .../de/tudresden/ws/VehicleSetStopResponse.java    |    64 +-
 .../de/tudresden/ws/VehicleSetTau.java             |   158 +-
 .../de/tudresden/ws/VehicleSetTauResponse.java     |    64 +-
 .../de/tudresden/ws/VehicleSetType.java            |   174 +-
 .../de/tudresden/ws/VehicleSetTypeResponse.java    |    64 +-
 .../de/tudresden/ws/VehicleSetVehicleClass.java    |   174 +-
 .../ws/VehicleSetVehicleClassResponse.java         |    64 +-
 .../de/tudresden/ws/VehicleSetWidth.java           |   158 +-
 .../de/tudresden/ws/VehicleSetWidthResponse.java   |    64 +-
 .../de/tudresden/ws/VehicleSlowDown.java           |   196 +-
 .../de/tudresden/ws/VehicleSlowDownResponse.java   |    64 +-
 .../de/tudresden/ws/VehicletypeGetAccel.java       |   120 +-
 .../tudresden/ws/VehicletypeGetAccelResponse.java  |   108 +-
 .../de/tudresden/ws/VehicletypeGetColor.java       |   120 +-
 .../tudresden/ws/VehicletypeGetColorResponse.java  |   124 +-
 .../de/tudresden/ws/VehicletypeGetDecel.java       |   120 +-
 .../tudresden/ws/VehicletypeGetDecelResponse.java  |   108 +-
 .../tudresden/ws/VehicletypeGetEmissionClass.java  |   120 +-
 .../ws/VehicletypeGetEmissionClassResponse.java    |   124 +-
 .../de/tudresden/ws/VehicletypeGetIDCount.java     |    64 +-
 .../ws/VehicletypeGetIDCountResponse.java          |   108 +-
 .../de/tudresden/ws/VehicletypeGetIDList.java      |    64 +-
 .../tudresden/ws/VehicletypeGetIDListResponse.java |   138 +-
 .../tudresden/ws/VehicletypeGetImperfection.java   |   120 +-
 .../ws/VehicletypeGetImperfectionResponse.java     |   108 +-
 .../de/tudresden/ws/VehicletypeGetLength.java      |   120 +-
 .../tudresden/ws/VehicletypeGetLengthResponse.java |   108 +-
 .../de/tudresden/ws/VehicletypeGetMaxSpeed.java    |   120 +-
 .../ws/VehicletypeGetMaxSpeedResponse.java         |   108 +-
 .../de/tudresden/ws/VehicletypeGetMinGap.java      |   120 +-
 .../tudresden/ws/VehicletypeGetMinGapResponse.java |   108 +-
 .../de/tudresden/ws/VehicletypeGetShapeClass.java  |   120 +-
 .../ws/VehicletypeGetShapeClassResponse.java       |   124 +-
 .../tudresden/ws/VehicletypeGetSpeedDeviation.java |   120 +-
 .../ws/VehicletypeGetSpeedDeviationResponse.java   |   108 +-
 .../de/tudresden/ws/VehicletypeGetSpeedFactor.java |   120 +-
 .../ws/VehicletypeGetSpeedFactorResponse.java      |   108 +-
 .../de/tudresden/ws/VehicletypeGetTau.java         |   120 +-
 .../de/tudresden/ws/VehicletypeGetTauResponse.java |   108 +-
 .../tudresden/ws/VehicletypeGetVehicleClass.java   |   120 +-
 .../ws/VehicletypeGetVehicleClassResponse.java     |   124 +-
 .../de/tudresden/ws/VehicletypeGetWidth.java       |   120 +-
 .../tudresden/ws/VehicletypeGetWidthResponse.java  |   108 +-
 .../de/tudresden/ws/VehicletypeSetAccel.java       |   158 +-
 .../tudresden/ws/VehicletypeSetAccelResponse.java  |    64 +-
 .../de/tudresden/ws/VehicletypeSetColor.java       |   174 +-
 .../tudresden/ws/VehicletypeSetColorResponse.java  |    64 +-
 .../de/tudresden/ws/VehicletypeSetDecel.java       |   158 +-
 .../tudresden/ws/VehicletypeSetDecelResponse.java  |    64 +-
 .../tudresden/ws/VehicletypeSetEmissionClass.java  |   174 +-
 .../ws/VehicletypeSetEmissionClassResponse.java    |    64 +-
 .../tudresden/ws/VehicletypeSetImperfection.java   |   158 +-
 .../ws/VehicletypeSetImperfectionResponse.java     |    64 +-
 .../de/tudresden/ws/VehicletypeSetLength.java      |   158 +-
 .../tudresden/ws/VehicletypeSetLengthResponse.java |    64 +-
 .../de/tudresden/ws/VehicletypeSetMaxSpeed.java    |   158 +-
 .../ws/VehicletypeSetMaxSpeedResponse.java         |    64 +-
 .../de/tudresden/ws/VehicletypeSetMinGap.java      |   158 +-
 .../tudresden/ws/VehicletypeSetMinGapResponse.java |    64 +-
 .../de/tudresden/ws/VehicletypeSetShapeClass.java  |   174 +-
 .../ws/VehicletypeSetShapeClassResponse.java       |    64 +-
 .../tudresden/ws/VehicletypeSetSpeedDeviation.java |   158 +-
 .../ws/VehicletypeSetSpeedDeviationResponse.java   |    64 +-
 .../de/tudresden/ws/VehicletypeSetSpeedFactor.java |   158 +-
 .../ws/VehicletypeSetSpeedFactorResponse.java      |    64 +-
 .../de/tudresden/ws/VehicletypeSetTau.java         |   158 +-
 .../de/tudresden/ws/VehicletypeSetTauResponse.java |    64 +-
 .../tudresden/ws/VehicletypeSetVehicleClass.java   |   174 +-
 .../ws/VehicletypeSetVehicleClassResponse.java     |    64 +-
 .../de/tudresden/ws/VehicletypeSetWidth.java       |   158 +-
 .../tudresden/ws/VehicletypeSetWidthResponse.java  |    64 +-
 .../java_wsclient/de/tudresden/ws/Version.java     |    64 +-
 .../de/tudresden/ws/VersionResponse.java           |   120 +-
 .../de/tudresden/ws/package-info.java              |     4 +-
 tools/contributed/traas/examples/run.bat           |     4 +-
 .../traas/examples/simulation/config.sumo.cfg      |    24 +-
 .../traas/examples/simulation/network.net.xml      |    28 +-
 .../contributed/traas/examples/simulation/poi.xml  |   410 +-
 .../traas/examples/simulation/routes.xml           |     8 +-
 .../traas/examples/simulation/settings.xml         |   344 +-
 .../traas/examples/simulation/vehicles.xml         |     8 +-
 tools/contributed/traas/license.txt                |  1346 +-
 .../src/de/tudresden/sumo/cmd/ArealDetector.java   |   160 -
 .../traas/src/de/tudresden/sumo/cmd/Edge.java      |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Gui.java       |     2 +-
 .../src/de/tudresden/sumo/cmd/Inductionloop.java   |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Junction.java  |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Lane.java      |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Lanearea.java  |   160 +
 .../src/de/tudresden/sumo/cmd/Multientryexit.java  |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Person.java    |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Poi.java       |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Polygon.java   |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Route.java     |     2 +-
 .../src/de/tudresden/sumo/cmd/Simulation.java      |     2 +-
 .../src/de/tudresden/sumo/cmd/Trafficlight.java    |     2 +-
 .../traas/src/de/tudresden/sumo/cmd/Vehicle.java   |    69 +-
 .../src/de/tudresden/sumo/cmd/Vehicletype.java     |     2 +-
 .../src/de/tudresden/sumo/config/Constants.java    |    16 +-
 .../sumo/subscription/ContextSubscription.java     |   138 +-
 .../tudresden/sumo/subscription/ResponseType.java  |   212 +-
 .../sumo/subscription/SubscribtionVariable.java    |    76 +-
 .../tudresden/sumo/subscription/Subscription.java  |    36 +-
 .../sumo/subscription/SubscriptionContext.java     |    74 +-
 .../sumo/subscription/SubscriptionObject.java      |    96 +-
 .../de/tudresden/sumo/subscription/SumoDomain.java |    60 +-
 .../sumo/subscription/VariableSubscription.java    |   118 +-
 .../de/tudresden/sumo/util/CommandProcessor.java   |  1340 +-
 .../src/de/tudresden/sumo/util/ConvertHelper.java  |   544 +-
 .../traas/src/de/tudresden/sumo/util/Query.java    |   520 +-
 .../src/de/tudresden/sumo/util/StringList.java     |   586 +-
 .../traas/src/de/tudresden/sumo/util/Sumo.java     |   322 +-
 .../src/de/tudresden/sumo/util/SumoCommand.java    |  1062 +-
 .../traas/src/de/tudresden/ws/Service.java         |    98 +-
 .../traas/src/de/tudresden/ws/ServiceImpl.java     |   298 +-
 .../traas/src/de/tudresden/ws/ShutdownHook.java    |   112 +-
 .../traas/src/de/tudresden/ws/Traci.java           |    45 +-
 .../traas/src/de/tudresden/ws/WebService.java      |   136 +-
 .../traas/src/de/tudresden/ws/conf/Config.java     |   260 +-
 .../de/tudresden/ws/container/SumoBestLanes.java   |   122 +-
 .../de/tudresden/ws/container/SumoBoundingBox.java |   114 +-
 .../src/de/tudresden/ws/container/SumoColor.java   |   106 +-
 .../de/tudresden/ws/container/SumoGeometry.java    |   130 +-
 .../src/de/tudresden/ws/container/SumoLeader.java  |    86 +-
 .../src/de/tudresden/ws/container/SumoLink.java    |   160 +-
 .../de/tudresden/ws/container/SumoLinkList.java    |   336 +-
 .../src/de/tudresden/ws/container/SumoNextTLS.java |   126 +-
 .../src/de/tudresden/ws/container/SumoObject.java  |    28 +-
 .../de/tudresden/ws/container/SumoPosition2D.java  |    92 +-
 .../de/tudresden/ws/container/SumoPosition3D.java  |    98 +-
 .../de/tudresden/ws/container/SumoPrimitive.java   |    64 +-
 .../de/tudresden/ws/container/SumoStopFlags.java   |   138 +-
 .../de/tudresden/ws/container/SumoStringList.java  |   322 +-
 .../tudresden/ws/container/SumoTLSController.java  |   112 +-
 .../de/tudresden/ws/container/SumoTLSPhase.java    |   130 +-
 .../de/tudresden/ws/container/SumoTLSProgram.java  |   144 +-
 .../de/tudresden/ws/container/SumoVehicleData.java |   108 +-
 .../tudresden/ws/container/SumoVehicleSignal.java  |   132 +-
 .../ws/container/SumoVehicleSignalState.java       |   102 +-
 .../traas/src/de/tudresden/ws/log/Log.java         |    96 +-
 .../traas/src/de/tudresden/ws/log/Log_txt.java     |   146 +-
 .../src/it/polito/appeal/traci/CloseQuery.java     |    30 +-
 .../polito/appeal/traci/SumoTraciConnection.java   |   174 +-
 .../src/it/polito/appeal/traci/TraCIException.java |    68 +-
 .../it/polito/appeal/traci/protocol/Command.java   |   254 +-
 .../appeal/traci/protocol/RequestMessage.java      |   220 +-
 .../appeal/traci/protocol/ResponseContainer.java   |   180 +-
 .../appeal/traci/protocol/ResponseMessage.java     |   260 +-
 .../appeal/traci/protocol/StatusResponse.java      |   154 +-
 .../traci4j/.settings/org.eclipse.jdt.ui.prefs     |     8 +-
 .../org.eclipse.ltk.core.refactoring.prefs         |     6 +-
 .../it/polito/appeal/traci/protocol/Constants.java |  1318 +-
 tools/contributed/traci4j/src/xml/queries.xml      |   194 +-
 .../traci4j/src/xml/traciObjects/Edge.xml          |   224 +-
 .../traciObjects/ExampleTraciObject.xml.template   |   182 +-
 .../traci4j/src/xml/traciObjects/InductionLoop.xml |   156 +-
 .../traci4j/src/xml/traciObjects/Lane.xml          |   326 +-
 .../traci4j/src/xml/traciObjects/MeMeDetector.xml  |   122 +-
 .../traci4j/src/xml/traciObjects/POI.xml           |   164 +-
 .../traci4j/src/xml/traciObjects/Route.xml         |    80 +-
 .../traci4j/src/xml/traciObjects/Vehicle.xml       |   466 +-
 .../traci4j/src/xml/traciObjects/VehicleType.xml   |   206 +-
 .../contributed/traci4j/src/xslt/traciObject.xslt  |   470 +-
 .../polito/appeal/traci/test/HttpDownloadTest.java |    86 +-
 .../appeal/traci/test/PositionConvertionTest.java  |   222 +-
 .../polito/appeal/traci/test/RemoteTraCITest.java  |   246 +-
 .../polito/appeal/traci/test/TraCIServerTest.java  |   474 +-
 .../it/polito/appeal/traci/test/TraCITest.java     |  2180 +-
 .../appeal/traci/test/TrafficLightsTest.java       |   838 +-
 .../it/polito/appeal/traci/test/UtilsTest.java     |   132 +-
 .../appeal/traci/test/protocol/CommandTest.java    |   194 +-
 .../appeal/traci/test/protocol/MessageTest.java    |   172 +-
 .../+traci/+areal/getContextSubscriptionResults.m  |    50 +-
 .../traci4matlab/+traci/+areal/getIDCount.m        |    18 +-
 .../traci4matlab/+traci/+areal/getIDList.m         |    22 +-
 .../+traci/+areal/getJamLengthMeters.m             |    24 +-
 .../+traci/+areal/getJamLengthVehicle.m            |    24 +-
 .../+traci/+areal/getLastStepMeanSpeed.m           |    22 +-
 .../+traci/+areal/getLastStepOccupancy.m           |    22 +-
 .../+traci/+areal/getSubscriptionResults.m         |    50 +-
 .../traci4matlab/+traci/+areal/getUniversal.m      |    48 +-
 .../traci4matlab/+traci/+areal/subscribe.m         |    84 +-
 .../traci4matlab/+traci/+areal/subscribeContext.m  |   100 +-
 .../traci4matlab/+traci/+edge/adaptTraveltime.m    |    32 +-
 .../+traci/+edge/getAdaptedTraveltime.m            |    36 +-
 .../traci4matlab/+traci/+edge/getCO2Emission.m     |    22 +-
 .../traci4matlab/+traci/+edge/getCOEmission.m      |    22 +-
 .../+traci/+edge/getContextSubscriptionResults.m   |    50 +-
 .../traci4matlab/+traci/+edge/getEffort.m          |    36 +-
 .../traci4matlab/+traci/+edge/getFuelConsumption.m |    22 +-
 .../traci4matlab/+traci/+edge/getHCEmission.m      |    22 +-
 .../traci4matlab/+traci/+edge/getIDCount.m         |    18 +-
 .../traci4matlab/+traci/+edge/getIDList.m          |    22 +-
 .../+traci/+edge/getLastStepHaltingNumber.m        |    24 +-
 .../traci4matlab/+traci/+edge/getLastStepLength.m  |    22 +-
 .../+traci/+edge/getLastStepMeanSpeed.m            |    22 +-
 .../+traci/+edge/getLastStepOccupancy.m            |    22 +-
 .../+traci/+edge/getLastStepPersonIDs.m            |    22 +-
 .../+traci/+edge/getLastStepVehicleIDs.m           |    24 +-
 .../+traci/+edge/getLastStepVehicleNumber.m        |    24 +-
 .../traci4matlab/+traci/+edge/getNOxEmission.m     |    22 +-
 .../traci4matlab/+traci/+edge/getNoiseEmission.m   |    22 +-
 .../traci4matlab/+traci/+edge/getPmxEmission.m     |    22 +-
 .../+traci/+edge/getSubscriptionResults.m          |    50 +-
 .../traci4matlab/+traci/+edge/getTraveltime.m      |    22 +-
 .../traci4matlab/+traci/+edge/getUniversal.m       |    48 +-
 .../traci4matlab/+traci/+edge/setEffort.m          |    32 +-
 .../traci4matlab/+traci/+edge/setMaxSpeed.m        |    22 +-
 .../traci4matlab/+traci/+edge/subscribe.m          |    84 +-
 .../traci4matlab/+traci/+edge/subscribeContext.m   |   100 +-
 .../traci4matlab/+traci/+gui/getBoundary.m         |    30 +-
 .../+traci/+gui/getContextSubscriptionResults.m    |    50 +-
 .../traci4matlab/+traci/+gui/getIDList.m           |    22 +-
 .../traci4matlab/+traci/+gui/getOffset.m           |    30 +-
 .../traci4matlab/+traci/+gui/getSchema.m           |    30 +-
 .../+traci/+gui/getSubscriptionResults.m           |    50 +-
 .../traci4matlab/+traci/+gui/getUniversal.m        |    48 +-
 .../contributed/traci4matlab/+traci/+gui/getZoom.m |    30 +-
 .../traci4matlab/+traci/+gui/screenshot.m          |    26 +-
 .../traci4matlab/+traci/+gui/setBoundary.m         |    30 +-
 .../traci4matlab/+traci/+gui/setOffset.m           |    28 +-
 .../traci4matlab/+traci/+gui/setSchema.m           |    22 +-
 .../contributed/traci4matlab/+traci/+gui/setZoom.m |    20 +-
 .../traci4matlab/+traci/+gui/subscribe.m           |    72 +-
 .../traci4matlab/+traci/+gui/subscribeContext.m    |    90 +-
 .../traci4matlab/+traci/+gui/trackVehicle.m        |    22 +-
 .../+inductionloop/getContextSubscriptionResults.m |    50 +-
 .../traci4matlab/+traci/+inductionloop/getIDList.m |    24 +-
 .../traci4matlab/+traci/+inductionloop/getLaneID.m |    20 +-
 .../+traci/+inductionloop/getLastStepMeanLength.m  |    22 +-
 .../+traci/+inductionloop/getLastStepMeanSpeed.m   |    24 +-
 .../+traci/+inductionloop/getLastStepOccupancy.m   |    22 +-
 .../+traci/+inductionloop/getLastStepVehicleIDs.m  |    24 +-
 .../+inductionloop/getLastStepVehicleNumber.m      |    24 +-
 .../+traci/+inductionloop/getPosition.m            |    22 +-
 .../+traci/+inductionloop/getSubscriptionResults.m |    50 +-
 .../+traci/+inductionloop/getTimeSinceDetection.m  |    22 +-
 .../+traci/+inductionloop/getUniversal.m           |    48 +-
 .../+traci/+inductionloop/getVehicleData.m         |    22 +-
 .../+traci/+inductionloop/readVehicleData.m        |    46 +-
 .../traci4matlab/+traci/+inductionloop/subscribe.m |    74 +-
 .../+traci/+inductionloop/subscribeContext.m       |    90 +-
 .../+junction/getContextSubscriptionResults.m      |    50 +-
 .../traci4matlab/+traci/+junction/getIDList.m      |    22 +-
 .../traci4matlab/+traci/+junction/getPosition.m    |    22 +-
 .../+traci/+junction/getSubscriptionResults.m      |    50 +-
 .../traci4matlab/+traci/+junction/getUniversal.m   |    48 +-
 .../traci4matlab/+traci/+junction/subscribe.m      |    74 +-
 .../+traci/+junction/subscribeContext.m            |    90 +-
 .../traci4matlab/+traci/+lane/getAllowed.m         |    24 +-
 .../traci4matlab/+traci/+lane/getCO2Emission.m     |    22 +-
 .../traci4matlab/+traci/+lane/getCOEmission.m      |    22 +-
 .../+traci/+lane/getContextSubscriptionResults.m   |    50 +-
 .../traci4matlab/+traci/+lane/getDisallowed.m      |    22 +-
 .../traci4matlab/+traci/+lane/getEdgeID.m          |    22 +-
 .../traci4matlab/+traci/+lane/getFuelConsumption.m |    22 +-
 .../traci4matlab/+traci/+lane/getHCEmission.m      |    22 +-
 .../traci4matlab/+traci/+lane/getIDList.m          |    22 +-
 .../+traci/+lane/getLastStepHaltingNumber.m        |    24 +-
 .../traci4matlab/+traci/+lane/getLastStepLength.m  |    22 +-
 .../+traci/+lane/getLastStepMeanSpeed.m            |    22 +-
 .../+traci/+lane/getLastStepOccupancy.m            |    22 +-
 .../+traci/+lane/getLastStepVehicleIDs.m           |    24 +-
 .../+traci/+lane/getLastStepVehicleNumber.m        |    24 +-
 .../traci4matlab/+traci/+lane/getLength.m          |    20 +-
 .../traci4matlab/+traci/+lane/getLinkNumber.m      |    22 +-
 .../traci4matlab/+traci/+lane/getLinks.m           |    24 +-
 .../traci4matlab/+traci/+lane/getMaxSpeed.m        |    22 +-
 .../traci4matlab/+traci/+lane/getNOxEmission.m     |    22 +-
 .../traci4matlab/+traci/+lane/getNoiseEmission.m   |    22 +-
 .../traci4matlab/+traci/+lane/getPMxEmission.m     |    22 +-
 .../traci4matlab/+traci/+lane/getShape.m           |    22 +-
 .../+traci/+lane/getSubscriptionResults.m          |    50 +-
 .../traci4matlab/+traci/+lane/getTraveltime.m      |    22 +-
 .../traci4matlab/+traci/+lane/getUniversal.m       |    48 +-
 .../traci4matlab/+traci/+lane/getWidth.m           |    20 +-
 .../traci4matlab/+traci/+lane/readLinks.m          |    58 +-
 .../traci4matlab/+traci/+lane/setAllowed.m         |    42 +-
 .../traci4matlab/+traci/+lane/setDisallowed.m      |    40 +-
 .../traci4matlab/+traci/+lane/setLength.m          |    20 +-
 .../traci4matlab/+traci/+lane/setMaxSpeed.m        |    22 +-
 .../traci4matlab/+traci/+lane/subscribe.m          |    74 +-
 .../traci4matlab/+traci/+lane/subscribeContext.m   |    92 +-
 .../getContextSubscriptionResults.m                |    52 +-
 .../+traci/+multientryexit/getIDList.m             |    22 +-
 .../+multientryexit/getLastStepHaltingNumber.m     |    26 +-
 .../+traci/+multientryexit/getLastStepMeanSpeed.m  |    24 +-
 .../+traci/+multientryexit/getLastStepVehicleIDs.m |    24 +-
 .../+multientryexit/getLastStepVehicleNumber.m     |    24 +-
 .../+multientryexit/getSubscriptionResults.m       |    52 +-
 .../+traci/+multientryexit/getUniversal.m          |    48 +-
 .../+traci/+multientryexit/subscribe.m             |    76 +-
 .../+traci/+multientryexit/subscribeContext.m      |    94 +-
 .../traci4matlab/+traci/+person/getAngle.m         |    22 +-
 .../traci4matlab/+traci/+person/getColor.m         |    20 +-
 .../+traci/+person/getContextSubscriptionResults.m |    50 +-
 .../traci4matlab/+traci/+person/getIDCount.m       |    18 +-
 .../traci4matlab/+traci/+person/getIDList.m        |    22 +-
 .../traci4matlab/+traci/+person/getLanePosition.m  |    22 +-
 .../traci4matlab/+traci/+person/getLength.m        |    20 +-
 .../traci4matlab/+traci/+person/getMinGap.m        |    22 +-
 .../traci4matlab/+traci/+person/getNextEdge.m      |    24 +-
 .../traci4matlab/+traci/+person/getPosition.m      |    22 +-
 .../traci4matlab/+traci/+person/getPosition3D.m    |    22 +-
 .../traci4matlab/+traci/+person/getRoadID.m        |    22 +-
 .../traci4matlab/+traci/+person/getSpeed.m         |    22 +-
 .../+traci/+person/getSubscriptionResults.m        |    50 +-
 .../traci4matlab/+traci/+person/getTypeID.m        |    22 +-
 .../traci4matlab/+traci/+person/getUniversal.m     |    48 +-
 .../traci4matlab/+traci/+person/getWaitingTime.m   |    26 +-
 .../traci4matlab/+traci/+person/getWidth.m         |    20 +-
 .../traci4matlab/+traci/+person/subscribe.m        |    74 +-
 .../traci4matlab/+traci/+person/subscribeContext.m |    90 +-
 tools/contributed/traci4matlab/+traci/+poi/add.m   |    70 +-
 .../traci4matlab/+traci/+poi/getColor.m            |    20 +-
 .../+traci/+poi/getContextSubscriptionResults.m    |    50 +-
 .../traci4matlab/+traci/+poi/getIDList.m           |    22 +-
 .../traci4matlab/+traci/+poi/getPosition.m         |    22 +-
 .../+traci/+poi/getSubscriptionResults.m           |    50 +-
 .../contributed/traci4matlab/+traci/+poi/getType.m |    20 +-
 .../traci4matlab/+traci/+poi/getUniversal.m        |    48 +-
 .../contributed/traci4matlab/+traci/+poi/remove.m  |    34 +-
 .../traci4matlab/+traci/+poi/setColor.m            |    30 +-
 .../traci4matlab/+traci/+poi/setPosition.m         |    26 +-
 .../contributed/traci4matlab/+traci/+poi/setType.m |    28 +-
 .../traci4matlab/+traci/+poi/subscribe.m           |    74 +-
 .../traci4matlab/+traci/+poi/subscribeContext.m    |    90 +-
 .../contributed/traci4matlab/+traci/+polygon/add.m |    98 +-
 .../traci4matlab/+traci/+polygon/getColor.m        |    20 +-
 .../+polygon/getContextSubscriptionResults.m       |    50 +-
 .../traci4matlab/+traci/+polygon/getIDList.m       |    22 +-
 .../traci4matlab/+traci/+polygon/getShape.m        |    26 +-
 .../+traci/+polygon/getSubscriptionResults.m       |    50 +-
 .../traci4matlab/+traci/+polygon/getType.m         |    20 +-
 .../traci4matlab/+traci/+polygon/getUniversal.m    |    48 +-
 .../traci4matlab/+traci/+polygon/remove.m          |    34 +-
 .../traci4matlab/+traci/+polygon/setColor.m        |    30 +-
 .../traci4matlab/+traci/+polygon/setShape.m        |    38 +-
 .../traci4matlab/+traci/+polygon/setType.m         |    28 +-
 .../traci4matlab/+traci/+polygon/subscribe.m       |    74 +-
 .../+traci/+polygon/subscribeContext.m             |    90 +-
 tools/contributed/traci4matlab/+traci/+route/add.m |    42 +-
 .../+traci/+route/getContextSubscriptionResults.m  |    50 +-
 .../traci4matlab/+traci/+route/getEdges.m          |    24 +-
 .../traci4matlab/+traci/+route/getIDList.m         |    22 +-
 .../+traci/+route/getSubscriptionResults.m         |    50 +-
 .../traci4matlab/+traci/+route/getUniversal.m      |    48 +-
 .../traci4matlab/+traci/+route/subscribe.m         |    74 +-
 .../traci4matlab/+traci/+route/subscribeContext.m  |    88 +-
 .../traci4matlab/+traci/+simulation/convert2D.m    |    74 +-
 .../traci4matlab/+traci/+simulation/convertGeo.m   |    74 +-
 .../traci4matlab/+traci/+simulation/convertRoad.m  |    74 +-
 .../+traci/+simulation/getArrivedIDList.m          |    24 +-
 .../+traci/+simulation/getArrivedNumber.m          |    24 +-
 .../+traci/+simulation/getCurrentTime.m            |    22 +-
 .../traci4matlab/+traci/+simulation/getDeltaT.m    |    20 +-
 .../+traci/+simulation/getDepartedIDList.m         |    24 +-
 .../+traci/+simulation/getDepartedNumber.m         |    22 +-
 .../+traci/+simulation/getDistance2D.m             |    90 +-
 .../+traci/+simulation/getDistanceRoad.m           |    70 +-
 .../+traci/+simulation/getEndingTeleportIDList.m   |    24 +-
 .../+traci/+simulation/getEndingTeleportNumber.m   |    22 +-
 .../+traci/+simulation/getLoadedIDList.m           |    22 +-
 .../+traci/+simulation/getLoadedNumber.m           |    22 +-
 .../+traci/+simulation/getMinExpectedNumber.m      |    32 +-
 .../+traci/+simulation/getNetBoundary.m            |    24 +-
 .../+traci/+simulation/getStartingTeleportIDList.m |    24 +-
 .../+traci/+simulation/getStartingTeleportNumber.m |    22 +-
 .../+traci/+simulation/getSubscriptionResults.m    |    36 +-
 .../traci4matlab/+traci/+simulation/getUniversal.m |    48 +-
 .../traci4matlab/+traci/+simulation/subscribe.m    |    70 +-
 .../traci4matlab/+traci/+trafficlights/Logic.m     |    84 +-
 .../traci4matlab/+traci/+trafficlights/Phase.m     |    74 +-
 .../getCompleteRedYellowGreenDefinition.m          |    26 +-
 .../+trafficlights/getContextSubscriptionResults.m |    50 +-
 .../+traci/+trafficlights/getControlledLanes.m     |    24 +-
 .../+traci/+trafficlights/getControlledLinks.m     |    26 +-
 .../traci4matlab/+traci/+trafficlights/getIDList.m |    22 +-
 .../+traci/+trafficlights/getNextSwitch.m          |    24 +-
 .../traci4matlab/+traci/+trafficlights/getPhase.m  |    22 +-
 .../+traci/+trafficlights/getProgram.m             |    20 +-
 .../+traci/+trafficlights/getRedYellowGreenState.m |    26 +-
 .../+traci/+trafficlights/getSubscriptionResults.m |    52 +-
 .../+traci/+trafficlights/getUniversal.m           |    48 +-
 .../traci4matlab/+traci/+trafficlights/readLinks.m |    42 +-
 .../+traci/+trafficlights/readLogics.m             |    74 +-
 .../setCompleteRedYellowGreenDefinition.m          |    86 +-
 .../traci4matlab/+traci/+trafficlights/setPhase.m  |    26 +-
 .../+traci/+trafficlights/setPhaseDuration.m       |    26 +-
 .../+traci/+trafficlights/setProgram.m             |    22 +-
 .../+traci/+trafficlights/setRedYellowGreenState.m |    26 +-
 .../traci4matlab/+traci/+trafficlights/subscribe.m |    74 +-
 .../+traci/+trafficlights/subscribeContext.m       |    90 +-
 .../contributed/traci4matlab/+traci/+vehicle/add.m |   112 +-
 .../traci4matlab/+traci/+vehicle/changeLane.m      |    38 +-
 .../traci4matlab/+traci/+vehicle/changeTarget.m    |    22 +-
 .../traci4matlab/+traci/+vehicle/getAccel.m        |    22 +-
 .../+traci/+vehicle/getAdaptedTraveltime.m         |    40 +-
 .../traci4matlab/+traci/+vehicle/getAngle.m        |    22 +-
 .../traci4matlab/+traci/+vehicle/getBestLanes.m    |    26 +-
 .../traci4matlab/+traci/+vehicle/getCO2Emission.m  |    22 +-
 .../traci4matlab/+traci/+vehicle/getCOEmission.m   |    22 +-
 .../traci4matlab/+traci/+vehicle/getColor.m        |    20 +-
 .../+vehicle/getContextSubscriptionResults.m       |    50 +-
 .../traci4matlab/+traci/+vehicle/getDecel.m        |    22 +-
 .../+traci/+vehicle/getDrivingDistance.m           |    46 +-
 .../+traci/+vehicle/getDrivingDistance2D.m         |    36 +-
 .../traci4matlab/+traci/+vehicle/getEffort.m       |    40 +-
 .../+traci/+vehicle/getEmissionClass.m             |    22 +-
 .../+traci/+vehicle/getFuelConsumption.m           |    22 +-
 .../traci4matlab/+traci/+vehicle/getHCEmission.m   |    22 +-
 .../traci4matlab/+traci/+vehicle/getIDList.m       |    22 +-
 .../traci4matlab/+traci/+vehicle/getImperfection.m |    22 +-
 .../traci4matlab/+traci/+vehicle/getLaneID.m       |    28 +-
 .../traci4matlab/+traci/+vehicle/getLaneIndex.m    |    22 +-
 .../traci4matlab/+traci/+vehicle/getLanePosition.m |    22 +-
 .../traci4matlab/+traci/+vehicle/getLeader.m       |    50 +-
 .../traci4matlab/+traci/+vehicle/getLength.m       |    20 +-
 .../traci4matlab/+traci/+vehicle/getMaxSpeed.m     |    22 +-
 .../traci4matlab/+traci/+vehicle/getMinGap.m       |    22 +-
 .../traci4matlab/+traci/+vehicle/getNOxEmission.m  |    22 +-
 .../+traci/+vehicle/getNoiseEmission.m             |    22 +-
 .../traci4matlab/+traci/+vehicle/getPMxEmission.m  |    22 +-
 .../traci4matlab/+traci/+vehicle/getPosition.m     |    22 +-
 .../traci4matlab/+traci/+vehicle/getRoadID.m       |    22 +-
 .../traci4matlab/+traci/+vehicle/getRoute.m        |    22 +-
 .../traci4matlab/+traci/+vehicle/getRouteID.m      |    22 +-
 .../traci4matlab/+traci/+vehicle/getShapeClass.m   |    22 +-
 .../traci4matlab/+traci/+vehicle/getSignals.m      |    58 +-
 .../traci4matlab/+traci/+vehicle/getSpeed.m        |    22 +-
 .../+traci/+vehicle/getSpeedDeviation.m            |    22 +-
 .../traci4matlab/+traci/+vehicle/getSpeedFactor.m  |    22 +-
 .../+traci/+vehicle/getSpeedWithoutTraCI.m         |    14 +-
 .../+traci/+vehicle/getSubscriptionResults.m       |    50 +-
 .../traci4matlab/+traci/+vehicle/getTau.m          |    22 +-
 .../traci4matlab/+traci/+vehicle/getTypeID.m       |    22 +-
 .../traci4matlab/+traci/+vehicle/getUniversal.m    |    48 +-
 .../traci4matlab/+traci/+vehicle/getVehicleClass.m |    22 +-
 .../traci4matlab/+traci/+vehicle/getWidth.m        |    20 +-
 .../traci4matlab/+traci/+vehicle/isRouteValid.m    |    22 +-
 .../traci4matlab/+traci/+vehicle/moveTo.m          |    40 +-
 .../traci4matlab/+traci/+vehicle/moveToVTD.m       |    50 +-
 .../traci4matlab/+traci/+vehicle/readBestLanes.m   |    60 +-
 .../traci4matlab/+traci/+vehicle/remove.m          |    32 +-
 .../traci4matlab/+traci/+vehicle/rerouteEffort.m   |    36 +-
 .../+traci/+vehicle/rerouteTraveltime.m            |    36 +-
 .../traci4matlab/+traci/+vehicle/setAccel.m        |    22 +-
 .../+traci/+vehicle/setAdaptedTraveltime.m         |    46 +-
 .../traci4matlab/+traci/+vehicle/setColor.m        |    30 +-
 .../traci4matlab/+traci/+vehicle/setDecel.m        |    24 +-
 .../traci4matlab/+traci/+vehicle/setEffort.m       |    46 +-
 .../+traci/+vehicle/setEmissionClass.m             |    20 +-
 .../traci4matlab/+traci/+vehicle/setImperfection.m |    24 +-
 .../+traci/+vehicle/setLaneChangeMode.m            |    36 +-
 .../traci4matlab/+traci/+vehicle/setLength.m       |    20 +-
 .../traci4matlab/+traci/+vehicle/setMaxSpeed.m     |    20 +-
 .../traci4matlab/+traci/+vehicle/setMinGap.m       |    22 +-
 .../traci4matlab/+traci/+vehicle/setRoute.m        |    54 +-
 .../traci4matlab/+traci/+vehicle/setRouteID.m      |    22 +-
 .../traci4matlab/+traci/+vehicle/setShapeClass.m   |    20 +-
 .../traci4matlab/+traci/+vehicle/setSignals.m      |    56 +-
 .../traci4matlab/+traci/+vehicle/setSpeed.m        |    22 +-
 .../+traci/+vehicle/setSpeedDeviation.m            |    22 +-
 .../traci4matlab/+traci/+vehicle/setSpeedFactor.m  |    22 +-
 .../traci4matlab/+traci/+vehicle/setSpeedMode.m    |    38 +-
 .../traci4matlab/+traci/+vehicle/setStop.m         |   144 +-
 .../traci4matlab/+traci/+vehicle/setTau.m          |    20 +-
 .../traci4matlab/+traci/+vehicle/setVehicleClass.m |    22 +-
 .../traci4matlab/+traci/+vehicle/setWidth.m        |    20 +-
 .../traci4matlab/+traci/+vehicle/slowDown.m        |    36 +-
 .../traci4matlab/+traci/+vehicle/subscribe.m       |    74 +-
 .../+traci/+vehicle/subscribeContext.m             |    90 +-
 .../traci4matlab/+traci/+vehicletype/getAccel.m    |    22 +-
 .../traci4matlab/+traci/+vehicletype/getColor.m    |    20 +-
 .../+vehicletype/getContextSubscriptionResults.m   |    50 +-
 .../traci4matlab/+traci/+vehicletype/getDecel.m    |    22 +-
 .../+traci/+vehicletype/getEmissionClass.m         |    22 +-
 .../traci4matlab/+traci/+vehicletype/getIDList.m   |    22 +-
 .../+traci/+vehicletype/getImperfection.m          |    22 +-
 .../traci4matlab/+traci/+vehicletype/getLength.m   |    22 +-
 .../traci4matlab/+traci/+vehicletype/getMaxSpeed.m |    22 +-
 .../traci4matlab/+traci/+vehicletype/getMinGap.m   |    22 +-
 .../+traci/+vehicletype/getShapeClass.m            |    22 +-
 .../+traci/+vehicletype/getSpeedDeviation.m        |    22 +-
 .../+traci/+vehicletype/getSpeedFactor.m           |    22 +-
 .../+traci/+vehicletype/getSubscriptionResults.m   |    50 +-
 .../traci4matlab/+traci/+vehicletype/getTau.m      |    22 +-
 .../+traci/+vehicletype/getUniversal.m             |    48 +-
 .../+traci/+vehicletype/getVehicleClass.m          |    22 +-
 .../traci4matlab/+traci/+vehicletype/getWidth.m    |    22 +-
 .../traci4matlab/+traci/+vehicletype/setAccel.m    |    22 +-
 .../traci4matlab/+traci/+vehicletype/setColor.m    |    30 +-
 .../traci4matlab/+traci/+vehicletype/setDecel.m    |    22 +-
 .../+traci/+vehicletype/setEmissionClass.m         |    22 +-
 .../+traci/+vehicletype/setImperfection.m          |    24 +-
 .../traci4matlab/+traci/+vehicletype/setLength.m   |    22 +-
 .../traci4matlab/+traci/+vehicletype/setMaxSpeed.m |    22 +-
 .../traci4matlab/+traci/+vehicletype/setMinGap.m   |    22 +-
 .../+traci/+vehicletype/setShapeClass.m            |    22 +-
 .../+traci/+vehicletype/setSpeedDeviation.m        |    22 +-
 .../+traci/+vehicletype/setSpeedFactor.m           |    22 +-
 .../traci4matlab/+traci/+vehicletype/setTau.m      |    22 +-
 .../+traci/+vehicletype/setVehicleClass.m          |    20 +-
 .../traci4matlab/+traci/+vehicletype/setWidth.m    |    20 +-
 .../traci4matlab/+traci/+vehicletype/subscribe.m   |    74 +-
 .../+traci/+vehicletype/subscribeContext.m         |    90 +-
 tools/contributed/traci4matlab/+traci/Message.m    |    26 +-
 .../traci4matlab/+traci/RETURN_VALUE_FUNC.m        |   508 +-
 tools/contributed/traci4matlab/+traci/Socket.m     |    68 +-
 tools/contributed/traci4matlab/+traci/Storage.m    |   140 +-
 .../traci4matlab/+traci/SubscriptionResults.m      |   172 +-
 .../contributed/traci4matlab/+traci/beginMessage.m |    58 +-
 .../contributed/traci4matlab/+traci/checkResult.m  |    64 +-
 tools/contributed/traci4matlab/+traci/close.m      |    60 +-
 tools/contributed/traci4matlab/+traci/constants.m  |  1520 +-
 tools/contributed/traci4matlab/+traci/getVersion.m |    66 +-
 tools/contributed/traci4matlab/+traci/init.m       |   148 +-
 tools/contributed/traci4matlab/+traci/packInt32.m  |    26 +-
 tools/contributed/traci4matlab/+traci/packInt64.m  |    26 +-
 .../traci4matlab/+traci/readSubscription.m         |   274 +-
 tools/contributed/traci4matlab/+traci/recvExact.m  |   102 +-
 .../contributed/traci4matlab/+traci/sendByteCmd.m  |    24 +-
 .../traci4matlab/+traci/sendDoubleCmd.m            |    26 +-
 tools/contributed/traci4matlab/+traci/sendExact.m  |   124 +-
 tools/contributed/traci4matlab/+traci/sendIntCmd.m |    26 +-
 .../traci4matlab/+traci/sendReadOneStringCmd.m     |    20 +-
 .../traci4matlab/+traci/sendStringCmd.m            |    36 +-
 .../traci4matlab/+traci/simulationStep.m           |   114 +-
 tools/contributed/traci4matlab/+traci/subscribe.m  |    70 +-
 .../traci4matlab/+traci/subscribeContext.m         |   100 +-
 .../traci4matlab/+traci/switchConnection.m         |    24 +-
 tools/contributed/traci4matlab/+traci/time2steps.m |    18 +-
 tools/contributed/traci4matlab/README.md           |    17 +-
 .../examples/inter_palmas/inter_palmas.poly.xml    |    78 +-
 .../inter_palmas/inter_palmas_buses.rou.alt.xml    |   254 +-
 .../inter_palmas/inter_palmas_buses.rou.xml        |   190 +-
 .../inter_palmas/inter_palmas_buses.trips.xml      |    16 +-
 .../inter_palmas/inter_palmas_demand.rou.xml       | 12664 +++++------
 .../inter_palmas/inter_palmas_pedestrians.trip.xml |   732 +-
 .../tls_actuated/checkWaitingPersons.m             |    48 +-
 .../tls_actuated/inter_palmas_actuated.m           |   326 +-
 .../examples/inter_palmas/viewsettings.xml         |   976 +-
 .../contributed/traci4matlab/examples/traci_test.m |    40 +-
 .../traci4matlab/examples/traci_test2.m            |  1342 +-
 .../gaunal/traci4matlab/utils/DataReader.java      |   116 +-
 tools/contributed/trafficmodeler/.classpath        |    14 +-
 tools/contributed/trafficmodeler/.project          |    50 +-
 .../.settings/org.eclipse.jdt.ui.prefs             |     8 +-
 .../org.eclipse.ltk.core.refactoring.prefs         |     6 +-
 .../.settings/org.eclipse.wst.validation.prefs     |    12 +-
 tools/contributed/trafficmodeler/.umlproject       |    18 +-
 tools/contributed/trafficmodeler/MANIFEST.MF       |     8 +-
 .../contributed/trafficmodeler/SUMOConfXML.jardesc |    32 +-
 tools/contributed/trafficmodeler/javadoc.xml       |    12 +-
 tools/contributed/trafficmodeler/src/Main.java     |    30 +-
 .../trafficmodeler/src/classes/Constants.java      |    10 +-
 .../trafficmodeler/src/classes/Layer.java          |   688 +-
 .../trafficmodeler/src/classes/Pair.java           |   158 +-
 .../trafficmodeler/src/classes/Project.java        |   932 +-
 .../trafficmodeler/src/classes/ProjectElement.java |    98 +-
 .../trafficmodeler/src/classes/TypeSelection.java  |   308 +-
 .../trafficmodeler/src/enums/EditingMode.java      |    16 +-
 .../src/enums/MotionRestriction.java               |    16 +-
 .../trafficmodeler/src/enums/SchoolType.java       |    16 +-
 .../trafficmodeler/src/enums/SelectionCount.java   |    16 +-
 .../trafficmodeler/src/enums/SelectionType.java    |    16 +-
 .../trafficmodeler/src/enums/ToolType.java         |    14 +-
 .../src/enums/TrafficDefinitionLayerType.java      |    16 +-
 .../src/helpers/ApplicationSettings.java           |   102 +-
 .../trafficmodeler/src/helpers/Broadcaster.java    |   106 +-
 .../trafficmodeler/src/helpers/CursorProvider.java |   136 +-
 .../trafficmodeler/src/helpers/DrawingHelper.java  |    96 +-
 .../src/helpers/MultipleTripExpander.java          |   296 +-
 .../src/helpers/RandomNumberProvider.java          |    34 +-
 .../trafficmodeler/src/helpers/StreamGobbler.java  |   118 +-
 .../trafficmodeler/src/helpers/TimeConverter.java  |    84 +-
 .../interfaces/CurrentLayerChangedListener.java    |    36 +-
 .../src/interfaces/DrawableElement.java            |    24 +-
 .../src/interfaces/DrawableLayer.java              |    30 +-
 .../src/interfaces/HandleListener.java             |    32 +-
 .../src/interfaces/ModifiedCollectionListener.java |    26 +-
 .../src/interfaces/ProjectChangedListener.java     |    40 +-
 .../src/interfaces/SelectableType.java             |    18 +-
 .../src/interfaces/SelectionChangedListener.java   |    36 +-
 .../trafficmodeler/src/roadnetwork/Edge.java       |   828 +-
 .../trafficmodeler/src/roadnetwork/Junction.java   |   152 +-
 .../trafficmodeler/src/roadnetwork/Lane.java       |   176 +-
 .../src/roadnetwork/RoadNetwork.java               |  1464 +-
 .../src/roadnetwork/RoadNetworkElement.java        |   226 +-
 .../trafficmodeler/src/shapes/AreaExt.java         |   186 +-
 .../trafficmodeler/src/shapes/Ellipse2DExt.java    |    70 +-
 .../trafficmodeler/src/shapes/Line2DExt.java       |    80 +-
 .../trafficmodeler/src/shapes/Point2DExt.java      |    72 +-
 .../trafficmodeler/src/shapes/Polygon2D.java       |  1424 +-
 .../trafficmodeler/src/shapes/PolygonIterator.java |   294 +-
 .../trafficmodeler/src/shapes/Rectangle2DExt.java  |    82 +-
 .../trafficmodeler/src/simulation/Adult.java       |   952 +-
 .../trafficmodeler/src/simulation/Child.java       |   128 +-
 .../src/simulation/CustomComparator.java           |    22 +-
 .../trafficmodeler/src/simulation/House.java       |   710 +-
 .../trafficmodeler/src/simulation/JobType.java     |   204 +-
 .../trafficmodeler/src/simulation/Person.java      |    16 +-
 .../trafficmodeler/src/simulation/Route.java       |    18 +-
 .../src/simulation/SUMOInstruction.java            |    58 +-
 .../src/simulation/SUMOInstructionList.java        |    42 +-
 .../trafficmodeler/src/simulation/Simulation.java  |   276 +-
 .../src/simulation/SimulationExporter.java         |   796 +-
 .../src/simulation/TrafficGenerator.java           |  1090 +-
 .../trafficmodeler/src/simulation/Trip.java        |    24 +-
 .../trafficmodeler/src/simulation/VehicleType.java |   340 +-
 .../trafficmodeler/src/tdl/XMLHelpers.java         |   144 +-
 .../src/trafficdefinition/Accident.java            |   536 +-
 .../ActivityBasedTrafficDefinitionLayer.java       |   140 +-
 .../src/trafficdefinition/AreaFlow.java            |   874 +-
 .../trafficmodeler/src/trafficdefinition/Flow.java |   660 +-
 .../src/trafficdefinition/Handle.java              |   396 +-
 .../src/trafficdefinition/HotSpot.java             |   932 +-
 .../RandomTrafficDefinitionLayer.java              |   302 +-
 .../src/trafficdefinition/School.java              |   758 +-
 .../src/trafficdefinition/TrafficArea.java         |   854 +-
 .../TrafficDefinitionElement.java                  |   450 +-
 .../trafficdefinition/TrafficDefinitionLayer.java  |   404 +-
 .../UserDefinedTrafficDefinitionLayer.java         |   150 +-
 .../src/ui/AffectedLanesTableModel.java            |   182 +-
 .../contributed/trafficmodeler/src/ui/Display.java |  2604 +--
 .../src/ui/ExportLayersTableModel.java             |   180 +-
 .../trafficmodeler/src/ui/MainWindow.java          |  3724 ++--
 .../trafficmodeler/src/ui/PnlLayers.java           |   890 +-
 .../trafficmodeler/src/ui/PnlProperties.java       |   818 +-
 .../src/ui/TypeSelectionTableModel.java            |   178 +-
 .../src/ui/controls/JTrafficLayerTree.java         |    56 +-
 .../src/ui/controls/JTrafficLayerTreeModel.java    |    74 +-
 .../src/ui/controls/ProjectTreeCellRenderer.java   |   124 +-
 .../src/ui/controls/SimTimeEdit.java               |   426 +-
 .../src/ui/dialogs/DlgAddEditJobType.java          |   554 +-
 .../src/ui/dialogs/DlgAddEditVehicleType.java      |   802 +-
 .../src/ui/dialogs/DlgExportSimulation.java        |   910 +-
 .../src/ui/dialogs/DlgManageJobTypes.java          |   570 +-
 .../src/ui/dialogs/DlgManageVehicleTypes.java      |   564 +-
 .../src/ui/dialogs/DlgNewProject.java              |   612 +-
 .../src/ui/dialogs/DlgRandomLayerProperties.java   |   384 +-
 .../src/ui/dialogs/DlgSelectTypes.java             |   428 +-
 .../trafficmodeler/src/ui/dialogs/DlgSettings.java |   488 +-
 .../src/ui/filefilters/ProjectFileFilter.java      |    50 +-
 .../src/ui/filefilters/SUMOFileFilter.java         |    62 +-
 .../src/ui/filefilters/TDLFileFilter.java          |    48 +-
 .../ui/propertypanels/PnlAccidentProperties.java   |   532 +-
 .../ui/propertypanels/PnlAreaFlowProperties.java   |   710 +-
 .../src/ui/propertypanels/PnlEdgeProperties.java   |   390 +-
 .../src/ui/propertypanels/PnlFlowProperties.java   |   756 +-
 .../ui/propertypanels/PnlHotSpotProperties.java    |  1254 +-
 .../ui/propertypanels/PnlJunctionProperties.java   |   170 +-
 .../src/ui/propertypanels/PnlSchoolProperties.java |   598 +-
 .../propertypanels/PnlTrafficAreaProperties.java   |  1152 +-
 tools/createVehTypeDistribution.py                 |   102 +-
 tools/detector/aggregateFlows.py                   |     4 +-
 tools/detector/deleteUnusedDetectors.py            |     6 +-
 tools/detector/detector.py                         |    18 +-
 tools/detector/flowFromRoutes.py                   |    99 +-
 tools/detector/flowrouter.py                       |   195 +-
 tools/detector/routeUsage.py                       |    81 +
 tools/detector/validate.py                         |     6 +-
 tools/district/countConnectionsInDistricts.py      |     4 +-
 tools/district/districtMapper.py                   |     4 +-
 tools/districts2poly.py                            |     4 +-
 tools/edgesInDistricts.py                          |    26 +-
 tools/emissions/findMinDiffModel.py                |     4 +-
 tools/extractTest.py                               |     4 +-
 tools/game/patchTrafficLights.py                   |     4 +-
 tools/game/runner.py                               |     4 +-
 tools/game/setup.py                                |     4 +-
 tools/generateBidiDistricts.py                     |    31 +-
 tools/import/osm/osmPopulationExtractor.py         |     4 +-
 tools/import/transportationTestProblems.py         |     4 +-
 tools/import/vissim/convert_detectors2SUMO.py      |     4 +-
 .../vissim/convert_vissimXML_flows_statRoutes.py   |     4 +-
 .../import/vissim/tls_vissimXML2SUMOnet_update.py  |     4 +-
 tools/import/vissim/vissim_parseBusStops.py        |     4 +-
 tools/import/vissim/vissim_parseRoutes.py          |     7 +-
 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/launcher.py                                  |     4 +-
 tools/lib/rmsd.py                                  |     4 +-
 tools/lib/testUtil.py                              |     4 +-
 tools/net/0103to0110.py                            |     4 +-
 tools/net/0123to0130.py                            |     4 +-
 tools/net/OrderedMultiSet.py                       |     4 +-
 tools/net/batch0103to0110.py                       |     6 +-
 tools/net/createRoundaboutConnections.py           |     4 +-
 tools/net/netcheck.py                              |     4 +-
 tools/net/netdiff.py                               |    13 +-
 tools/net/netduplicate.py                          |     4 +-
 tools/net/netextract.py                            |     8 +-
 tools/net/netextract_subPart.py                    |     8 +-
 tools/net/netmatch.py                              |     4 +-
 tools/net/netshiftadaptor.py                       |    13 +-
 tools/net/netstats.py                              |     4 +-
 tools/net/network_statistics.py                    |     2 +-
 tools/net/odConnectionsCheck.py                    |     4 +-
 tools/net/patchNetFiles.py                         |     6 +-
 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/osmBuild.py                                  |     4 +-
 tools/osmGet.py                                    |     4 +-
 tools/osmWebWizard.py                              |    12 +-
 tools/output/accelerations.py                      |     4 +-
 tools/output/analyze_teleports.py                  |     7 +-
 tools/output/countLaneChanges.py                   |     4 +-
 tools/output/edgeDataDiff.py                       |     4 +-
 tools/output/generateITetrisIntersectionMetrics.py |     6 +-
 tools/output/generateITetrisNetworkMetrics.py      |    13 +-
 tools/output/generateMeanDataDefinitions.py        |     4 +-
 tools/output/generateTLSE1Detectors.py             |    21 +-
 tools/output/generateTLSE2Detectors.py             |    21 +-
 tools/output/generateTLSE3Detectors.py             |    28 +-
 tools/output/netdumpdiff.py                        |     8 +-
 tools/output/timingStats.py                        |     4 +-
 tools/output/tripinfoDiff.py                       |    23 +-
 tools/output/vehLanes.py                           |     4 +-
 tools/output/vehroute2amitranOD.py                 |     4 +-
 tools/output/vehrouteDiff.py                       |     4 +-
 tools/pedestrianFlow.py                            |     8 +-
 .../projects/TLS-Evaluationsszenarien/changeNet.py |     4 +-
 .../projects/TLS-Evaluationsszenarien/data/000.dat |  1152 +-
 .../projects/TLS-Evaluationsszenarien/data/001.dat |  1152 +-
 .../projects/TLS-Evaluationsszenarien/data/002.dat |  1152 +-
 .../projects/TLS-Evaluationsszenarien/data/003.dat |  1152 +-
 .../projects/TLS-Evaluationsszenarien/evaluator.py |     4 +-
 tools/projects/TLS-Evaluationsszenarien/main.py    |     4 +-
 tools/projects/TLS-Evaluationsszenarien/plotter.py |     4 +-
 .../sumoConfig/cross_sat/cross.out                 |  2348 +-
 tools/projects/TLS-Evaluationsszenarien/test.py    |     4 +-
 tools/projects/TaxiFCD_Krieg/.project              |    34 +-
 tools/projects/TaxiFCD_Krieg/.pydevproject         |    18 +-
 .../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 +-
 .../TaxiFCD_Krieg/src/backup/BackupFolder.pyw      |   208 +-
 .../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/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/projects/evacuation/evacuation.py            |     4 +-
 tools/projects/evacuation/generateTraffic.py       |     4 +-
 tools/projects/vehicles2d/commons.py               |     4 +-
 tools/projects/vehicles2d/dijkstra_base.py         |     4 +-
 tools/projects/vehicles2d/main.py                  |     4 +-
 tools/projects/vehicles2d/test.py                  |     4 +-
 tools/projects/vehicles2d/unittest_ada_star.py     |     4 +-
 .../unittest_ada_star_bugs_on_the_way.py           |     4 +-
 tools/projects/vehicles2d/unittest_constants.py    |     4 +-
 tools/projects/vehicles2d/unittest_dijkstra.py     |     4 +-
 tools/projects/vehicles2d/unittest_flaeche.py      |     4 +-
 tools/projects/vehicles2d/unittest_utils.py        |     4 +-
 tools/projects/vehicles2d/unittest_vessel.py       |     4 +-
 tools/purgatory/10to11.py                          |     4 +-
 tools/purgatory/generate-ns2.py                    |     4 +-
 tools/purgatory/generateTripsXml.py                |     6 +-
 tools/purgatory/kShortest.py                       |     4 +-
 tools/purgatory/removeSVN.py                       |     4 +-
 tools/purgatory/routes2OD.py                       |     4 +-
 tools/randomTrips.py                               |   142 +-
 tools/route/cutRoutes.py                           |   149 +-
 tools/route/implausibleRoutes.py                   |   190 +
 tools/route/route2alts.py                          |     4 +-
 tools/route/route2poly.py                          |    49 +-
 tools/route/routeDiffStats.py                      |    92 -
 tools/route/routeStats.py                          |    42 +-
 tools/route/route_1htoDay.py                       |     4 +-
 tools/route/route_departOffset.py                  |    53 +-
 tools/route/routecheck.py                          |     6 +-
 tools/route/routecompare.py                        |    10 +-
 tools/route/routes_Join.py                         |     6 +-
 tools/route/sort_routes.py                         |     7 +-
 tools/route/tracegenerator.py                      |     4 +-
 tools/route/tracemapper.py                         |     4 +-
 tools/route/vehicle2flow.py                        |     4 +-
 tools/route2sel.py                                 |     4 +-
 tools/route2trips.py                               |    43 +-
 tools/shapes/CSV2polyconvertXML.py                 |     6 +-
 tools/shapes/circlePolygon.py                      |     4 +-
 tools/shapes/poi_alongRoads.py                     |    10 +-
 tools/shapes/poi_atTLS.py                          |     4 +-
 tools/shapes/pois2inductionLoops.py                |     4 +-
 tools/showDepartsAndArrivalsPerEdge.py             |    14 +-
 tools/sumolib/__init__.py                          |     9 +-
 tools/sumolib/color.py                             |     4 +-
 tools/sumolib/files/__init__.py                    |     4 +-
 tools/sumolib/files/additional.py                  |     4 +-
 tools/sumolib/files/selection.py                   |     4 +-
 tools/sumolib/geomhelper.py                        |     4 +-
 tools/sumolib/miscutils.py                         |     8 +-
 tools/sumolib/net/__init__.py                      |    90 +-
 tools/sumolib/net/connection.py                    |     4 +-
 tools/sumolib/net/edge.py                          |    94 +-
 tools/sumolib/net/generator/demand.py              |    22 +-
 tools/sumolib/net/generator/network.py             |    32 +-
 tools/sumolib/net/lane.py                          |    91 +-
 tools/sumolib/net/node.py                          |    45 +-
 tools/sumolib/net/roundabout.py                    |     4 +-
 tools/sumolib/options.py                           |     4 +-
 tools/sumolib/output/__init__.py                   |   205 +-
 tools/sumolib/output/convert/__init__.py           |     4 +-
 tools/sumolib/output/convert/gpsdat.py             |     4 +-
 tools/sumolib/output/convert/ns2.py                |     4 +-
 tools/sumolib/output/convert/omnet.py              |     4 +-
 tools/sumolib/output/convert/phem.py               |    22 +-
 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/scenario/__init__.py                 |     4 +-
 tools/sumolib/scenario/checkFlows.py               |     4 +-
 tools/sumolib/scenario/pop2.py                     |    64 +-
 tools/sumolib/scenario/runsdb.py                   |    18 +-
 .../RealWorld/RiLSA_example1/makeRoutes.py         |     4 +-
 .../RealWorld/RiLSA_example2/makeRoutes.py         |     4 +-
 .../RealWorld/RiLSA_example3/makeRoutes.py         |     4 +-
 .../RealWorld/RiLSA_example4/makeRoutes.py         |     4 +-
 tools/sumolib/scenario/scenarios/__init__.py       |    35 +-
 tools/sumolib/scenario/scenarios/basic_corridor.py |     4 +-
 tools/sumolib/scenario/scenarios/basic_cross.py    |     4 +-
 tools/sumolib/scenario/scenarios/basic_crossl.py   |     4 +-
 tools/sumolib/scenario/scenarios/basic_net.py      |     4 +-
 .../scenario/scenarios/basic_rilsacorridor3.py     |     4 +-
 tools/sumolib/scenario/scenarios/basic_rilsanet.py |     4 +-
 .../scenario/scenarios/basic_rilsanet2x2.py        |     4 +-
 tools/sumolib/scenario/scenarios/real_world.py     |     4 +-
 tools/sumolib/scenario/scenarios/rilsa1.py         |     4 +-
 .../sumolib/scenario/scenarios/rilsa1_both_tls.py  |     4 +-
 .../scenario/scenarios/rilsa1_both_tls24.py        |     4 +-
 tools/sumolib/scenario/scenarios/rilsa1_out_tls.py |     4 +-
 .../sumolib/scenario/scenarios/rilsa1_out_tls24.py |     4 +-
 tools/sumolib/sensors/__init__.py                  |     4 +-
 tools/sumolib/sensors/inductive_loop.py            |    13 +-
 tools/sumolib/shapes/__init__.py                   |     4 +-
 tools/sumolib/shapes/poi.py                        |     6 +-
 tools/sumolib/shapes/polygon.py                    |    19 +-
 tools/sumolib/visualization/__init__.py            |     4 +-
 tools/sumolib/visualization/helpers.py             |    10 +-
 tools/sumolib/xml.py                               |   240 +
 tools/tls/createTlsCsv.py                          |    30 +
 tools/tls/tls_check.py                             |     4 +-
 tools/tls/tls_csv2SUMO.py                          |    82 +-
 tools/tlsCoordinator.py                            |    16 +-
 tools/traceExporter.py                             |     6 +-
 tools/traci/__init__.py                            |    51 +-
 tools/traci/_areal.py                              |   109 -
 tools/traci/_edge.py                               |    52 +-
 tools/traci/_gui.py                                |    10 +-
 tools/traci/_inductionloop.py                      |    20 +-
 tools/traci/_junction.py                           |     6 +-
 tools/traci/_lane.py                               |    48 +-
 tools/traci/_lanearea.py                           |   118 +
 tools/traci/_multientryexit.py                     |    18 +-
 tools/traci/_person.py                             |   260 +-
 tools/traci/_poi.py                                |    14 +-
 tools/traci/_polygon.py                            |    20 +-
 tools/traci/_route.py                              |     4 +-
 tools/traci/_simulation.py                         |    82 +-
 tools/traci/_trafficlights.py                      |    22 +-
 tools/traci/_vehicle.py                            |   384 +-
 tools/traci/_vehicletype.py                        |    82 +-
 tools/traci/connection.py                          |    40 +-
 tools/traci/constants.py                           |   184 +-
 tools/traci/domain.py                              |    34 +-
 tools/traci/exceptions.py                          |     4 +-
 tools/traci/rebuildConstants.py                    |    71 +-
 tools/traci/storage.py                             |     4 +-
 tools/traci/traciToHex.py                          |     4 +-
 tools/trigger/csv2vss.py                           |     4 +-
 tools/turn-defs/collectinghandler.py               |     4 +-
 tools/turn-defs/connections.py                     |    85 +-
 tools/turn-defs/generateTurnDefs.py                |    11 +-
 tools/turn-defs/turndefinitions.py                 |    31 +-
 tools/visualization/mpl_dump_onNet.py              |    10 +-
 tools/visualization/mpl_dump_timeline.py           |    14 +-
 tools/visualization/mpl_dump_twoAgainst.py         |    14 +-
 tools/visualization/mpl_tripinfos_twoAgainst.py    |    14 +-
 tools/visualization/plot_csv_bars.py               |     4 +-
 tools/visualization/plot_csv_pie.py                |     6 +-
 tools/visualization/plot_csv_timeline.py           |    12 +-
 tools/visualization/plot_net_dump.py               |    28 +-
 tools/visualization/plot_net_selection.py          |     8 +-
 tools/visualization/plot_net_speeds.py             |    14 +-
 tools/visualization/plot_net_trafficLights.py      |     6 +-
 tools/visualization/plot_summary.py                |     6 +-
 tools/visualization/plot_tripinfo_distributions.py |    10 +-
 tools/webWizard/SimpleWebSocketServer.py           |   259 +-
 tools/webWizard/__init__.py                        |     4 +-
 tools/xml/addSchema.py                             |     4 +-
 tools/xml/binary2plain.py                          |    21 +-
 tools/xml/csv2xml.py                               |     6 +-
 tools/xml/protobuf2xml.py                          |     4 +-
 tools/xml/rebuildSchemata.py                       |     4 +-
 tools/xml/schemaCheck.py                           |    11 +-
 tools/xml/xml2csv.py                               |     4 +-
 tools/xml/xml2protobuf.py                          |     4 +-
 tools/xml/xsd.py                                   |     4 +-
 tools_filelist                                     |   Bin 146161 -> 146258 bytes
 unittest/src/Makefile.am                           |    13 +-
 unittest/src/Makefile.in                           |    22 +-
 unittest/src/microsim/MSCFModelTest.cpp            |    36 +-
 unittest/src/microsim/MSEventControlTest.cpp       |     9 +-
 unittest/src/netbuild/NBHeightMapperTest.cpp       |     4 +-
 unittest/src/netbuild/NBTrafficLightLogicTest.cpp  |     4 +-
 unittest/src/unittest_main.cpp                     |     4 +-
 unittest/src/utils/common/CommandMock.h            |     4 +-
 unittest/src/utils/common/RGBColorTest.cpp         |     4 +-
 unittest/src/utils/common/StringUtilsTest.cpp      |     4 +-
 unittest/src/utils/common/TplConvertTest.cpp       |    36 +-
 unittest/src/utils/common/ValueTimeLineTest.cpp    |     4 +-
 unittest/src/utils/foxtools/FXWorkerThreadTest.cpp |     4 +-
 unittest/src/utils/geom/BoundaryTest.cpp           |     4 +-
 unittest/src/utils/geom/GeoConvHelperTest.cpp      |     4 +-
 unittest/src/utils/geom/GeomHelperTest.cpp         |    20 +-
 unittest/src/utils/geom/PositionVectorTest.cpp     |    12 +-
 unittest/src/utils/iodevices/OutputDeviceMock.h    |     4 +-
 3594 files changed, 219254 insertions(+), 170025 deletions(-)
 delete mode 100644 .gitignore
 create mode 100644 data/xsd/calibratorstats_file.xsd
 create mode 100644 data/xsd/det_e1meso_file.xsd
 create mode 100644 data/xsd/detectors_file.xsd
 create mode 100644 data/xsd/instant_e1_file.xsd
 create mode 100644 data/xsd/state_file.xsd
 create mode 100644 data/xsd/stopinfo_file.xsd
 create mode 100644 data/xsd/tlsstates_file.xsd
 create mode 100644 data/xsd/tlsswitches_file.xsd
 delete mode 100644 debian/patches/60_fix_format_not_a_string.patch
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/OSM/adlershof_dlr/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_edge2edge_conns/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_lane2lane_conns/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_no_turnarounds/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_prohibitions/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/connections/cross3l_unconstrained/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/dlr-testtrack/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/hokkaido/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_notypes_kmh/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/speed_in_kmh/cross_usingtypes_kmh/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_notypes/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/calibratorstats_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/det_e1meso_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/detectors_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/instant_e1_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/state_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/stopinfo_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/tlsstates_file.xsd
 create mode 100644 docs/examples/netconvert/types/cross_usingtypes/data/xsd/tlsswitches_file.xsd
 create mode 100644 docs/tutorial/circles/data/circles.add.xml
 create mode 100644 docs/tutorial/circles/data/circles.net.xml
 create mode 100644 docs/tutorial/circles/data/circles.rou.xml
 create mode 100644 docs/tutorial/circles/data/circles.sumocfg
 create mode 100755 docs/tutorial/circles/runner.py
 create mode 100644 docs/tutorial/sumolympics/data/makeSumolympicWalkers.py
 create mode 100644 docs/tutorial/sumolympics/data/sumolympicWalks.rou.xml
 create mode 100644 docs/tutorial/sumolympics/data/sumolympics.net.xml
 create mode 100644 docs/tutorial/sumolympics/data/sumolympics.rou.xml
 create mode 100644 docs/tutorial/sumolympics/data/sumolympics.sumocfg
 create mode 100755 docs/tutorial/sumolympics/runner.py
 delete mode 100644 src/foreign/nvwa/Makefile.am
 delete mode 100644 src/foreign/nvwa/Makefile.in
 delete mode 100644 src/foreign/nvwa/debug_new.cpp
 delete mode 100644 src/foreign/nvwa/debug_new.h
 delete mode 100644 src/foreign/nvwa/fast_mutex.h
 delete mode 100644 src/foreign/nvwa/static_assert.h
 create mode 100644 src/guisim/GUIE2Collector.cpp
 create mode 100644 src/guisim/GUIE2Collector.h
 create mode 100644 src/guisim/GUIParkingArea.cpp
 create mode 100644 src/guisim/GUIParkingArea.h
 delete mode 100644 src/guisim/GUI_E2_ZS_Collector.cpp
 delete mode 100644 src/guisim/GUI_E2_ZS_Collector.h
 delete mode 100644 src/guisim/GUI_E2_ZS_CollectorOverLanes.cpp
 delete mode 100644 src/guisim/GUI_E2_ZS_CollectorOverLanes.h
 create mode 100644 src/microsim/MSParkingArea.cpp
 create mode 100644 src/microsim/MSParkingArea.h
 create mode 100644 src/microsim/cfmodels/MSCFModel_KraussX.cpp
 create mode 100644 src/microsim/cfmodels/MSCFModel_KraussX.h
 create mode 100644 src/microsim/cfmodels/MSCFModel_Rail.cpp
 create mode 100644 src/microsim/cfmodels/MSCFModel_Rail.h
 create mode 100644 src/microsim/devices/MSDevice_SSM.cpp
 create mode 100644 src/microsim/devices/MSDevice_SSM.h
 create mode 100644 src/microsim/output/MSStopOut.cpp
 create mode 100644 src/microsim/output/MSStopOut.h
 delete mode 100644 src/microsim/output/MS_E2_ZS_CollectorOverLanes.cpp
 delete mode 100644 src/microsim/output/MS_E2_ZS_CollectorOverLanes.h
 create mode 100644 src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.cpp
 create mode 100644 src/microsim/traffic_lights/MSDelayBasedTrafficLightLogic.h
 delete mode 100644 src/netbuild/NBDistribution.cpp
 delete mode 100644 src/netbuild/NBDistribution.h
 create mode 100644 src/netbuild/NBPTStop.cpp
 create mode 100644 src/netbuild/NBPTStop.h
 create mode 100644 src/netbuild/NBPTStopCont.cpp
 create mode 100644 src/netbuild/NBPTStopCont.h
 delete mode 100644 src/netedit/GNEAdditionalSet.cpp
 delete mode 100644 src/netedit/GNEAdditionalSet.h
 create mode 100644 src/netedit/GNECalibratorFlow.cpp
 create mode 100644 src/netedit/GNECalibratorFlow.h
 create mode 100644 src/netedit/GNECalibratorFlowDialog.cpp
 create mode 100644 src/netedit/GNECalibratorFlowDialog.h
 create mode 100644 src/netedit/GNECalibratorRoute.cpp
 create mode 100644 src/netedit/GNECalibratorRoute.h
 create mode 100644 src/netedit/GNECalibratorRouteDialog.cpp
 create mode 100644 src/netedit/GNECalibratorRouteDialog.h
 create mode 100644 src/netedit/GNECalibratorVehicleType.cpp
 create mode 100644 src/netedit/GNECalibratorVehicleType.h
 create mode 100644 src/netedit/GNECalibratorVehicleTypeDialog.cpp
 create mode 100644 src/netedit/GNECalibratorVehicleTypeDialog.h
 copy NEWS => src/netedit/GNEChange_CalibratorItem.cpp (100%)
 copy NEWS => src/netedit/GNEChange_CalibratorItem.h (100%)
 create mode 100644 src/netedit/GNEChange_Crossing.cpp
 create mode 100644 src/netedit/GNEChange_Crossing.h
 copy NEWS => src/netedit/GNEChange_POI.cpp (100%)
 copy NEWS => src/netedit/GNEChange_POI.h (100%)
 copy NEWS => src/netedit/GNEChange_RerouterInterval.cpp (100%)
 copy NEWS => src/netedit/GNEChange_RerouterInterval.h (100%)
 create mode 100644 src/netedit/GNEClosingLaneReroute.cpp
 create mode 100644 src/netedit/GNEClosingLaneReroute.h
 create mode 100644 src/netedit/GNEClosingReroute.cpp
 create mode 100644 src/netedit/GNEClosingReroute.h
 create mode 100644 src/netedit/GNECrossingFrame.cpp
 create mode 100644 src/netedit/GNECrossingFrame.h
 create mode 100644 src/netedit/GNEDeleteFrame.cpp
 create mode 100644 src/netedit/GNEDeleteFrame.h
 create mode 100644 src/netedit/GNEDestProbReroute.cpp
 create mode 100644 src/netedit/GNEDestProbReroute.h
 create mode 100644 src/netedit/GNEDialog_AllowDisallow.cpp
 create mode 100644 src/netedit/GNEDialog_AllowDisallow.h
 create mode 100644 src/netedit/GNERerouterInterval.cpp
 create mode 100644 src/netedit/GNERerouterInterval.h
 create mode 100644 src/netedit/GNERerouterIntervalDialog.cpp
 create mode 100644 src/netedit/GNERerouterIntervalDialog.h
 create mode 100644 src/netedit/GNERouteProbReroute.cpp
 create mode 100644 src/netedit/GNERouteProbReroute.h
 create mode 100644 src/netedit/GNEVariableSpeedSign.cpp
 create mode 100644 src/netedit/GNEVariableSpeedSign.h
 create mode 100644 src/netedit/GNEVariableSpeedSignDialog.cpp
 create mode 100644 src/netedit/GNEVariableSpeedSignDialog.h
 create mode 100644 src/netedit/GNEVariableSpeedSignStep.cpp
 create mode 100644 src/netedit/GNEVariableSpeedSignStep.h
 delete mode 100644 src/netedit/GNEVariableSpeedSignal.cpp
 delete mode 100644 src/netedit/GNEVariableSpeedSignal.h
 delete mode 100644 src/netedit/GNEVariableSpeedSignalDialog.cpp
 delete mode 100644 src/netedit/GNEVariableSpeedSignalDialog.h
 create mode 100644 src/traci-server/TraCIDefs.h
 delete mode 100644 src/traci-server/TraCIException.h
 delete mode 100644 src/traci-server/TraCIServerAPI_ArealDetector.cpp
 delete mode 100644 src/traci-server/TraCIServerAPI_ArealDetector.h
 create mode 100644 src/traci-server/TraCIServerAPI_LaneArea.cpp
 create mode 100644 src/traci-server/TraCIServerAPI_LaneArea.h
 delete mode 100644 src/traci-server/TraCIServerAPI_MeMeDetector.cpp
 delete mode 100644 src/traci-server/TraCIServerAPI_MeMeDetector.h
 create mode 100644 src/traci-server/TraCIServerAPI_MultiEntryExit.cpp
 create mode 100644 src/traci-server/TraCIServerAPI_MultiEntryExit.h
 create mode 100644 src/traci-server/lib/Makefile.am
 create mode 100644 src/traci-server/lib/Makefile.in
 create mode 100644 src/traci-server/lib/TraCI.cpp
 create mode 100644 src/traci-server/lib/TraCI.h
 create mode 100644 src/traci-server/lib/TraCI_InductionLoop.cpp
 create mode 100644 src/traci-server/lib/TraCI_InductionLoop.h
 create mode 100644 src/traci-server/lib/TraCI_Junction.cpp
 create mode 100644 src/traci-server/lib/TraCI_Junction.h
 create mode 100644 src/traci-server/lib/TraCI_Lane.cpp
 create mode 100644 src/traci-server/lib/TraCI_Lane.h
 create mode 100644 src/traci-server/lib/TraCI_LaneArea.cpp
 create mode 100644 src/traci-server/lib/TraCI_LaneArea.h
 create mode 100644 src/traci-server/lib/TraCI_MultiEntryExit.cpp
 create mode 100644 src/traci-server/lib/TraCI_MultiEntryExit.h
 create mode 100644 src/traci-server/lib/TraCI_POI.cpp
 create mode 100644 src/traci-server/lib/TraCI_POI.h
 create mode 100644 src/traci-server/lib/TraCI_Polygon.cpp
 create mode 100644 src/traci-server/lib/TraCI_Polygon.h
 create mode 100644 src/traci-server/lib/TraCI_Route.cpp
 create mode 100644 src/traci-server/lib/TraCI_Route.h
 create mode 100644 src/traci-server/lib/TraCI_Vehicle.cpp
 create mode 100644 src/traci-server/lib/TraCI_Vehicle.h
 create mode 100644 src/traci-server/lib/TraCI_VehicleType.cpp
 create mode 100644 src/traci-server/lib/TraCI_VehicleType.h
 delete mode 100644 src/utils/common/RandomDistributor.h
 delete mode 100644 src/utils/distribution/Distribution_MeanDev.cpp
 delete mode 100644 src/utils/distribution/Distribution_MeanDev.h
 create mode 100644 src/utils/distribution/Distribution_Parameterized.cpp
 create mode 100644 src/utils/distribution/Distribution_Parameterized.h
 create mode 100644 src/utils/distribution/RandomDistributor.h
 create mode 100644 src/utils/emissions/HelpersEnergy.cpp
 create mode 100644 src/utils/emissions/HelpersEnergy.h
 create mode 100644 src/utils/gui/div/GUIDesigns.h
 create mode 100644 src/utils/gui/images/GNETexture_VariableSpeedSign.cpp
 create mode 100644 src/utils/gui/images/GNETexture_VariableSpeedSignSelected.cpp
 delete mode 100644 src/utils/gui/images/GNETexture_VariableSpeedSignal.cpp
 delete mode 100644 src/utils/gui/images/GNETexture_VariableSpeedSignalSelected.cpp
 create mode 100644 src/utils/gui/images/accept.xpm
 create mode 100644 src/utils/gui/images/busstop.xpm
 create mode 100644 src/utils/gui/images/calibrator.xpm
 create mode 100644 src/utils/gui/images/cancel.xpm
 create mode 100644 src/utils/gui/images/chargingstation.xpm
 create mode 100644 src/utils/gui/images/cleanjunctions.xpm
 create mode 100644 src/utils/gui/images/computejunctions.xpm
 create mode 100644 src/utils/gui/images/connection.xpm
 create mode 100644 src/utils/gui/images/containerstop.xpm
 create mode 100644 src/utils/gui/images/correct.xpm
 create mode 100644 src/utils/gui/images/crossing.xpm
 create mode 100644 src/utils/gui/images/dlr.xpm
 create mode 100644 src/utils/gui/images/e1.xpm
 create mode 100644 src/utils/gui/images/e2.xpm
 create mode 100644 src/utils/gui/images/e3.xpm
 create mode 100644 src/utils/gui/images/e3entry.xpm
 create mode 100644 src/utils/gui/images/e3exit.xpm
 create mode 100644 src/utils/gui/images/edge.xpm
 create mode 100644 src/utils/gui/images/empty.xpm
 create mode 100644 src/utils/gui/images/error.xpm
 create mode 100644 src/utils/gui/images/grid1.xpm
 create mode 100644 src/utils/gui/images/grid2.xpm
 create mode 100644 src/utils/gui/images/grid3.xpm
 create mode 100644 src/utils/gui/images/joinjunctions.xpm
 create mode 100644 src/utils/gui/images/junction.xpm
 create mode 100644 src/utils/gui/images/lane.xpm
 create mode 100644 src/utils/gui/images/modeadditional.xpm
 create mode 100644 src/utils/gui/images/modeconnection.xpm
 create mode 100644 src/utils/gui/images/modecreateedge.xpm
 create mode 100644 src/utils/gui/images/modecrossing.xpm
 create mode 100644 src/utils/gui/images/modedelete.xpm
 create mode 100644 src/utils/gui/images/modeinspect.xpm
 create mode 100644 src/utils/gui/images/modemove.xpm
 create mode 100644 src/utils/gui/images/modeselect.xpm
 create mode 100644 src/utils/gui/images/modetrafficlight.xpm
 create mode 100644 src/utils/gui/images/options.xpm
 create mode 100644 src/utils/gui/images/prohibition.xpm
 create mode 100644 src/utils/gui/images/rerouter.xpm
 create mode 100644 src/utils/gui/images/reset.xpm
 create mode 100644 src/utils/gui/images/routeprobe.xpm
 create mode 100644 src/utils/gui/images/sumo.xpm
 create mode 100644 src/utils/gui/images/vaporizer.xpm
 create mode 100644 src/utils/gui/images/variablespeedsign.xpm
 create mode 100644 src/utils/gui/images/vclass_army.xpm
 create mode 100644 src/utils/gui/images/vclass_authority.xpm
 create mode 100644 src/utils/gui/images/vclass_bicycle.xpm
 create mode 100644 src/utils/gui/images/vclass_bus.xpm
 create mode 100644 src/utils/gui/images/vclass_coach.xpm
 create mode 100644 src/utils/gui/images/vclass_custom1.xpm
 create mode 100644 src/utils/gui/images/vclass_custom2.xpm
 create mode 100644 src/utils/gui/images/vclass_delivery.xpm
 create mode 100644 src/utils/gui/images/vclass_emergency.xpm
 create mode 100644 src/utils/gui/images/vclass_evehicle.xpm
 create mode 100644 src/utils/gui/images/vclass_hov.xpm
 create mode 100644 src/utils/gui/images/vclass_ignoring.xpm
 create mode 100644 src/utils/gui/images/vclass_moped.xpm
 create mode 100644 src/utils/gui/images/vclass_motorcycle.xpm
 create mode 100644 src/utils/gui/images/vclass_passenger.xpm
 create mode 100644 src/utils/gui/images/vclass_pedestrian.xpm
 create mode 100644 src/utils/gui/images/vclass_private.xpm
 create mode 100644 src/utils/gui/images/vclass_rail.xpm
 create mode 100644 src/utils/gui/images/vclass_rail_electric.xpm
 create mode 100644 src/utils/gui/images/vclass_rail_urban.xpm
 create mode 100644 src/utils/gui/images/vclass_ship.xpm
 create mode 100644 src/utils/gui/images/vclass_taxi.xpm
 create mode 100644 src/utils/gui/images/vclass_trailer.xpm
 create mode 100644 src/utils/gui/images/vclass_tram.xpm
 create mode 100644 src/utils/gui/images/vclass_truck.xpm
 create mode 100644 src/utils/gui/images/vclass_vip.xpm
 create mode 100644 src/utils/gui/images/warning.xpm
 create mode 100644 src/utils/vehicle/CHBuilder.h
 create mode 100644 src/utils/xml/SUMOSAXAttributesImpl_Cached.cpp
 create mode 100644 src/utils/xml/SUMOSAXAttributesImpl_Cached.h
 create mode 100755 tools/build/checkStyle.py
 delete mode 100755 tools/build/checkSvnProps.py
 create mode 100755 tools/build/runSikulixServer.pyw
 create mode 100755 tools/build/setup-sumolib.py
 create mode 100755 tools/build/setup-traci.py
 delete mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/ArealDetector.java
 create mode 100644 tools/contributed/traas/src/de/tudresden/sumo/cmd/Lanearea.java
 create mode 100644 tools/detector/routeUsage.py
 mode change 100644 => 100755 tools/import/vissim/convert_detectors2SUMO.py
 mode change 100644 => 100755 tools/output/edgeDataDiff.py
 mode change 100644 => 100755 tools/output/tripinfoDiff.py
 create mode 100644 tools/route/implausibleRoutes.py
 delete mode 100644 tools/route/routeDiffStats.py
 create mode 100644 tools/sumolib/xml.py
 create mode 100755 tools/tls/createTlsCsv.py
 delete mode 100644 tools/traci/_areal.py
 create mode 100644 tools/traci/_lanearea.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sumo.git



More information about the debian-science-commits mailing list