From 1da32f540aa16e41e3c33239d7f4dcdf48d0db5f Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Fri, 28 Feb 2020 11:07:46 +0100
Subject: [PATCH] Fixed Dict (cannot have empty elements)
---
common/include/Dict.hpp | 2 +-
common/src/Dict.cpp | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/common/include/Dict.hpp b/common/include/Dict.hpp
index fb005e7..5d9f654 100644
--- a/common/include/Dict.hpp
+++ b/common/include/Dict.hpp
@@ -30,10 +30,10 @@ class Dict
private :
void readFromFile(const char * filename);
+ void insert(const std::string & element);
public :
- void insert(const std::string & element);
int getIndexOrInsert(const std::string & element);
void setState(State state);
State getState() const;
diff --git a/common/src/Dict.cpp b/common/src/Dict.cpp
index c451ecd..d96d954 100644
--- a/common/src/Dict.cpp
+++ b/common/src/Dict.cpp
@@ -63,6 +63,9 @@ void Dict::insert(const std::string & element)
int Dict::getIndexOrInsert(const std::string & element)
{
+ if (element.empty())
+ return getIndexOrInsert(nullValueStr);
+
const auto & found = elementsToIndexes.find(element);
if (found == elementsToIndexes.end())
--
GitLab