refactoring. Everything is pointer.

src/system/syselmts.hpp

@@ -6,65 +6,82 @@
 #include <unordered_map>
 #include <stdexcept>
 
+using namespace std;
+
 class SystemElement
 {
 public:
-    std::string name;
-    SystemElement(std::string name) : name(name) {};
+    string name;
+    SystemElement(string name) : name(name) {};
 };
 
 template <typename T>
 class SystemElementContainer : public SystemElement
 {
 private:
-    static_assert(std::is_base_of<SystemElement, T>::value, "T shall be a system element descendant !");
+    //static_assert(is_base_of<SystemElement, T>::value, "T shall be a system element descendant !");
     unsigned int iter_count;
-    std::unordered_map<std::string, T> content;
+    unordered_map<string, T*> content;
 
-    bool name_exists(std::string name)
+    void add(unordered_map<string, T*> el_content)
     {
-        return get(name) != nullptr;
+        for (const auto &[key, value] : el_content)
+        {
+            add(value);
+        }
     }
 
 public:
-    SystemElementContainer(std::string name) : SystemElement(name) {};
-    SystemElementContainer(std::string name, std::vector<T> elements) : SystemElement(name)
+    SystemElementContainer(string name) : SystemElement(name) {};
+    SystemElementContainer(string name, vector<T *> elements) : SystemElement(name)
     {
         add(elements);
     }
-    void add(T element)
+    bool exists(string name)
     {
-        if ("" == element.name)
+        try
         {
-            throw std::runtime_error("System elements with empty names are forbidden");
+            get(name);
+            return true;
         }
-        if (name_exists(element.name))
+        catch (const exception &e)
         {
-            throw std::runtime_error("System elements of same names are forbidden");
+            return false;
         }
-        content.insert({element.name, element});
     }
-    void add(SystemElementContainer<T> elements)
+    void add(T* element)
     {
-        add(elements.content);
+        if ("" == element->name)
+        {
+            throw runtime_error("System elements with empty names are forbidden");
+        }
+        if (exists(element->name))
+        {
+            throw runtime_error("System elements of same names are forbidden");
+        }
+        content.insert({element->name, element});
     }
-    void add(std::vector<T> elements)
+    void add(SystemElementContainer<T> *elements)
+    {
+        add(elements->content);
+    }
+    void add(vector<T*> elements)
     {
         for (auto &element : elements)
         {
             add(element);
         }
     }
-    T *get(std::string name)
+    T *get(string name)
     {
         auto it = content.find(name);
         if (it != content.end())
         {
-            return &it->second;
+            return it->second;
         }
         else
         {
-            return nullptr;
+            throw runtime_error("System elements not found");
         }
     }
 };