imlement proper option cloning #12998

eclipse-sumo · Dec 20, 2024 · a946eb5 · a946eb5
1 parent c731a1b
commit a946eb5
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/src/utils/options/Option.h b/src/utils/options/Option.h
@@ -41,6 +41,8 @@ typedef std::vector<int> IntVector;
  */
 typedef std::vector<std::string> StringVector;
 
+#define CLONEABLE(Type) virtual Type* clone() const { return new Type(*this); }
+
 /* -------------------------------------------------------------------------
  * Option
  * ----------------------------------------------------------------------- */
@@ -331,6 +333,12 @@ class Option {
      */
     virtual const std::string& getTypeName() const;
 
+    /** @brief Returns a copy of this option
+     *
+     * @return The option copy
+     */
+    virtual Option* clone() const = 0;
+
 protected:
     /** @brief Marks the information as set
      *
@@ -427,6 +435,8 @@ class Option_Integer : public Option {
     */
     bool isInteger() const;
 
+    CLONEABLE(Option_Integer)
+
 private:
     /// @brief the value, valid only when the base-classes "myAmSet"-member is true
     int myValue;
@@ -472,6 +482,8 @@ class Option_String : public Option {
      */
     bool set(const std::string& v, const std::string& orig, const bool append);
 
+    CLONEABLE(Option_String)
+
 protected:
     /// @brief the value, valid only when the base-classes "myAmSet"-member is true
     std::string myValue;
@@ -523,6 +535,8 @@ class Option_Float : public Option {
     */
     bool isFloat() const;
 
+    CLONEABLE(Option_Float)
+
 private:
     /// @brief the value, valid only when the base-classes "myAmSet"-member is true
     double myValue;
@@ -561,6 +575,8 @@ class Option_Bool : public Option {
      */
     bool isBool() const;
 
+    CLONEABLE(Option_Bool)
+
 protected:
     /// @brief the value, valid only when the base-classes "myAmSet"-member is true
     bool myValue;
@@ -584,6 +600,8 @@ class Option_BoolExtended : public Option_Bool {
 
     /// @brief sets the given value (converts it to bool)
     bool set(const std::string& v, const std::string& orig, const bool append);
+
+    CLONEABLE(Option_BoolExtended)
 };
 
 // -------------------------------------------------------------------------
@@ -625,6 +643,8 @@ class Option_IntVector : public Option {
      */
     bool set(const std::string& v, const std::string& orig, const bool append);
 
+    CLONEABLE(Option_IntVector)
+
 private:
     /// @brief the value, valid only when the base-classes "myAmSet"-member is true
     IntVector myValue;
@@ -670,6 +690,8 @@ class Option_StringVector : public Option {
      */
     bool set(const std::string& v, const std::string& orig, const bool append);
 
+    CLONEABLE(Option_StringVector)
+
 private:
     /// @brief the value, valid only when the base-classes "myAmSet"-member is true
     StringVector myValue;
@@ -708,6 +730,8 @@ class Option_FileName : public Option_StringVector {
      * not in line with code style of the Options sub-system.
      */
     std::string getString() const;
+
+    CLONEABLE(Option_FileName)
 };
 
 // -------------------------------------------------------------------------
@@ -730,6 +754,8 @@ class Option_Network : public Option_String {
      * @return true
      */
     bool isNetwork() const;
+
+    CLONEABLE(Option_Network)
 };
 
 // -------------------------------------------------------------------------
@@ -752,6 +778,8 @@ class Option_Additional : public Option_String {
      * @return true
      */
     bool isAdditional() const;
+
+    CLONEABLE(Option_Additional)
 };
 
 // -------------------------------------------------------------------------
@@ -774,6 +802,8 @@ class Option_Route : public Option_String {
      * @return true
      */
     bool isRoute() const;
+
+    CLONEABLE(Option_Route)
 };
 
 // -------------------------------------------------------------------------
@@ -796,6 +826,8 @@ class Option_Data : public Option_String {
      * @return true
      */
     bool isData() const;
+
+    CLONEABLE(Option_Data)
 };
 
 // -------------------------------------------------------------------------
@@ -818,6 +850,8 @@ class Option_SumoConfig : public Option_String {
      * @return true
      */
     bool isSumoConfig() const;
+
+    CLONEABLE(Option_SumoConfig)
 };
 
 // -------------------------------------------------------------------------
@@ -840,6 +874,8 @@ class Option_Edge : public Option_String {
      * @return true
      */
     bool isEdge() const;
+
+    CLONEABLE(Option_Edge)
 };
 
 // -------------------------------------------------------------------------
@@ -862,4 +898,6 @@ class Option_EdgeVector : public Option_String {
      * @return true
      */
     bool isEdgeVector() const;
+
+    CLONEABLE(Option_EdgeVector)
 };
diff --git a/src/utils/options/OptionsCont.cpp b/src/utils/options/OptionsCont.cpp
@@ -1059,7 +1059,9 @@ OptionsCont::clone() const {
     // (with the possibility of changing a few settings and not affecting the original)
     OptionsCont* oc = new OptionsCont(*this);
     oc->resetWritable();
-    oc->myAddresses.clear();
+    for (auto& addr : oc->myAddresses) {
+        addr.second = addr.second->clone();
+    }
     return oc;
 }