Skip to content

Commit

Permalink
#2 #22 typos and minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@angelobanse
angelobanse committed Oct 9, 2024
1 parent 4c4b720 commit 89f6f14
Show file tree
Hide file tree
Showing 28 changed files with 135 additions and 138 deletions.
2 changes: 1 addition & 1 deletion docs/web/docs/ChangeLog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ title: ChangeLog
- chargingStation default power is now 22kW (instead of 0) #15144
- Added warning for unusual distribution definitions #15146
- fcd-output now contains the vtype for pedestrians #15210
- Added option **--chargingstations-output.aggregated ** to write output that is more compact #15240
- Added option **--chargingstations-output.aggregated** to write output that is more compact #15240
- vType attribute `jmAllwayStopWait` can now be used to customize required waiting time at allwayStop #15428
- time-to-teleport.disconnected may now be higher than time-to-teleport #15494
- Stop attribute `index` can now be used to encode stopping on a later edge of a looped route #15503
Expand Down
6 changes: 3 additions & 3 deletions docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,8 @@ inserted at the end of the lane instead. When departSpeed="max" is set, vehicle
Determines the speed of the vehicle at insertion, where maxDepartSpeed = MIN(speedLimit * speedFactor, vType_desiredMaxSpeed * speedFactor, vType_maxSpeed);

- `≥0`: The vehicle is tried to be inserted using the given speed. If that speed is unsafe, departure is delayed.
- "`random`": A random speed between 0 and maxDepartSpeed is used, the speed may be adapted to accomodate a leader or intersection ensure a safe distance to the leader vehicle.
- "`max`": The maxDeparSpeed is used when possible, the speed may be lowered to accomodate a leader vehicle or intersections.
- "`random`": A random speed between 0 and maxDepartSpeed is used, the speed may be adapted to accommodate a leader or intersection ensure a safe distance to the leader vehicle.
- "`max`": The maxDeparSpeed is used when possible, the speed may be lowered to accommodate a leader vehicle or intersections.
- "`desired`": The maxDepartSpeed is used. If that speed is unsafe, departure is delayed.
- "`speedLimit`": The speed limit of the lane is used. If that speed is unsafe, departure is delayed.
- "`last`": The current speed of the last vehicle on the departure lane is used (or 'desired' speed if the lane is empty). If that speed is unsafe, departure is delayed.
Expand Down Expand Up @@ -502,7 +502,7 @@ startupDelay | float >= 0 | 0 | The extra delay tim
| scale | float >= 0 | scaling factor for traffic. Acts as a multiplier for option **--scale** for all vehicles of this type. Values < 1 cause a proportional reduction in traffic whereas values above 1 increase it by this factor. (default 1)|
| timeToTeleport | float | | Override option **--time-to-teleport** for vehicles of this type |
| timeToTeleportBidi | float | | Override option **--time-to-teleport.bidi** for vehicles of this type |
| speedFactorPremature | float | | When set to a positive value, this may cause a train to slow down on approach to a stop whenever the stop has its `arrival` attribut set and the vehicle would otherwise be ahead of schedule. The given value is multiplied with the edge speed limit and used as a lower bound for slowing down. If option **--use-stop-started** is set and the stop defines the `started` attribute, this is used instead of `arrival`. |
| speedFactorPremature | float | | When set to a positive value, this may cause a train to slow down on approach to a stop whenever the stop has its `arrival` attribute set and the vehicle would otherwise be ahead of schedule. The given value is multiplied with the edge speed limit and used as a lower bound for slowing down. If option **--use-stop-started** is set and the stop defines the `started` attribute, this is used instead of `arrival`. |
| parkingBadges | string list | \- | list of keywords to access restricted parking areas (the default empty list will still allow access to unrestricted parking areas) |

Besides values which describe the vehicle's car-following properties,
Expand Down
3 changes: 1 addition & 2 deletions docs/web/docs/Driver_State.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ errors at the perception stage, see
*Figure 1: Errors in the driving process.*

