Skip to content

Commit 414ffeb

Browse files
ClemensLinnhoffClemensLinnhoff
authored
Fix trace file player and trace file writer in pipeline (#27)
* Fix trace file player and trace file writer in pipeline Signed-off-by: ClemensLinnhoff <Clemens.Linnhoff@partner.bmw.de> --------- Signed-off-by: ClemensLinnhoff <Clemens.Linnhoff@partner.bmw.de>
1 parent aef182b commit 414ffeb

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

‎.github/workflows/build_tracefile_player.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
- name: Copy Tracefile FMU
7171
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
7272
working-directory: sl-5-5-osi-trace-file-player/build
73-
run: cp src/OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu
73+
run: cp OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu
7474

7575
- name: Commit ID
7676
working-directory: /tmp/tracefile_player_fmu

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Credibility Assessment](../../actions/workflows/credibility_assessment.yml/badge.svg)](https://github.com/openMSL/sl-1-0-sensor-model-repository-template/actions/workflows/test_pipeline.yml)
44

5-
<img align="right" src="https://gitlab.com/tuda-fzd/perception-sensor-modeling/object-based-generic-perception-object-model/uploads/17c84e9ec0acf0fac2e35855f038ad0b/fzdlogo.jpg" width="100" />
5+
<img align="right" src="https://gitlab.com/tuda-fzd/perception-sensor-modeling/object-based-generic-perception-object-model/uploads/17c84e9ec0acf0fac2e35855f038ad0b/fzdlogo.jpg" alt="FZD" width="100" />
66

77
This model is a highly parameterizable generic perception sensor and tracking model.
88
It can be parameterized as a Lidar or a Radar.
@@ -11,7 +11,7 @@ It includes typical sensor artifacts like soft FoV transitions, different detect
1111
occlusion effects depending on the sensor technology as well as simulation of tracking behavior.
1212
The model output are object lists for OSI SenorData moving objects.
1313

14-
<img src="doc/img/model_video.gif" width="800" />
14+
<img src="doc/img/model_video.gif" alt="Sensor Demo" width="800" />
1515

1616
The architecture of the model as well as the parameterization structure are designed to be as generic as possible
1717
to fit both radar and lidar sensors to utilize similarities in signal propagation and signal processing in both technologies.
@@ -32,7 +32,7 @@ This is where the magic happens.
3232
The `apply()` function of the strategy is called by the `do_calc()` function of the Framework.
3333
The strategy itself is structured into four modules as shown in the image below.
3434

35-
<img src="doc/img/model_overview.png" width="300" />
35+
<img src="doc/img/model_overview.png" alt="Model Overview" width="300" />
3636

3737
### Sensor Technology Independent Modeling
3838

@@ -77,7 +77,7 @@ The mentioned refined bounding boxes reflect typical vehicle shapes instead of s
7777
The figure below shows different examples of refined bounding boxes as a side-view. They can be further adapted by adding more vertices to enhance their fidelity,
7878
e.g. for the pillar positions, wheels, etc.
7979

80-
<img src="doc/img/refined_bounding_boxes.png" width="300" />
80+
<img src="doc/img/refined_bounding_boxes.png" alt="Refined Bounding Boxes" width="300" />
8181

8282
The bounding box shapes are selected depending on the ground truth object class and adjusted to the object's dimensions.
8383
Consequently, this approach reveals a gap in the OSI definition of vehicle classes.
@@ -340,7 +340,7 @@ This work received funding from the research project
340340
German Federal Ministry for Economic Affairs and Energy based on a decision of the German Bundestag.
341341
| SET Level | PEGASUS Family | BMWi |
342342
|----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
343-
| <a href="https://setlevel.de"><img src="https://setlevel.de/assets/logo-setlevel.svg" width="100" /></a> | <a href="https://pegasus-family.de"><img src="https://setlevel.de/assets/logo-pegasus-family.svg" width="100" /></a> | <a href="https://www.bmwi.de/Redaktion/DE/Textsammlungen/Technologie/fahrzeug-und-systemtechnologien.html"><img src="https://setlevel.de/assets/logo-bmwi-en.svg" width="100" /></a> |
343+
| <a href="https://setlevel.de"><img src="https://setlevel.de/assets/logo-setlevel.svg" alt="SETLevel" width="100" /></a> | <a href="https://pegasus-family.de"><img src="https://setlevel.de/assets/logo-pegasus-family.svg" alt="Pegasus" width="100" /></a> | <a href="https://www.bmwi.de/Redaktion/DE/Textsammlungen/Technologie/fahrzeug-und-systemtechnologien.html"><img src="https://setlevel.de/assets/logo-bmwi-en.svg" alt="BMWi" width="100" /></a> |
344344

345345
We would like to thank Yifei Jiao for his contribution to the first prototype.
346346

‎doc/build-instructions/install_protobuf_Win64_VS2017.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
3. Open protobuf.sln located in build-dir from above with **Visual Studio 2017**
2828
4. Change Properties->C/C++->Code Generation of **all** solutions for Configuration *Release* AND *Debug*<br>
2929
- Runtime Library for *Release* must be set to "Multi-threaded DLL (/MD)":<br>
30-
<img src="https://gitlab.com/tuda-fzd/perception-sensor-modeling/reflection-based-lidar-object-model/uploads/38c646d7442362bbbbce936d67a26836/ASM_protobuf_runtime_library_release.png" width="800"><br><br>
30+
<img src="https://gitlab.com/tuda-fzd/perception-sensor-modeling/reflection-based-lidar-object-model/uploads/38c646d7442362bbbbce936d67a26836/ASM_protobuf_runtime_library_release.png" alt="Release" width="800"><br><br>
3131
- Runtime Library for *Debug* must be set to "Multi-threaded Debug DLL (/MDd)":<br>
32-
<img src="https://gitlab.com/tuda-fzd/perception-sensor-modeling/reflection-based-lidar-object-model/uploads/be2f9e3f0cda9da9bb4686805379b37e/ASM_protobuf_runtime_library_debug.png" width="800">
32+
<img src="https://gitlab.com/tuda-fzd/perception-sensor-modeling/reflection-based-lidar-object-model/uploads/be2f9e3f0cda9da9bb4686805379b37e/ASM_protobuf_runtime_library_debug.png" alt="Debug" width="800">
3333
5. Build Solution for *Release* AND for *Debug*
3434
6. Build INSTALL for *Release* AND for *Debug*

‎test/integration/003_regression_test_7/SystemStructure.ssd

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@
8181
</ssd:Component>
8282
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu" implementation="CoSimulation" name="osi-trace-file-writer" description="Write binary OSI SensorData trace files">
8383
<ssd:Connectors>
84-
<ssd:Connector name="OSMPSensorDataIn.size" kind="input">
84+
<ssd:Connector name="OSIIn.size" kind="input">
8585
<ssc:Integer/>
8686
<ssd:ConnectorGeometry x="0.0" y="0.25"/>
8787
</ssd:Connector>
88-
<ssd:Connector name="OSMPSensorDataIn.base.hi" kind="input">
88+
<ssd:Connector name="OSIIn.base.hi" kind="input">
8989
<ssc:Integer/>
9090
<ssd:ConnectorGeometry x="0.0" y="0.5"/>
9191
</ssd:Connector>
92-
<ssd:Connector name="OSMPSensorDataIn.base.lo" kind="input">
92+
<ssd:Connector name="OSIIn.base.lo" kind="input">
9393
<ssc:Integer/>
9494
<ssd:ConnectorGeometry x="0.0" y="0.75"/>
9595
</ssd:Connector>
@@ -109,6 +109,9 @@
109109
<ssv:Parameter name="custom_name" description="">
110110
<ssv:String value="003_regression_test_7"/>
111111
</ssv:Parameter>
112+
<ssv:Parameter name="type" description="">
113+
<ssv:String value="sd"/>
114+
</ssv:Parameter>
112115
</ssv:Parameters>
113116
</ssv:ParameterSet>
114117
</ssd:ParameterValues>
@@ -120,9 +123,9 @@
120123
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
121124
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
122125
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
123-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSMPSensorDataIn.base.hi" suppressUnitConversion="false"/>
124-
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSMPSensorDataIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
125-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSMPSensorDataIn.size" suppressUnitConversion="false"/>
126+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
127+
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
128+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
126129
</ssd:Connections>
127130
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
128131
</ssd:System>

0 commit comments

Comments
 (0)