Changeset 16063 for trunk/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

Timestamp:

08/07/18 16:12:04 (6 years ago)

Author:

mkommend

Message:

#2935:

• Implemented ModifiableDataset.InsertVariable
• Added ModifiableDataset.ToDataset for convience reasons
• Altered ModifiableDataset ctor to allow specification of whether the values should be cloned
• Simplified code of Dataset.ToModifiable
• Added protected setter to Rows in the Dataset and made the corresponding field private

File:

• trunk/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (3 diffs)

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

@@ -116 +116 @@
 
     public ModifiableDataset ToModifiable() {
-      var values = new List<IList>();
-      foreach (var v in variableNames) {
-        if (VariableHasType<double>(v)) {
-          values.Add(new List<double>((IList<double>)variableValues[v]));
-        } else if (VariableHasType<string>(v)) {
-          values.Add(new List<string>((IList<string>)variableValues[v]));
-        } else if (VariableHasType<DateTime>(v)) {
-          values.Add(new List<DateTime>((IList<DateTime>)variableValues[v]));
-        } else {
-          throw new ArgumentException("Unknown variable type.");
-        }
-      }
-      return new ModifiableDataset(variableNames, values);
+      return new ModifiableDataset(variableNames, variableNames.Select(v => variableValues[v]),true);
     }
 
@@ -141 +129 @@
     }
 
-    protected Dataset(Dataset dataset) : this(dataset.variableNames, dataset.variableValues.Values) { }
+
 
     #region Backwards compatible code, remove with 3.5
@@ -318 +306 @@
     #region IStringConvertibleMatrix Members
     [Storable]
-    protected int rows;
+    private int rows;
     public int Rows {
       get { return rows; }
+      protected set { rows = value; }
     }
     int IStringConvertibleMatrix.Rows {