Skip to content

Rename trace file writer and trace file player #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_tracefile_player.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Copy Tracefile FMU
if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
working-directory: sl-5-5-osi-trace-file-player/build
run: cp OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu
run: cp sl-5-5-osi-trace-file-player.fmu /tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu

- name: Commit ID
working-directory: /tmp/tracefile_player_fmu
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_tracefile_writer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Copy Tracefile Writer FMU
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
working-directory: sl-5-6-osi-trace-file-writer/build
run: cp osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu
run: cp sl-5-6-osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu

- name: Commit ID
working-directory: /tmp/tracefile_writer_fmu
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ If you find our work useful in your research, please consider citing:
This work received funding from the research project
"[SET Level](https://setlevel.de/)" of the [PEGASUS](https://pegasus-family.de) project family, promoted by the
German Federal Ministry for Economic Affairs and Energy based on a decision of the German Bundestag.

| SET Level | PEGASUS Family | BMWi |
|----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| <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> |
Expand Down
16 changes: 8 additions & 8 deletions test/behavior/001_regression_test_7/SystemStructure.ssd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
<ssd:Elements>
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Connectors>
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
<ssc:Integer/>
Expand Down Expand Up @@ -79,7 +79,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
</ssd:Component>
<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">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
<ssd:Connectors>
<ssd:Connector name="OSIIn.size" kind="input">
<ssc:Integer/>
Expand Down Expand Up @@ -120,12 +120,12 @@
</ssd:Component>
</ssd:Elements>
<ssd:Connections>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
</ssd:Connections>
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
</ssd:System>
Expand Down
16 changes: 8 additions & 8 deletions test/behavior/002_object_in_fov/SystemStructure.ssd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
<ssd:Elements>
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Connectors>
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
<ssc:Integer/>
Expand Down Expand Up @@ -83,7 +83,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
</ssd:Component>
<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">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
<ssd:Connectors>
<ssd:Connector name="OSIIn.size" kind="input">
<ssc:Integer/>
Expand Down Expand Up @@ -124,12 +124,12 @@
</ssd:Component>
</ssd:Elements>
<ssd:Connections>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
</ssd:Connections>
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
</ssd:System>
Expand Down
16 changes: 8 additions & 8 deletions test/behavior/003_object_outside_fov/SystemStructure.ssd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
<ssd:Elements>
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Connectors>
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
<ssc:Integer/>
Expand Down Expand Up @@ -83,7 +83,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
</ssd:Component>
<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">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
<ssd:Connectors>
<ssd:Connector name="OSIIn.size" kind="input">
<ssc:Integer/>
Expand Down Expand Up @@ -124,12 +124,12 @@
</ssd:Component>
</ssd:Elements>
<ssd:Connections>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
</ssd:Connections>
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
</ssd:System>
Expand Down
16 changes: 8 additions & 8 deletions test/behavior/004_occlusion_lidar/SystemStructure.ssd
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
<ssd:Elements>
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
<ssd:Connectors>
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
<ssc:Integer/>
Expand Down Expand Up @@ -83,7 +83,7 @@
</ssd:ParameterBinding>
</ssd:ParameterBindings>
</ssd:Component>
<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">
<ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
<ssd:Connectors>
<ssd:Connector name="OSIIn.size" kind="input">
<ssc:Integer/>
Expand Down Expand Up @@ -124,12 +124,12 @@
</ssd:Component>
</ssd:Elements>
<ssd:Connections>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
<ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
</ssd:Connections>
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
</ssd:System>
Expand Down
Loading