Skip to content

Commit

Permalink
its vs it's part 2 ref #2
Browse files Browse the repository at this point in the history
Signed-off-by: m-kro <m.barthauer@t-online.de>
  • Loading branch information
m-kro committed Apr 17, 2024
1 parent e48b295 commit 2d7c7ec
Show file tree
Hide file tree
Showing 44 changed files with 129 additions and 129 deletions.
66 changes: 33 additions & 33 deletions docs/web/docs/ChangeLog.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/web/docs/ChangeLog/Changes_in_2015_releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ title: Changes in the 2015 releases (versions 0.23.0, 0.24.0 and 0.25.0)
directly within the *tools* folder.

- Misc
- *start-commandline-bat* now adds python (python 2.7 in it's
- *start-commandline-bat* now adds python (python 2.7 in its
default install location) and {{SUMO}}/tools to the path.
- Simplified runner script of
[Tutorials/TraCI4Traffic_Lights](../Tutorials/TraCI4Traffic_Lights.md)
Expand Down Expand Up @@ -522,7 +522,7 @@ title: Changes in the 2015 releases (versions 0.23.0, 0.24.0 and 0.25.0)
[`<laneAreaDetector>`](../TraCI/Lane_Area_Detector_Value_Retrieval.md):
lane, position, and length. Also added corresponding functions
to the [python API](../TraCI/Interfacing_TraCI_from_Python.md)
- added [command to retrieve the index of the vehicles edge within it's route](../TraCI/Vehicle_Value_Retrieval.md). Also
- added [command to retrieve the index of the vehicles edge within its route](../TraCI/Vehicle_Value_Retrieval.md). Also
added the corresponding method *traci.vehicle.getRouteIndex()*
to the [python API](../TraCI/Interfacing_TraCI_from_Python.md). #1823
- extended method *traci.vehicle.setStop(...)* to optionally
Expand Down
4 changes: 2 additions & 2 deletions docs/web/docs/ChangeLog/Changes_in_2016_releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ title: Changes in the 2016 releases (versions 0.26.0, 0.27.0, 0.27.1 and 0.28.0)
[tripinfo-output](../Simulation/Output/TripInfo.md) (last
step was counted twice for some vehicles).
- Fixed bug that would prevent a vehicle from reaching the end of
it's route after rerouting while being teleported. #2554
its route after rerouting while being teleported. #2554
- Fixed erroneous detector output for a special situation. #2556
- Fixed computation of energy loss for subsecond simulation. #2559
- Fixed crash when using
Expand Down Expand Up @@ -298,7 +298,7 @@ title: Changes in the 2016 releases (versions 0.26.0, 0.27.0, 0.27.1 and 0.28.0)
- MESO
- The jam-front back-propagation speed now reaches realistic
values (it was illogically low before). Note that default value
of option **--meso-taujj** changes as well as it's semantics. #2244
of option **--meso-taujj** changes as well as its semantics. #2244
- Fixed bug where the simulation would not terminate when using
calibrators. #2346
- The options **--meso-tauff** and **--meso-taufj** now define net time gaps (default values were
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/ChangeLog/Changes_in_2017_releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@ model](../Simulation/SublaneModel.md) is now 0.6m (down from
is now scaled according to fraction of available green time. #2753
- Fixed various issues related to inconsistent handling of net and
gross time gaps. This was causing exaggerated speeds. The option
**--meso-taujf** {{DT_TIME}} now corresponds to the net time-gap (as do **--meso-taufj**, **--meso-tauff**). It's default
**--meso-taujf** {{DT_TIME}} now corresponds to the net time-gap (as do **--meso-taufj**, **--meso-tauff**). Its default
value has been reduced from *2.0* to *1.73* correspondingly
(reproducing the old behavior at 100km/h).

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/ChangeLog/Changes_in_2020_releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ title: Changes in the 2020 releases (versions 1.5.0, 1.6.0, 1.7.0 and 1.8.0)
- Fixed bug where all passenger lanes changed their permissions when adding a sidewalk. Issue #7135
- Fixed crash when changing connection shape or junction shape. Issue #7138, #7351
- Fixed invalid output when transforming trip to vehicle. Issue #7073
- Fixed invalid routes when on of it's edges. Issue #6986
- Fixed invalid routes when on of its edges. Issue #6986
- Fixed invalid count of selected elements. Issue #7113
- Fixed missing minDur and maxDur attributes after changing tlType. Issue #7188
- Selection coloring is now working in data mode. Issue #7066
Expand Down
4 changes: 2 additions & 2 deletions docs/web/docs/ChangeLog/Changes_in_2021_releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ title: Changes in the 2021 releases (versions 1.9.0, 1.9.1, 1.9.2, 1.10.0 and 1.
- Loading taz without shape is now supported. Issue #9140
- Taz are now drawn below roads. Issue #9146
- Fixed bug where additional objects could not be loaded via command line option. Issue #9166
- When creating a new TAZ, edges are now assigned based on the polygon shape rather than it's bounding box. Issue #9225
- When creating a new TAZ, edges are now assigned based on the polygon shape rather than its bounding box. Issue #9225
- Fixed invalid e3detector position when placing entry/exit detectors close to junction. Issue #9421
- network mode: other
- Copying one of several traffic light programs now copies the correct one. Issue #7963
Expand Down Expand Up @@ -775,7 +775,7 @@ title: Changes in the 2021 releases (versions 1.9.0, 1.9.1, 1.9.2, 1.10.0 and 1.
- The sublane model now supports modeling an inverse relation between longitudinal and lateral speed (higher lateral speed while stopped and lower while driving fast). This is achieved by setting a negative values for attribute 'lcMaxSpeedLatFactor' and by setting 'lcMaxSpeedLatStanding' > 'maxSpeedLat'. #8064
- Added new vType attribute 'jmIgnoreJunctionFoeProb' to allow ignoring foes (vehicles and pedestrians) that are already on the junction. Issue #8078
- Added option **--device.ssm.filter-edges.input-file** to filter ssm device output by location. Issue #7398
- Added vehicle attribute 'arrivalEdge' which can be used to set an arrival edge index ahead of the last edge of it's route. Issue #7609
- Added vehicle attribute 'arrivalEdge' which can be used to set an arrival edge index ahead of the last edge of its route. Issue #7609
- Connection attribute 'visibility' now controls the distance for zipper merge related speed adjustments (default 100m). Issue #8240
- Added option **--fcd-output.attributes** to set the list of attributes which are included in fcd-output. Issue #7632
- fcd-output can now distinguish riding and walking persons by adding 'vehicle' to the option **--fcd-output.attributes**. Issue #7631
Expand Down
10 changes: 5 additions & 5 deletions docs/web/docs/ChangeLog/Changes_in_2022_releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ title: Changes in the 2022 releases (versions 1.12.0, 1.13.0, 1.14.0, 1.14.1 and
- When using the special string 'TIME' in file names, all written files now use the same time stamp. Issue #10346
- Added option **--pedestrian.striping.walkingarea-detail INT** to increase the smoothness of pedestrian trajectories. Issue #8797
- Added option **--summary-output.period** to reduce the frequency of summary output. Issue #2445
- The slope of a vehicle now takes into account it's length. Issue #8802
- The slope of a vehicle now takes into account its length. Issue #8802
- Rail signal constraints now support loading generic parameters. Issue #11880
- Added options **--edgedata-output FILE** and **--lanedata-output FILE** to configure a very basic meanData output without the need for additional files. Issue #11939
- [Wireless simulation](../Simulation/Bluetooth.md) (btsender and btreciever devices) can now be enabled for persons. Issue #11950

- netedit
- Context menus on ambiguously overlapping objects now gives a choice of object. Holding ALT always gives all choices. Issue #10916
- Saved detector names use descriptive tags instead of the 'E1,E2, ...' tags. Issue #11028
- Hovering over an attribute now displays it's full value in a tooltip if field is too narrow. Issue #11194
- Hovering over an attribute now displays its full value in a tooltip if field is too narrow. Issue #11194
- Added button to inspect vTypes/vTypeDistributions during vehicle inspection. Issue #10041
- Added edge color legend in vehicle mode. Issue #10866
- Now using distinct default id-prefix for `flow`, `personFlow` and `containerFlow`. Issue #11077
Expand All @@ -222,7 +222,7 @@ title: Changes in the 2022 releases (versions 1.12.0, 1.13.0, 1.14.0, 1.14.1 and
- Holding the middle button now allows panning the view (also in sumo-gui). Issue #11632
- "Undo-Redo list" dialog now includes color codes and entity ids. Issue #4765
- Using distinct walkingArea color to distinguish them from other objects. Issue #11724
- Every vClass has it's own icon now. Issue #9872, #11801
- Every vClass has its own icon now. Issue #9872, #11801
- Kilometrage at cursor position is now shown in the edge context menu. Issue #11815
- Added (optional) tooltips in attribute labels. Issue #11490
- Hierarchical selection can now select connections and crossings as children. Issue #11863
Expand Down Expand Up @@ -526,7 +526,7 @@ title: Changes in the 2022 releases (versions 1.12.0, 1.13.0, 1.14.0, 1.14.1 and
- Jammed detectors of actuated traffic lights can now be ignored for phase extension after a configurable time threshold. Issue #5212
- When jam detection is activated (i.e. via option **--tls.actuated.jam-threshold**), all detectors are usable for activation and this eliminates the warnings about "no controlling detectors". Issue #9280, #10682
- InductionLoop detectors now support optional attribute 'length'. Issue #10668
- Actuated traffic lights now support param key 'detector-length' to set the default length of it's detectors. Issue #10668
- Actuated traffic lights now support param key 'detector-length' to set the default length of its detectors. Issue #10668
- Option **--fcd-output.attributes** now supports the value **posLat** to include lateral positions in fcd-output. Issue #10695
- Setting `lcSpeedGain="0"` now fully disables changing for speedGain. Issue #10709
- RailSignalConstraints can now be loaded in a deactivated state by setting attribute `active="false"`. They can still be retrieved via TraCI. Issue #10799
Expand Down Expand Up @@ -571,7 +571,7 @@ title: Changes in the 2022 releases (versions 1.12.0, 1.13.0, 1.14.0, 1.14.1 and
- Geometry points of polygons junctions and walkingareas can now be annotated to aid in debugging (activated in the openGL settings). Issue #10594
- Can now color polygons (and TAZ) randomly. Issue #10938
- Added gzip file endings in file selection dialogs. Issue #10513
- Right clicking on a pedestrian crossing now always opens it's context menu (rather than the menu for the junction). Issue #10914
- Right clicking on a pedestrian crossing now always opens its context menu (rather than the menu for the junction). Issue #10914
- Breakpoints set in sumo-gui now override breakpoints from option **--breakpoints**. Issue #11061

- netconvert
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ see [inspecting connections](Netedit/editModesCommon.md#inspecting_connections)
rerouters for continuous operation with configurable turning ratios.
- If the network is not circular to begin with (i.e a single
road) you can make the network circular in a non-geometrical way
by adding a return edge and declaring it's length to be very
by adding a return edge and declaring its length to be very
short (minimum 0.1m). The return edge should have a sensible geometry (i.e. a detour loop) but the length can be made very short so that it does not affect vehicle routes.

!!! caution
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Installing/Linux_Build_Libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ libfox-1.6-dev.
sudo yum install xerces-c-devel cmake libxerces-c-dev gdal-devel proj-develgl2ps-devel gcc-c++
```

You need to download fox-toolkit from it's website and build manually
You need to download fox-toolkit from its website and build manually
https://www.fox-toolkit.org/download.html

#### Cygwin
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Netedit/editModesNetwork.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ As the rest of elements of netedit, connections can be inspected and modified us
Inspecting a connection. Note that check box "Show connections" is enabled.

![](../images/GNEConnections4b.png)
Connections can be inspected through inspection of their **from** lane or it's corresponding edge.
Connections can be inspected through inspection of their **from** lane or its corresponding edge.

### Changing connections

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Netedit/neteditPopupFunctions.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Straighten edge restore the original shape of an edge

### Reset edge length

Sets the edge length to it's computed value (based on geometry) instead of a custom length.
Sets the edge length to its computed value (based on geometry) instead of a custom length.

### Straighten edge

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Netedit/neteditUsageExamples.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ By default, the geometry of an edge starts with the position of the source junct
!!! caution
When right-clicking the geometry point the click must be within the edge shape for this too work.

Afterwards, you will have to recompute the junction shape to see how it looks (F5). If you want to modify the edge and it's reverse edge at once this works almost the same way:
Afterwards, you will have to recompute the junction shape to see how it looks (F5). If you want to modify the edge and its reverse edge at once this works almost the same way:

1. switch to [select mode](editModesCommon.md#select)
2. select both edges
Expand Down
6 changes: 3 additions & 3 deletions docs/web/docs/Networks/PlainXML.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ title: PlainXML
[netconvert](../netconvert.md) can [convert freely](../Networks/Export.md#plain) and without information loss
between these two formats. Only the *plain-xml* format is meant to be
edited by the users. In contrast, the *.net.xml* format has lots of
subtle inter-dependencies between it's elements and should never be
subtle inter-dependencies between its elements and should never be
edited by hand. The *plain-xml* format is described below.

It is possible to loaded a *net.xml* file along with *plain-xml* patch
Expand Down Expand Up @@ -168,8 +168,8 @@ If you leave out the tlLayout of the node, it is set to *opposites*. This
default may be changed using the option **--tls.layout** {{DT_STR}}

- `opposites`: roads from opposite directions get the green light at the same time. Left turns (which conflict with the opposite stream) either have a green-with-conflict ('m') or get their own phase.
- `incoming`: each incoming road gets it's own green phase
- `alternateOneWay`: This program is for a joined controller that regulates alternating one-way access from two or more sides of a work zone (or narrow road). each incoming road gets it's own green phase and there is an all-red phase according to the size of the work zone for traffic to clear before the next direction starts up.
- `incoming`: each incoming road gets its own green phase
- `alternateOneWay`: This program is for a joined controller that regulates alternating one-way access from two or more sides of a work zone (or narrow road). each incoming road gets its own green phase and there is an all-red phase according to the size of the work zone for traffic to clear before the next direction starts up.

## Node types

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Simpla.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ catch-up follower mode will use the follower mode if no separate
catch-up follower mode is specified.

!!! note
Simpla currently does not support lane-changing to join a platoon. Vehicles that are already in a platoon will try to change their lane if the platoon leader changes it's lane though.
Simpla currently does not support lane-changing to join a platoon. Vehicles that are already in a platoon will try to change their lane if the platoon leader changes its lane though.

# Configuration

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ vehicle only once but they include/exclude some special cases.

## Visualization / Plotting

- [sumo-gui](../../sumo-gui.md#visualizing_edge-related_data) can load edgeData files and color network edges/lanes according to any of it's attributes
- [sumo-gui](../../sumo-gui.md#visualizing_edge-related_data) can load edgeData files and color network edges/lanes according to any of its attributes
- [sumo-gui](../../sumo-gui.md#edgelane_visualisation_settings) can color edges/lanes by any of the attributes being collected while the simulation is running
- [netedit](../../Netedit/editModesData.md) can be used to load/view/edit edgeData files
- The [mpl_dump_onNet.py](../../Tools/Visualization.md#mpl_dump_onnetpy)
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Simulation/Output/VehRoutes.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ For example, setting the option **--device.vehroute.probability 0.25** will equi
- **--vehroute-output.skip-ptlines**: Skip vehroute output for public transport vehicles (vehicles that have a 'line' attribute)
- **--vehroute-output.incomplete**: Include invalid routes and route stubs (from-to) in the vehroute output
- **--vehroute-output.stop-edges**: Include information about edges between stops
- **--vehroute-output.speedfactor**: Include information vehicle specific speedFactor in output (defaults to 'true' if the vehicle had it's departSpeed set)
- **--vehroute-output.speedfactor**: Include information vehicle specific speedFactor in output (defaults to 'true' if the vehicle had its departSpeed set)
- **--vehroute-output.internal**: Include internal edges in the output. Note, that such routes are not suitable for being loaded by sumo or duarouter!

## Visualization example
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Simulation/Output/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ By default, sumo will print some "heartbeat" information to indicate that it is
- **ACT**: number of currently running vehicles
- **BUF**: number of vehicles with delayed insertion

This output can be disabled with the option **--no-step-log**. It's period can be configured with the option **--step-log.period TIME**.
This output can be disabled with the option **--no-step-log**. Its period can be configured with the option **--step-log.period TIME**.

# Commandline Output (verbose)

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Simulation/ParkingArea.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ The space element supports the following attributes:
# Letting Vehicles stop at a parking area

To declare a vehicle that stops at a parkingPlace, a `<stop>`-definition must
be part of the vehicle or it's route:
be part of the vehicle or its route:

```xml
<vehicle id="0" depart="0">
Expand Down
6 changes: 3 additions & 3 deletions docs/web/docs/Simulation/Pedestrians.md
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ both. The algorithm for selecting the preferred stripe is based on the
direction of movement (preferring evasion to the right for oncoming
pedestrians) and the expected distance the pedestrian will be able to
walk in that stripe without a collision. The model assumes that the pedestrian
can fit into a single strip when walking in it's center. When **--pedestrian.striping-width** {{DT_FLOAT}}
can fit into a single strip when walking in its center. When **--pedestrian.striping-width** {{DT_FLOAT}}
is lower than a given path width, 100% safety is not guaranteed on shared lanes, i.e. collisions may occur.
The warning to change the stripe-width will then be shown during simulation.

Expand Down Expand Up @@ -324,14 +324,14 @@ There are several situations in which pedestrian jams are possible

- high traffic from different directions approaching the same walkingarea
- interaction with vehicles on shared space
- trying to reach a busStop when it has reached it's `personCapacity` limit
- trying to reach a busStop when it has reached its `personCapacity` limit
- oncoming traffic on narrow sidewalks

There are several mitigations to prevent the frequency of jams and to resolve them after they have occured

- on crossings and walkingareas, pedestrians reserve 1/3 of the road space for oncoming traffic (configurable with option **--pedestrian.striping.reserve-oncoming.junctions**)
- on normal lanes / sidewalks, such a reservation can be activated with option **--pedestrian.striping.reserve-oncoming**
- if a pedestrian was unable to move for 300s (configurable with option **--pedestrian.striping.jamtime**) he goes into a 'jammed' state accompanied by the warning "Person ... is jammed ...". In this state the person starts moving regardless of obstacles at 1/4 of it's maximum speed. While jammed, no pedestrian collisions are registered. The jammed state ends as soon as there as there are no more obstacles in front of the person.
- if a pedestrian was unable to move for 300s (configurable with option **--pedestrian.striping.jamtime**) he goes into a 'jammed' state accompanied by the warning "Person ... is jammed ...". In this state the person starts moving regardless of obstacles at 1/4 of its maximum speed. While jammed, no pedestrian collisions are registered. The jammed state ends as soon as there as there are no more obstacles in front of the person.
- while on a crossing the time to register as jammed is reduced to 10s (configurable with **--pedestrian.striping.jamtime.crossing**)
- while on a network elements that online permits a single pedestrian abreast the time time to jammed is set to 1s (configurable with option **pedestrian.striping.jamtime.narrow**)

Expand Down

0 comments on commit 2d7c7ec

Please sign in to comment.