Skip to content

Commit b452a3f

Browse files
ClemensLinnhoffClemensLinnhoff
committed
Rename trace file writer and trace file player
Signed-off-by: ClemensLinnhoff <[email protected]>
1 parent 8daf9cf commit b452a3f

File tree

9 files changed

+56
-56
lines changed

9 files changed

+56
-56
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 OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu
73+
run: cp sl-5-5-osi-trace-file-player.fmu /tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu
7474

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

‎.github/workflows/build_tracefile_writer.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ jobs:
3838

3939
- name: Get Tracefile Player
4040
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
41-
run: git clone https://github.com/openMSL/sl-5-6-osi-trace-file-writer.git
41+
run: git clone https://github.com/openMSL/sl-5-6-sl-5-6-osi-trace-file-writer.git
4242

4343
- name: Prepare C++ Build
4444
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
45-
working-directory: sl-5-6-osi-trace-file-writer
45+
working-directory: sl-5-6-sl-5-6-osi-trace-file-writer
4646
run: git submodule update --init && mkdir build
4747

4848
- name: Configure CMake
4949
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
50-
working-directory: sl-5-6-osi-trace-file-writer/build
50+
working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build
5151
run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
5252

5353
- name: Build C++
5454
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
55-
working-directory: sl-5-6-osi-trace-file-writer/build
55+
working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build
5656
run: cmake --build .
5757

5858
- name: Create FMU Directory
@@ -61,15 +61,15 @@ jobs:
6161

6262
- name: Copy Commit ID to Cache
6363
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
64-
working-directory: sl-5-6-osi-trace-file-writer
64+
working-directory: sl-5-6-sl-5-6-osi-trace-file-writer
6565
run: |
6666
git rev-parse --short HEAD > commit-id.txt
6767
cp commit-id.txt /tmp/tracefile_writer_fmu/commit-id.txt
6868
6969
- name: Copy Tracefile Writer FMU
7070
if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
71-
working-directory: sl-5-6-osi-trace-file-writer/build
72-
run: cp osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu
71+
working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build
72+
run: cp sl-5-6-osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu
7373

7474
- name: Commit ID
7575
working-directory: /tmp/tracefile_writer_fmu

‎test/behavior/001_regression_test_7/SystemStructure.ssd

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ssd:ParameterBinding>
1212
</ssd:ParameterBindings>
1313
<ssd:Elements>
14-
<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">
14+
<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">
1515
<ssd:Connectors>
1616
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
1717
<ssc:Integer/>
@@ -79,7 +79,7 @@
7979
</ssd:ParameterBinding>
8080
</ssd:ParameterBindings>
8181
</ssd:Component>
82-
<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">
82+
<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">
8383
<ssd:Connectors>
8484
<ssd:Connector name="OSIIn.size" kind="input">
8585
<ssc:Integer/>
@@ -120,12 +120,12 @@
120120
</ssd:Component>
121121
</ssd:Elements>
122122
<ssd:Connections>
123-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
124-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
125-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" 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"/>
123+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
124+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
125+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
126+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
127+
<ssd:Connection startElement="sl-5-6-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="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
129129
</ssd:Connections>
130130
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
131131
</ssd:System>

‎test/behavior/002_object_in_fov/SystemStructure.ssd

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ssd:ParameterBinding>
1212
</ssd:ParameterBindings>
1313
<ssd:Elements>
14-
<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">
14+
<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">
1515
<ssd:Connectors>
1616
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
1717
<ssc:Integer/>
@@ -83,7 +83,7 @@
8383
</ssd:ParameterBinding>
8484
</ssd:ParameterBindings>
8585
</ssd:Component>
86-
<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">
86+
<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">
8787
<ssd:Connectors>
8888
<ssd:Connector name="OSIIn.size" kind="input">
8989
<ssc:Integer/>
@@ -124,12 +124,12 @@
124124
</ssd:Component>
125125
</ssd:Elements>
126126
<ssd:Connections>
127-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
128-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
129-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
130-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
131-
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
132-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
127+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
128+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
129+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
130+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
131+
<ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
132+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
133133
</ssd:Connections>
134134
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
135135
</ssd:System>

‎test/behavior/003_object_outside_fov/SystemStructure.ssd

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ssd:ParameterBinding>
1212
</ssd:ParameterBindings>
1313
<ssd:Elements>
14-
<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">
14+
<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">
1515
<ssd:Connectors>
1616
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
1717
<ssc:Integer/>
@@ -83,7 +83,7 @@
8383
</ssd:ParameterBinding>
8484
</ssd:ParameterBindings>
8585
</ssd:Component>
86-
<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">
86+
<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">
8787
<ssd:Connectors>
8888
<ssd:Connector name="OSIIn.size" kind="input">
8989
<ssc:Integer/>
@@ -124,12 +124,12 @@
124124
</ssd:Component>
125125
</ssd:Elements>
126126
<ssd:Connections>
127-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
128-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
129-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
130-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
131-
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
132-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
127+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
128+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
129+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
130+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
131+
<ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
132+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
133133
</ssd:Connections>
134134
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
135135
</ssd:System>

‎test/behavior/004_occlusion_lidar/SystemStructure.ssd

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ssd:ParameterBinding>
1212
</ssd:ParameterBindings>
1313
<ssd:Elements>
14-
<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">
14+
<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">
1515
<ssd:Connectors>
1616
<ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
1717
<ssc:Integer/>
@@ -83,7 +83,7 @@
8383
</ssd:ParameterBinding>
8484
</ssd:ParameterBindings>
8585
</ssd:Component>
86-
<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">
86+
<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">
8787
<ssd:Connectors>
8888
<ssd:Connector name="OSIIn.size" kind="input">
8989
<ssc:Integer/>
@@ -124,12 +124,12 @@
124124
</ssd:Component>
125125
</ssd:Elements>
126126
<ssd:Connections>
127-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
128-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
129-
<ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
130-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
131-
<ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
132-
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
127+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
128+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
129+
<ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
130+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
131+
<ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
132+
<ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
133133
</ssd:Connections>
134134
<ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
135135
</ssd:System>

0 commit comments

Comments
 (0)