Practically, errors are added to the input quantities of the
car-following model's input parameters of spacing and speed difference
(for an integration in [contributed car-following
car-following model's input parameters of spacing and speed difference. For an integration in [contributed car-following
models](Developer/How_To/Car-Following_Model.md), the
[implementation in the standard
model](https://github.com/eclipse-sumo/sumo/blob/main/src/microsim/cfmodels/MSCFModel_Krauss.cpp)
Expand Down
4 changes: 2 additions & 2 deletions docs/web/docs/FAQ.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ and simply type `git pull`.

Make sure that your computer supports 3D Acceleration and graphical
drivers are correctly installed and configured. It will probably not
work on mahcines accessed via RDP or a similar remote desktop protocol.
work on machines accessed via RDP or a similar remote desktop protocol.

### Troubleshooting

Expand Down Expand Up @@ -781,7 +781,7 @@ see [inspecting connections](Netedit/editModesCommon.md#inspecting_connections)
Turn-arounds are a frequently observed at the start or end of a route if the respective edge goes in the wrong direction with regard to the general direction of travel.
There are different ways to avoid this:

- specifify trips between junctions using attribute fromJunction/toJunction or using fromXY/toXY (fromLonLat/toLonLat) with option **--mapmatch.junctions**
- specify trips between junctions using attribute fromJunction/toJunction or using fromXY/toXY (fromLonLat/toLonLat) with option **--mapmatch.junctions**
- randomTrips.py provides option ** --junction-taz** for this purpose
- set duarouter option **--remove-loops** which will cut off starting / ending turn-arounds in the route

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Specification/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ vehicles of a type.
<td><p>string</p></td>
<td></td>
<td><p>P_7_7</p></td>
<td><p>the emission class, see <a href="../Models/Emissions.md" title="wikilink">Models/Emissions</a>.</p></td>
<td><p>the emission class, see <a href="../Models/Emissions.md">Models/Emissions</a>.</p></td>
</tr>
<tr class="even">
<td><p>probability</p></td>
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Tools/Drt.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Also [pre-booking](../Simulation/Taxi.md#prebooking) is possible.
| **-f --drf** | float | 1.5 | direct route factor: factor for maximum allowed cost for the route of a request in relation to the minimum possible cost (of the direct route); use '-1' to ignore this constraint |
| **-a --fix-allocation** | bool | false | if true: as soon as a solution was found and a request was assigned to a taxi, this assignment keeps up for all following calculations |
| **-w --waiting-time** | int (seconds) | 900s | maximum waiting time until service after spontaneous booking or the earliest pick-up time; use '-1' for ignoring the waiting time |
| **-p --penalty-factor** | 'dynamic' or int | 'dynamic' | factor for different penalties of constraints in realtion to the routing costs; 'dynamic' prefers holding constraints of already accepted requests, than accepting new requests |
| **-p --penalty-factor** | 'dynamic' or int | 'dynamic' | factor for different penalties of constraints in relation to the routing costs; 'dynamic' prefers holding constraints of already accepted requests, than accepting new requests |

For further help on the command line arguments run:

Expand Down
120 changes: 60 additions & 60 deletions docs/web/docs/Tools/Import/VISSIM.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,13 @@ Routen muss immer 1 ergeben und die Referenzierung auf eine
Routen-Verteilung erfolgt über deren eindeutige ID:

```xml
<routeDistribution id="81_900.0">
<route edges="81 83 210 211 268 117 76 115 213 212 114 265 203 204 263 109 52 188 297 190 296 186 70 298 238 299 124" id="163" probability="0.372751499001"/>
<route edges="81 83 210 211 268 117 76 115 213 212 114 265 203 204 263 109 52 188 297 190 296 186 70 298 238 299 239 72 " id="181" probability="0.125916055963"/>
<route edges="81 83 210 211 268 117 76 115 213 212 114 265 203 204 263 109 52 188 297 190 296 186 181 184" id="187" probability="0.171219187209"/>
<route edges="81 83 215 216 217 272 16" id="193" probability="0.211192538308"/>
<route edges="81 83 210 211 268 13" id="195" probability="0.11892071952"/>
</routeDistribution>
<routeDistribution id="81_900.0">
<route edges="81 83 210 211 268 117 76 115 213 212 114 265 203 204 263 109 52 188 297 190 296 186 70 298 238 299 124" id="163" probability="0.372751499001"/>
<route edges="81 83 210 211 268 117 76 115 213 212 114 265 203 204 263 109 52 188 297 190 296 186 70 298 238 299 239 72 " id="181" probability="0.125916055963"/>
<route edges="81 83 210 211 268 117 76 115 213 212 114 265 203 204 263 109 52 188 297 190 296 186 181 184" id="187" probability="0.171219187209"/>
<route edges="81 83 215 216 217 272 16" id="193" probability="0.211192538308"/>
<route edges="81 83 210 211 268 13" id="195" probability="0.11892071952"/>
</routeDistribution>
```

Des weiteren gehören zur Routendefinition auch Fahzeugtyp-Verteilungen .
Expand Down Expand Up @@ -307,19 +307,19 @@ zu finden sind. Diese definieren die Abfolge der Phasen und die
Referenzierung erfolgt über die jeweilige ID:

```xml
<signalsequences>
<signalsequence id="5" name="Red-Red/Amber-Green-Flashing Green-Amber">
<state display="1" isFixedDuration="false" isClosed="true" defaultDuration="1000" />
<state display="2" isFixedDuration="true" isClosed="true" defaultDuration="1000" />
<state display="3" isFixedDuration="false" isClosed="false" defaultDuration="5000" />
<state display="5" isFixedDuration="true" isClosed="false" defaultDuration="4000" />
<state display="4" isFixedDuration="true" isClosed="true" defaultDuration="3000" />
</signalsequence>
<signalsequence id="12" name="Off-Green">
<state display="7" isFixedDuration="false" isClosed="true" defaultDuration="1000" />
<state display="3" isFixedDuration="false" isClosed="false" defaultDuration="5000" />
</signalsequence>
</signalsequences>
<signalsequences>
<signalsequence id="5" name="Red-Red/Amber-Green-Flashing Green-Amber">
<state display="1" isFixedDuration="false" isClosed="true" defaultDuration="1000" />
<state display="2" isFixedDuration="true" isClosed="true" defaultDuration="1000" />
<state display="3" isFixedDuration="false" isClosed="false" defaultDuration="5000" />
<state display="5" isFixedDuration="true" isClosed="false" defaultDuration="4000" />
<state display="4" isFixedDuration="true" isClosed="true" defaultDuration="3000" />
</signalsequence>
<signalsequence id="12" name="Off-Green">
<state display="7" isFixedDuration="false" isClosed="true" defaultDuration="1000" />
<state display="3" isFixedDuration="false" isClosed="false" defaultDuration="5000" />
</signalsequence>
</signalsequences>
```

Anschließend erfolgt die Definition aller Signalprogramme und deren
Expand All @@ -335,16 +335,16 @@ der zugehörigen Signalsequenz befinden:

```xml
<sg sg_id="1" signal_sequence="5">
<cmds>
<cmd display="3" begin="13000" />
<cmd display="1" begin="46000" />
</cmds>
<fixedstates>
<fixedstate display="2" duration="2000" />
<fixedstate display="5" duration="4000" />
<fixedstate display="4" duration="3000" />
</fixedstates>
</sg>
<cmds>
<cmd display="3" begin="13000" />
<cmd display="1" begin="46000" />
</cmds>
<fixedstates>
<fixedstate display="2" duration="2000" />
<fixedstate display="5" duration="4000" />
<fixedstate display="4" duration="3000" />
</fixedstates>
</sg>
```

## LSA Definition: SUMO
Expand Down Expand Up @@ -372,11 +372,11 @@ aktuellen Zustand eines Fahrstreifens:

```xml
<tlLogic id="69" type="static" programID="Tagesprogramm S 5.3" offset="0.00">
<phase duration="20.00" state="Grrr"/>
<phase duration="20.00" state="yyyy"/>
<phase duration="100.00" state="rGGG"/>
<phase duration="100.00" state="yyyy"/>
</tlLogic>
<phase duration="20.00" state="Grrr"/>
<phase duration="20.00" state="yyyy"/>
<phase duration="100.00" state="rGGG"/>
<phase duration="100.00" state="yyyy"/>
</tlLogic>
```

Welcher `state-Index` zu welchem Fahrstreifen zugeordnet wird, ist in
Expand All @@ -386,10 +386,10 @@ beeinflusst wird, dieser auch zugewiesen werden. Hierfür wird dem
Attribut `tl` die ID der jeweiligen LSA zugeteilt:

```xml
<connection dir="r" from="117" fromLane="0" to="88" toLane="0" via=":69_1_0" tl="69" linkIndex="2" state="o"/>
<connection dir="s" from="117" fromLane="0" to="76" toLane="0" via=":69_2_0" tl="69" linkIndex="3" state="o"/>
<connection dir="s" from="117" fromLane="1" to="76" toLane="1" via=":69_2_1" tl="69" linkIndex="1" state="o"/>
<connection dir="r" from="89" fromLane="0" to="76" toLane="0" via=":69_0_0" tl="69" linkIndex="0" state="o"/>
<connection dir="r" from="117" fromLane="0" to="88" toLane="0" via=":69_1_0" tl="69" linkIndex="2" state="o"/>
<connection dir="s" from="117" fromLane="0" to="76" toLane="0" via=":69_2_0" tl="69" linkIndex="3" state="o"/>
<connection dir="s" from="117" fromLane="1" to="76" toLane="1" via=":69_2_1" tl="69" linkIndex="1" state="o"/>
<connection dir="r" from="89" fromLane="0" to="76" toLane="0" via=":69_0_0" tl="69" linkIndex="0" state="o"/>
```

Auch die *junction*, auf der die Lichtsignalanlage platziert werden
Expand All @@ -400,11 +400,11 @@ gesetzt werden:

```xml
<junction id="69" incLanes="89_0 117_0 117_1" intLanes=":69_0_0 :69_1_0 :69_2_0 :69_2_1" shape="3276.61,1952.22 3277.64,1946.15 3275.74,1944.30 3269.32,1943.27 3265.23,1952.29 3274.96,1953.43" type="traffic_light" x="3273.91" y="1947.87">
<request cont="0" foes="1100" index="0" response="1100"/>
<request cont="0" foes="0000" index="1" response="0000"/>
<request cont="0" foes="0001" index="2" response="0000"/>
<request cont="0" foes="0001" index="3" response="0000"/>
</junction>
<request cont="0" foes="1100" index="0" response="1100"/>
<request cont="0" foes="0000" index="1" response="0000"/>
<request cont="0" foes="0001" index="2" response="0000"/>
<request cont="0" foes="0001" index="3" response="0000"/>
</junction>
```

Zusätzlich ist es möglich in SUMO mehrere Programme für eine LSA zu
Expand All @@ -418,10 +418,10 @@ per Hand oder durch das Kindelement `<wautSwitch>` zu einem angegebenen
Zeitpunkt verändert werden:

```xml
<WAUT refTime="0" id="myWAUT" startProg="weekday_night">
<wautSwitch time="21600" to="weekday_day"/>
<wautSwitch time="79200" to="weekday_night"/>
</WAUT>
<WAUT refTime="0" id="myWAUT" startProg="weekday_night">
<wautSwitch time="21600" to="weekday_day"/>
<wautSwitch time="79200" to="weekday_night"/>
</WAUT>
```

Nähere Beschreibungen zur Definition von Lichtsignalanlagen befinden
Expand Down Expand Up @@ -485,10 +485,10 @@ streckenbezogen. Hierfür wird die Strecke und der Laufmeter für den
Start- und Endpunkt festgelegt:

```xml
<vehicleTravelTimeMeasurement name="Wienerstrasse_Sueden" no="1">
<start link="207" pos="239.836000"/>
<end link="126" pos="12.867000"/>
</vehicleTravelTimeMeasurement>
<vehicleTravelTimeMeasurement name="Wienerstrasse_Sueden" no="1">
<start link="207" pos="239.836000"/>
<end link="126" pos="12.867000"/>
</vehicleTravelTimeMeasurement>
```

## Detektor-Definition SUMO
Expand All @@ -499,8 +499,8 @@ Fahrstreifen und Laufmeter angegeben. Es ist jedoch zusätzlich möglich
das Zeitintervall zu definieren, in dem die Daten aggregiert werden.

```xml
<inductionLoop file="ind_out.xml" period="900" id="1_301.41" lane="108_0" pos="162.554736186"/>
<inductionLoop file="ind_out.xml" period="900" id="33_359.21" lane="123_0" pos="28.1962390136"/>
<inductionLoop file="ind_out.xml" period="900" id="1_301.41" lane="108_0" pos="162.554736186"/>
<inductionLoop file="ind_out.xml" period="900" id="33_359.21" lane="123_0" pos="28.1962390136"/>
```

Wie bei den Induktionsschleifen sind auch die Reisezeitmessungen durch
Expand All @@ -510,12 +510,12 @@ die ganze Strecke beziehen, da definiert wird, welche Fahrstreifen
berücksichtigt werden sollen.

```xml
<entryExitDetector file="time_out.xml" period="900" id="1">
<detEntry lane="207_0" pos="239.753789696"/>
<detEntry lane="207_1" pos="241.370532161"/>
<detExit lane="126_0" pos="23.2884507277"/>
<detExit lane="126_1" pos="23.2873152316"/>
</entryExitDetector>
<entryExitDetector file="time_out.xml" period="900" id="1">
<detEntry lane="207_0" pos="239.753789696"/>
<detEntry lane="207_1" pos="241.370532161"/>
<detExit lane="126_0" pos="23.2884507277"/>
<detExit lane="126_1" pos="23.2873152316"/>
</entryExitDetector>
```

## Umsetzung
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Tools/Misc.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ The resulting bus definition may look like this:
```xml
<routes xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/routes_file.xsd">
<vType id="bus" vClass="bus"/>
<route id="bus_123:0"" edges="110450334#1 110450334#2 338412122 391493949 391493947 391493950#0 391493950#1 391493952#0 391493952#1 391493952#2 391493954#0 391493954#1 391493954#2 391493954#3" >
<route id="bus_123:0" edges="110450334#1 110450334#2 338412122 391493949 391493947 391493950#0 391493950#1 391493952#0 391493952#1 391493952#2 391493954#0 391493954#1 391493954#2 391493954#3">
<stop busStop="stopA" duration="20" until="35.0"/>
<stop busStop="stopB" duration="20" until="101.0"/>
<stop busStop="stopC" duration="20" until="221.0"/>
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Tools/Routes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Only trips that start and end in the sub-scenario network are kept
(this differs from [cutRoutes.py](#cutroutespy) which also keeps routes passing through the
sub-scenario network).

```python
```
python tools/route/cutRoutes.py --trips-output output.rou.xml cut.net.xml orig.rou.xml
```

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Tools/Trip.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ for a fraction disconnected, discarded trips.
Sometimes it is desirable to obtain validated trips rather than routes
(i.e. to make use of [one-shot route
assignment](../Demand/Dynamic_User_Assignment.md#oneshot-assignment).
assignment](../Demand/Dynamic_User_Assignment.md#oneshot-assignment)).
In this case the additional option **--validate** may be used to generate validated
trips (by first generating valid routes and then converting them back
into trips).
Expand Down
Loading

0 comments on commit 89f6f14

Please sign in to comment.