From b452a3f600f8a8cf8bf779a14acb36ba6235b3fa Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 30 Sep 2024 17:33:58 +0200 Subject: [PATCH 1/3] Rename trace file writer and trace file player Signed-off-by: ClemensLinnhoff --- .github/workflows/build_tracefile_player.yml | 2 +- .github/workflows/build_tracefile_writer.yml | 14 +++++++------- .../001_regression_test_7/SystemStructure.ssd | 16 ++++++++-------- .../002_object_in_fov/SystemStructure.ssd | 16 ++++++++-------- .../003_object_outside_fov/SystemStructure.ssd | 16 ++++++++-------- .../004_occlusion_lidar/SystemStructure.ssd | 16 ++++++++-------- .../005_occlusion_radar/SystemStructure.ssd | 16 ++++++++-------- .../001_smoke_test/SystemStructure.ssd | 8 ++++---- .../002_output_osi_fields/SystemStructure.ssd | 8 ++++---- 9 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/workflows/build_tracefile_player.yml b/.github/workflows/build_tracefile_player.yml index ad34aac..80fcbf4 100644 --- a/.github/workflows/build_tracefile_player.yml +++ b/.github/workflows/build_tracefile_player.yml @@ -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 diff --git a/.github/workflows/build_tracefile_writer.yml b/.github/workflows/build_tracefile_writer.yml index 4709029..ea674bb 100644 --- a/.github/workflows/build_tracefile_writer.yml +++ b/.github/workflows/build_tracefile_writer.yml @@ -38,21 +38,21 @@ jobs: - name: Get Tracefile Player if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - run: git clone https://github.com/openMSL/sl-5-6-osi-trace-file-writer.git + run: git clone https://github.com/openMSL/sl-5-6-sl-5-6-osi-trace-file-writer.git - name: Prepare C++ Build if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer run: git submodule update --init && mkdir build - name: Configure CMake if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install .. - name: Build C++ if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build run: cmake --build . - name: Create FMU Directory @@ -61,15 +61,15 @@ jobs: - name: Copy Commit ID to Cache if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer run: | git rev-parse --short HEAD > commit-id.txt cp commit-id.txt /tmp/tracefile_writer_fmu/commit-id.txt - 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 + working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + 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 diff --git a/test/behavior/001_regression_test_7/SystemStructure.ssd b/test/behavior/001_regression_test_7/SystemStructure.ssd index dc5bd6d..55bae19 100644 --- a/test/behavior/001_regression_test_7/SystemStructure.ssd +++ b/test/behavior/001_regression_test_7/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -120,12 +120,12 @@ - - - - - - + + + + + + diff --git a/test/behavior/002_object_in_fov/SystemStructure.ssd b/test/behavior/002_object_in_fov/SystemStructure.ssd index 1635c85..68e8acc 100644 --- a/test/behavior/002_object_in_fov/SystemStructure.ssd +++ b/test/behavior/002_object_in_fov/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -124,12 +124,12 @@ - - - - - - + + + + + + diff --git a/test/behavior/003_object_outside_fov/SystemStructure.ssd b/test/behavior/003_object_outside_fov/SystemStructure.ssd index ffce1dd..b4e581e 100644 --- a/test/behavior/003_object_outside_fov/SystemStructure.ssd +++ b/test/behavior/003_object_outside_fov/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -124,12 +124,12 @@ - - - - - - + + + + + + diff --git a/test/behavior/004_occlusion_lidar/SystemStructure.ssd b/test/behavior/004_occlusion_lidar/SystemStructure.ssd index 90eb50d..0b8f1c9 100644 --- a/test/behavior/004_occlusion_lidar/SystemStructure.ssd +++ b/test/behavior/004_occlusion_lidar/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -124,12 +124,12 @@ - - - - - - + + + + + + diff --git a/test/behavior/005_occlusion_radar/SystemStructure.ssd b/test/behavior/005_occlusion_radar/SystemStructure.ssd index 6edef1d..ff7b98f 100644 --- a/test/behavior/005_occlusion_radar/SystemStructure.ssd +++ b/test/behavior/005_occlusion_radar/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -124,12 +124,12 @@ - - - - - - + + + + + + diff --git a/test/integration/001_smoke_test/SystemStructure.ssd b/test/integration/001_smoke_test/SystemStructure.ssd index 8aa132f..767c368 100644 --- a/test/integration/001_smoke_test/SystemStructure.ssd +++ b/test/integration/001_smoke_test/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -81,9 +81,9 @@ - - - + + + diff --git a/test/integration/002_output_osi_fields/SystemStructure.ssd b/test/integration/002_output_osi_fields/SystemStructure.ssd index bc46208..16206f8 100644 --- a/test/integration/002_output_osi_fields/SystemStructure.ssd +++ b/test/integration/002_output_osi_fields/SystemStructure.ssd @@ -11,7 +11,7 @@ - + @@ -123,9 +123,9 @@ - - - + + + From ec26019408ec4e7ecbcab24dc569f3712eed94e5 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 30 Sep 2024 17:37:33 +0200 Subject: [PATCH 2/3] Fix repo name Signed-off-by: ClemensLinnhoff --- .github/workflows/build_tracefile_writer.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_tracefile_writer.yml b/.github/workflows/build_tracefile_writer.yml index ea674bb..55b49f7 100644 --- a/.github/workflows/build_tracefile_writer.yml +++ b/.github/workflows/build_tracefile_writer.yml @@ -38,21 +38,21 @@ jobs: - name: Get Tracefile Player if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - run: git clone https://github.com/openMSL/sl-5-6-sl-5-6-osi-trace-file-writer.git + run: git clone https://github.com/openMSL/sl-5-6-osi-trace-file-writer.git - name: Prepare C++ Build if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-osi-trace-file-writer run: git submodule update --init && mkdir build - name: Configure CMake if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-osi-trace-file-writer/build run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install .. - name: Build C++ if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-osi-trace-file-writer/build run: cmake --build . - name: Create FMU Directory @@ -61,14 +61,14 @@ jobs: - name: Copy Commit ID to Cache if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer + working-directory: sl-5-6-osi-trace-file-writer run: | git rev-parse --short HEAD > commit-id.txt cp commit-id.txt /tmp/tracefile_writer_fmu/commit-id.txt - name: Copy Tracefile Writer FMU if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true' - working-directory: sl-5-6-sl-5-6-osi-trace-file-writer/build + working-directory: sl-5-6-osi-trace-file-writer/build 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 From e18986f36a77c046cfe1fe85920c9f3ded57a493 Mon Sep 17 00:00:00 2001 From: ClemensLinnhoff Date: Mon, 30 Sep 2024 17:38:49 +0200 Subject: [PATCH 3/3] Fix readme Signed-off-by: ClemensLinnhoff --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f4ba70f..e4990ca 100644 --- a/README.md +++ b/README.md @@ -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 | |----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | SETLevel | Pegasus | BMWi |