Changeset 15829 for trunk/HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs

Timestamp:

03/07/18 16:34:09 (6 years ago)

Author:

bburlacu

Message:

#2897: Ensure cloning only happens in the Dataset constructor and ModifiableDataset cloning constructor.

File:

• trunk/HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs

@@ -39 +39 @@
 
     private ModifiableDataset(ModifiableDataset original, Cloner cloner) : base(original, cloner) {
-      var variables = variableValues.Keys.ToList();
-      foreach (var v in variables) {
-        var type = GetVariableType(v);
-        if (type == typeof(DateTime)) {
-          variableValues[v] = GetDateTimeValues(v).ToList();
-        } else if (type == typeof(double)) {
-          variableValues[v] = GetDoubleValues(v).ToList();
-        } else if (type == typeof(string)) {
-          variableValues[v] = GetStringValues(v).ToList();
-        } else {
-          throw new ArgumentException("Unsupported type " + type + " for variable " + v);
-        }
-      }
-    }
+      variableNames = new List<string>(original.variableNames);
+      variableValues = CloneValues(original.variableValues);
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) { return new ModifiableDataset(this, cloner); }
-    public ModifiableDataset() : base() { }
-
-    public ModifiableDataset(IEnumerable<string> variableNames, IEnumerable<IList> variableValues) : base(variableNames, variableValues) { }
+
+    public ModifiableDataset() { }
+
+    public ModifiableDataset(IEnumerable<string> variableNames, IEnumerable<IList> variableValues) :
+      base(variableNames, variableValues, cloneValues: false) { }
 
     public void ReplaceRow(int row, IEnumerable<object> values) {