Skip to content

Commit

Permalink
fixing links #2
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Jan 6, 2024
1 parent c6fba76 commit 1ab0442
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 34 deletions.
2 changes: 1 addition & 1 deletion docs/web/docs/Contributed/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ The following extensions are managed and supported by other parties.

connects SUMO to ns-3

- [TraNS](https://trans.epfl.ch/)
- [TraNS](https://web.archive.org/web/20190512111856/http://lca.epfl.ch/projects/trans/)

connects SUMO to ns-2

Expand Down
6 changes: 3 additions & 3 deletions docs/web/docs/Developer/Network_Building_Process.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,9 @@ following three cases must be distinguished:

| | |
| ----------------------------------------------- | ---------------------------------------------------- |
| ![<File:laneShapeIntersectsWithNodeShape.png>](../images/LaneShapeIntersectsWithNodeShape.png "File:laneShapeIntersectsWithNodeShape.png") | The edge shape intersects with the node shape. Then, the shape is trimmed to the intersection point. This looks quite reasonable. |
| ![<File:laneShapeOutsideOfNodeShape.png>](../images/LaneShapeOutsideOfNodeShape.png "File:laneShapeOutsideOfNodeShape.png") | The edge shape is outside the node shape. The the present algorithm extrapolates the last line of the edge shape and enlarges the edge to the new intersection point. This looks reasonable to me as well. |
| ![<File:laneShapeInsideOfNodeShape.png>](../images/LaneShapeInsideOfNodeShape.png "File:laneShapeInsideOfNodeShape.png") | The edge shape is completely within the node shape. What should happen here? (The red dots show, what netconvert does at present.) |
| ![laneShapeIntersectsWithNodeShape.png](../images/LaneShapeIntersectsWithNodeShape.png) | The edge shape intersects with the node shape. Then, the shape is trimmed to the intersection point. This looks quite reasonable. |
| ![laneShapeOutsideOfNodeShape.png](../images/LaneShapeOutsideOfNodeShape.png) | The edge shape is outside the node shape. The the present algorithm extrapolates the last line of the edge shape and enlarges the edge to the new intersection point. This looks reasonable to me as well. |
| ![laneShapeInsideOfNodeShape.png](../images/LaneShapeInsideOfNodeShape.png) | The edge shape is completely within the node shape. What should happen here? (The red dots show, what netconvert does at present.) |

So I am wondering, what the right behavior of netconvert would be in
the third case.
Expand Down
4 changes: 2 additions & 2 deletions docs/web/docs/Models/Emissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ available.
<a href="https://verkehrsforschung.dlr.de/en/projects/colombo">"COLOMBO"</a>, co-funded by the European Commission within the <a href="https://wayback.archive-it.org/12090/20191127213419/https:/ec.europa.eu/research/fp7/index_en.cfm">Seventh Framework Programme</a>.</span></div>

<div style="border:1px solid #909090; min-height: 35px;" align="right">
<span style="float: right; margin-top: -5px;"><a href="https://wayback.archive-it.org/12090/20191127213419/https:/ec.europa.eu/research/fp7/index_en.cfm"><img src="../../images/FP7-small.gif" alt="Seventh Framework Programme"></a>
<a href="https://amitran.eu/"><img src="../../images/AMITRAN-small.png" alt="AMITRAN project"></a></span>
<span style="float: right; margin-top: -5px;"><a href="https://wayback.archive-it.org/12090/20191127213419/https:/ec.europa.eu/research/fp7/index_en.cfm"><img src="../images/FP7-small.gif" alt="Seventh Framework Programme"></a>
<a href="https://amitran.eu/"><img src="../images/AMITRAN-small.png" alt="AMITRAN project"></a></span>
<span style="">This part of SUMO was developed, reworked, or extended within the project
<a href="https://amitran.eu/">"AMITRAN"</a>, co-funded by the European Commission within the <a href="https://wayback.archive-it.org/12090/20191127213419/https:/ec.europa.eu/research/fp7/index_en.cfm">Seventh Framework Programme</a>.</span></div>
6 changes: 3 additions & 3 deletions docs/web/docs/Other/Projects.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ title: Projects
University, Germany
- [TraNS - Traffic and Network Simulation environment for design, implementation
and realistic evaluation of VANET
applications](https://trans.epfl.ch)
applications](https://web.archive.org/web/20190512111856/http://lca.epfl.ch/projects/trans/)
by Michal Piorkowski, Maxim Raya, Ada Lezama Lugo and Jean-Pierre
Hubaux from [Laboratory for Computer Communications and Applications
(LCA)](https://lcawww.epfl.ch), [EPFL](https://www.epfl.ch),
Hubaux from Laboratory for Computer Communications and Applications
(LCA), [EPFL](https://www.epfl.ch),
Switzerland
TraNS is the first open-source project providing a full-blown
application-centric evaluation framework for VANETs. It has a unique
Expand Down
8 changes: 4 additions & 4 deletions docs/web/docs/SUMO_at_a_Glance.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ integrated approach by now.
</tr>
<tr class="even">
<td><p>Jakob Erdmann</p></td>
<td><p>network import, <a href="netedit/index.html">netedit</a></p></td>
<td><p>network import, <a href="netedit.md">netedit</a></p></td>
</tr>
<tr class="odd">
<td></td>
Expand Down Expand Up @@ -249,11 +249,11 @@ integrated approach by now.
<img src="images/Tum-logo.png" title="tum-logo.png" alt="" />
</figure></td>
<td><p>Piotr Woznica</p></td>
<td><p><a href="activitygen.html">activitygen</a></p></td>
<td><p><a href="activitygen.md">activitygen</a></p></td>
</tr>
<tr class="even">
<td><p>Walter Bamberger</p></td>
<td><p>Development of <a href="activitygen.html">activitygen</a> as a base for the evaluation of trust scenarios in VANETs. The work is part of the project <a href="https://www.ldv.ei.tum.de/fidens/">Fidens: Trust between Cooperative Systems</a> featuring trusted probabilistic knowledge processing in vehicular networks.</p></td>
<td><p>Development of <a href="activitygen.md">activitygen</a> as a base for the evaluation of trust scenarios in VANETs. The work is part of the project <a href="https://www.ldv.ei.tum.de/fidens/">Fidens: Trust between Cooperative Systems</a> featuring trusted probabilistic knowledge processing in vehicular networks.</p></td>
</tr>
<tr class="odd">
<td><p>Matthew Fullerton</p></td>
Expand All @@ -274,7 +274,7 @@ integrated approach by now.
<tr class="even">
<td></td>
<td><p>Leontios Papaleontiou</p></td>
<td><p><a href="Contributed/SUMO_Traffic_Modeler.html">Contributed/SUMO Traffic Modeler</a></p></td>
<td><p><a href="Contributed/SUMO_Traffic_Modeler.md">Contributed/SUMO Traffic Modeler</a></p></td>
</tr>
<tr class="odd">
<td><figure>
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Screenshots/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ title: Screenshots
## From 'TraNS'

[<font color="#0174DF">Tra</font><font color="#FF0000">NS</font>
website](https://trans.epfl.ch/)
website](https://web.archive.org/web/20190512111856/http://lca.epfl.ch/projects/trans/)

![](../images/Trans.gif)Main TraNS v1.2 screen

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Simulation/Emergency.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ The visualization of emergency vehicles is supported in
white vehicle with the international sign for first aid is drawn.
Alternatively, a police car or a fire brigade will be drawn when setting the vType-attribute `guiShape="police"` or `guiShape="firebrigade"`, respectively. Furthermore, a blue flashing light will be visible on the vehicle when setting the vType-attribute `vClass="emergency"`.

![<File:Ev.png>](../images/Ev.png "File:Ev.png")
![Ev.png](../images/Ev.png)

# References

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Simulation/Output/VTKOutput.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ as a timeseries in ParaView and can be imported very easily.
The generated VTK files also contains the speed for each vehicle which
can be rendered for every timestep.

![<File:Vtk_example.png>](../../images/Vtk_example.png "Vtk_example.png")
![Vtk_example.png](../../images/Vtk_example.png)

To get a more realistic output it's possible to load a 3D model of each
vehicle instead of the basic point. In order to do that you have to
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Simulation/Randomness.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ and [jtrrouter](../jtrrouter.md) applications support the option **--randomize-f
When this option is used, each vehicle defined by a `<flow>`-element will be
given a random departure time which is equidistributed within the time
interval of the flow. (By default vehicles of a flow are spaced equally
in time). The departure times computed this way also achieve a [Poisson process](Poisson_point_process#Simulation)
in time). The departure times computed this way also achieve a [Poisson process](#poisson_process)

# Departure and arrival attributes

Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Specification/index.md
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.html" title="wikilink">Models/Emissions</a>.</p></td>
<td><p>the emission class, see <a href="../Models/Emissions.md" title="wikilink">Models/Emissions</a>.</p></td>
</tr>
<tr class="even">
<td><p>probability</p></td>
Expand Down
10 changes: 5 additions & 5 deletions docs/web/docs/Tools/Visualization.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Call `python tools/visualization/plotXMLAttributes.py -i id -x depart -y departD

### Time to collision over simulation time

The plot is created from the output file of a SUMO simulation for which a global [SSM device](https://sumo.dlr.de/docs/Simulation/Output/SSM_Device.html) has been added. For this example, starting from the [Bologna "acosta" scenario](https://github.com/DLR-TS/sumo-scenarios/tree/main/bologna/acosta), the SUMO configuration file had been modified in order to compute time to collision:
The plot is created from the output file of a SUMO simulation for which a global [SSM device](../Simulation/Output/SSM_Device.md) has been added. For this example, starting from the [Bologna "acosta" scenario](https://github.com/DLR-TS/sumo-scenarios/tree/main/bologna/acosta), the SUMO configuration file had been modified in order to compute time to collision:
```xml
<configuration xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://sumo.dlr.de/xsd/sumoConfiguration.xsd">

Expand Down Expand Up @@ -586,7 +586,7 @@ visualised as a time line along the simulation time.
<code> --xticks 0,86401,14400,14 --xtime1 --ygrid \</code><br />
<code> --ylabel "running vehicles [#]" --xlabel "time" \</code><br />
<code> --title "running vehicles over time" --adjust .14,.1 </code></p>
<p>The example shows the numbers of vehicles running in a large-scale scenario of the city of Brunswick over the day for the standard week day classes. "mo.xml", "dido.xml", "fr.xml", "sa.xml", and "so.xml" are <a href="../Simulation/Output/Summary.html" title="wikilink">summary-files</a> resulting from simulations of the weekday-types Monday, Tuesday-Thursday, Friday, Saturday, and Sunday, respectively.</p></td>
<p>The example shows the numbers of vehicles running in a large-scale scenario of the city of Brunswick over the day for the standard week day classes. "mo.xml", "dido.xml", "fr.xml", "sa.xml", and "so.xml" are <a href="../Simulation/Output/Summary.md" title="wikilink">summary-files</a> resulting from simulations of the weekday-types Monday, Tuesday-Thursday, Friday, Saturday, and Sunday, respectively.</p></td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -623,7 +623,7 @@ the measure (vehicles) that fall into a bin.
<code> --title "duration distribution" \</code><br />
<code> --yticks 14 --xlabelsize 14 --ylabelsize 14 --titlesize 16 \</code><br />
<code> -l mon,tue-thu,fri,sat,sun --adjust .14,.1 --xlim 0,3600</code></p>
<p>The example shows the travel time distribution for the vehicles of different week day classes (Braunschweig scenario). "mo.xml", "dido.xml", "fr.xml", "sa.xml", and "so.xml" are <a href="../Simulation/Output/TripInfo.html" title="wikilink">tripinfo-files</a> resulting from simulations of the weekday-types Monday, Tuesday-Thursday, Friday, Saturday, and Sunday, respectively.</p></td>
<p>The example shows the travel time distribution for the vehicles of different week day classes (Braunschweig scenario). "mo.xml", "dido.xml", "fr.xml", "sa.xml", and "so.xml" are <a href="../Simulation/Output/TripInfo.md" title="wikilink">tripinfo-files</a> resulting from simulations of the weekday-types Monday, Tuesday-Thursday, Friday, Saturday, and Sunday, respectively.</p></td>
</tr>
<tr class="even">
<td><figure>
Expand Down Expand Up @@ -667,7 +667,7 @@ using the **--columns** {{DT_INT}}\[,{{DT_INT}}\]\* option. The values are visua
<code> --xticks 14 --yticks 14 --colors k --ylim 0,125 \</code><br />
<code> --output nefz.png \</code><br />
<code> --title "New European Driving Cycle (NEDC)" --titlesize 16</code></p>
<p>The example shows the <a href="../Tools/Emissions.html#driving_cycles" title="wikilink">New European Driving Cycle (NEDC)</a>.</p></td>
<p>The example shows the <a href="Emissions.md#driving_cycles" title="wikilink">New European Driving Cycle (NEDC)</a>.</p></td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -749,7 +749,7 @@ name/value-pairs are visualised as a bar chart.
## macrOutput.py

This tool will plot EdgeData output as fundamental diagram graphs (volume-density, speed-density and volume-speed relations, each edge and lane-based).
This requires the EdgeData input file to have interval data with **sampledSeconds**, **density**, **laneDensity** and **speed** attributes. The tool supports the
This requires the EdgeData input file to have interval data with **sampledSeconds**, **density**, **laneDensity** and **speed** attributes. The tool supports the
[common options](#common_options). The output is interpreted as a directory rather than a file, though. The output file names are given as:

- Edge_vk.png (speed-density relation)
Expand Down
4 changes: 2 additions & 2 deletions docs/web/docs/Tools/Xml.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ python tools/xml/protobuf2xml.py -x schema.xsd input.protomsg
The options have the same meaning as above.

<div style="border:1px solid #909090; min-height: 35px;" align="right">
<span style="float: right; margin-top: -5px;"><a href="https://wayback.archive-it.org/12090/20191127213419/https:/ec.europa.eu/research/fp7/index_en.cfm"><img src="../../images/FP7-small.gif" alt="Seventh Framework Programme"></a>
<a href="https://amitran.eu/"><img src="../../images/AMITRAN-small.png" alt="AMITRAN project"></a></span>
<span style="float: right; margin-top: -5px;"><a href="https://wayback.archive-it.org/12090/20191127213419/https:/ec.europa.eu/research/fp7/index_en.cfm"><img src="../images/FP7-small.gif" alt="Seventh Framework Programme"></a>
<a href="https://amitran.eu/"><img src="../images/AMITRAN-small.png" alt="AMITRAN project"></a></span>
<span style="">This part of SUMO was developed, reworked, or extended within the project
<a href="https://amitran.eu/">"AMITRAN"</a>, co-funded by the European Commission within the <a href="https://wayback.archive-it.org/12090/20191127213419/https:/ec.europa.eu/research/fp7/index_en.cfm">Seventh Framework Programme</a>.</span></div>

Expand Down
4 changes: 2 additions & 2 deletions docs/web/docs/Topics/Environmental_Issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ The noise model is based on HARMONOISE.
<td class="tg-amwm">fuel</td>
</tr>
<tr>
<td class="tg-0lax"><a href="../Models/Emissions/HBEFA-based.html">HBEFA v2.1-based</a></td>
<td class="tg-0lax"><a href="../Models/Emissions/HBEFA-based.md">HBEFA v2.1-based</a></td>
<td class="tg-baqh">x</td>
<td class="tg-baqh">x</td>
<td class="tg-baqh">x</td>
Expand All @@ -100,7 +100,7 @@ The noise model is based on HARMONOISE.
<td class="tg-baqh">x</td>
</tr>
<tr>
<td class="tg-0lax"><a href="../Models/Emissions/PHEMlight.html">PHEMlight</a></td>
<td class="tg-0lax"><a href="../Models/Emissions/PHEMlight.md">PHEMlight</a></td>
<td class="tg-baqh">x</td>
<td class="tg-baqh">x</td>
<td class="tg-baqh">x</td>
Expand Down
10 changes: 5 additions & 5 deletions docs/web/docs/Tutorials/Calibration/Berlin.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ loops, that supply vehicle data classified into 5+1 vehicle types
according to TLS\[2\]. An Overview about the test track and the position
of the induction loops is given in Fig. 1.

![Berlin.png](../../images/Berlin.png "Berlin.png")
![Berlin.png](../../images/Berlin.png)

## Modelling within the SUMO-Package

Expand Down Expand Up @@ -67,13 +67,13 @@ within the simulation net as in reality. To assess if the congestion within the
shows the speed at the observation points, aggregated to intervals of
one minute.

![<File:Results1.jpg>](../../images/Results1.jpg "File:Results1.jpg")
![<File:Results2.jpg>](../../images/Results2.jpg "File:Results2.jpg")
![Results1.jpg](../../images/Results1.jpg)
![Results2.jpg](../../images/Results2.jpg)

Fig. 2: Speeds measured at observation points MQ 22 and MQ 32

![<File:Results3.jpg>](../../images/Results3.jpg "File:Results3.jpg")
![<File:Results4.jpg>](../../images/Results4.jpg "File:Results4.jpg")
![Results3.jpg](../../images/Results3.jpg)
![Results4.jpg](../../images/Results4.jpg)

Fig. 3: Difference between measured and simulated speeds at observation
points MQ 22 and MQ 32
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ all pedestrian lights) were also verified. See also
</tr>
<tr class="even">
<td><p>Source</p></td>
<td><p><a href="../../Tutorials/OSMActivityGen/eichstaett.osm.html" title="wikilink">Tutorials/OSMActivityGen/eichstaett.osm</a> by W. Bamberger.<br />
<td><p><a href="../../Tutorials/OSMActivityGen/eichstaett.osm.md" title="wikilink">Tutorials/OSMActivityGen/eichstaett.osm</a> by W. Bamberger.<br />
Map data © <a href="https://www.openstreetmap.org/">OpenStreetMap contributors</a>, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a></p></td>
</tr>
<tr class="odd">
Expand Down
2 changes: 1 addition & 1 deletion docs/web/docs/Vehicle_Type_Parameter_Defaults.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ vehicle types).
<th class="tg-dr3j">v<sub>max</sub> maxSpeed</th>
<th class="tg-dr3j">v<sub>desMax</sub> desiredMaxSpeed</th>
<th class="tg-dr3j">seats</th>
<th class="tg-dr3j"><a href="Models/Emissions/HBEFA3-based.html">emissionClass (HBEFA3)</a></th>
<th class="tg-dr3j"><a href="Models/Emissions/HBEFA3-based.md">emissionClass (HBEFA3)</a></th>
<th class="tg-dr3j">speed deviation</th>
</tr>
<tr>
Expand Down
3 changes: 3 additions & 0 deletions docs/web/lychee.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Maximum number of allowed redirects.
max_redirects = 20

# User agent to send with each request.
user_agent = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:93.0) Gecko/20100101 Firefox/93.0"

# Proceed for server connections considered insecure (invalid TLS).
insecure = true

Expand Down

0 comments on commit 1ab0442

Please sign in to comment.