Added method to convert classification to string and added unit tests

usdot-fhwa-OPS · Jun 19, 2024 · 10e1643 · 10e1643
1 parent 3eb7331
commit 10e1643
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git a/src/v2i-hub/MUSTSensorDriverPlugin/src/MUSTSensorDetection.cpp b/src/v2i-hub/MUSTSensorDriverPlugin/src/MUSTSensorDetection.cpp
@@ -39,7 +39,7 @@ namespace MUSTSensorDriverPlugin {
         detectedObject.velocity = headingSpeedToVelocity(detection.heading, detection.speed);
         return detectedObject;
     }
-    const DetectionClassification fromStringToDetectionClassification(const std::string &str) noexcept {
+    DetectionClassification fromStringToDetectionClassification(const std::string &str) noexcept {
         try {
 
             return stringToDetectionClassificationMap.at(str);
@@ -49,7 +49,20 @@ namespace MUSTSensorDriverPlugin {
         }
     }
 
-    const DetectionSize fromStringToDetectionSize(const std::string &str) noexcept {
+    std::string detectionClassificationToString(const DetectionClassification &classification) {
+       for (auto const &[name, cl] : stringToDetectionClassificationMap){
+            if (classification == cl) {
+                std::string rtn = name;
+                std::transform(rtn.begin(), rtn.end(), rtn.begin(), ::toupper);
+                return rtn;
+            }
+       }
+       throw std::runtime_error("DetectionClassification type is not registered in stringToDetectionClassificationMap!");
+    }
+
+
+
+    DetectionSize fromStringToDetectionSize(const std::string &str) noexcept {
         try {
 
             return stringToDetectionSizeMap.at(str);
@@ -66,4 +79,4 @@ namespace MUSTSensorDriverPlugin {
         velocity.Z = 0;
         return velocity;
     };
-}
+}
diff --git a/src/v2i-hub/MUSTSensorDriverPlugin/src/MUSTSensorDetection.h b/src/v2i-hub/MUSTSensorDriverPlugin/src/MUSTSensorDetection.h
@@ -5,6 +5,8 @@
 #include <SensorDetectedObject.h>
 #include <PluginLog.h>
 #include <Vector3d.h>
+#include <algorithm>
+
 
 namespace MUSTSensorDriverPlugin {
 
@@ -35,9 +37,11 @@ namespace MUSTSensorDriverPlugin {
         {"van", DetectionClassification::VAN}
     };
 
-    const DetectionSize fromStringToDetectionSize(const std::string &str) noexcept;
+    DetectionSize fromStringToDetectionSize(const std::string &str) noexcept;
+
+    DetectionClassification fromStringToDetectionClassification(const std::string &str) noexcept;
 
-    const DetectionClassification fromStringToDetectionClassification(const std::string &str) noexcept;
+    std::string detectionClassificationToString(const DetectionClassification &classifcation);
 
     struct MUSTSensorDetection {
         DetectionClassification cl = DetectionClassification::NA;

diff --git a/src/v2i-hub/MUSTSensorDriverPlugin/test/TestMUSTSensorDetection.cpp b/src/v2i-hub/MUSTSensorDriverPlugin/test/TestMUSTSensorDetection.cpp
@@ -68,4 +68,12 @@ TEST(TestMUSTSensorDetection, mustDectionToSensorDetectedObject ) {
     EXPECT_DOUBLE_EQ(detection.position_y, sensorDetectedObject.position.Y);
     EXPECT_NEAR(4.33, sensorDetectedObject.velocity.Y, 0.001);
     EXPECT_NEAR(2.5, sensorDetectedObject.velocity.X, 0.001);
+}
+
+TEST(TestMUSTSensorDetection, detectionClassificationToString ) {
+    EXPECT_STRCASEEQ("SEDAN", detectionClassificationToString(DetectionClassification::SEDAN).c_str());
+    EXPECT_STRCASEEQ("VAN", detectionClassificationToString(DetectionClassification::VAN).c_str());
+    EXPECT_STRCASEEQ("TRUCK", detectionClassificationToString(DetectionClassification::TRUCK).c_str());
+    EXPECT_THROW(detectionClassificationToString(DetectionClassification::NA).c_str(), std::runtime_error);
+
 }