Fix descriptor values loading from a .yaml file

norlab-ulaval · Nov 21, 2023 · feb7c2b · feb7c2b
1 parent c4fa9ff
commit feb7c2b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/examples/data/add_descriptor_config.yaml b/examples/data/add_descriptor_config.yaml
@@ -0,0 +1,4 @@
+- AddDescriptorDataPointsFilter:
+        descriptorName: deviation
+        descriptorDimension: 9
+        descriptorValues: [0.0009, 0, 0, 0, 0.0009, 0, 0, 0, 0.0009]
diff --git a/pointmatcher/Registrar.cpp b/pointmatcher/Registrar.cpp
@@ -19,8 +19,21 @@ namespace PointMatcherSupport
 			for(YAML::const_iterator paramIt = mapIt->second.begin(); paramIt != mapIt->second.end(); ++paramIt)
 			{
 				std::string key = paramIt->first.as<std::string>();
-				std::string value = paramIt->second.as<std::string>();
-				params[key] = value;
+                if (paramIt->second.IsSequence())
+                {
+                    std::ostringstream oss;
+                    oss << "[";
+                    for(int i = 0; i < paramIt->second.size()-1; ++i)
+                    {
+                        oss << paramIt->second[i] << ", ";
+                    }
+                    oss << paramIt->second[paramIt->second.size()-1] << "]";
+                    params[key] = oss.str();
+                }
+                else
+                {
+                    params[key] = paramIt->second.as<std::string>();
+                }
 			}
 		}
 	}

diff --git a/utest/ui/IO.cpp b/utest/ui/IO.cpp
@@ -25,6 +25,9 @@ TEST(IOTest, loadYaml)
 
 	std::ifstream ifs3((dataPath + "unit_tests/badIcpConfig_InvalidModuleType.yaml").c_str());
 	EXPECT_THROW(icp.loadFromYaml(ifs3), PointMatcherSupport::InvalidModuleType);
+
+	std::ifstream ifs4((dataPath + "add_descriptor_config.yaml").c_str());
+	EXPECT_NO_THROW(PM::DataPointsFilters filters(ifs4));
 }
 
 TEST(IOTest, loadCSV)