Changeset 10146 for branches/DataPreprocessing

Timestamp:

11/20/13 14:29:19 (11 years ago)

Author:

pfleck

Message:

• implemented EditableDataset
• made some Dataset components protected for EditableDataset

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing/3.3/EditableDataset.cs (added)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (4 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -84 +84 @@
       <DependentUpon>DataPreprocessingView.cs</DependentUpon>
     </Compile>
+    <Compile Include="EditableDataset.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

@@ -35 +35 @@
   public class Dataset : NamedItem, IDataset {
     [StorableConstructor]
-    private Dataset(bool deserializing) : base(deserializing) { }
-    private Dataset(Dataset original, Cloner cloner)
+    protected Dataset(bool deserializing) : base(deserializing) { }
+    protected Dataset(Dataset original, Cloner cloner)
       : base(original, cloner) {
       variableValues = new Dictionary<string, IList>(original.variableValues);
@@ -143 +143 @@
 
     [Storable(Name = "VariableValues")]
-    private Dictionary<string, IList> variableValues;
-
-    private List<string> variableNames;
+    protected Dictionary<string, IList> variableValues;
+
+    protected List<string> variableNames;
     [Storable]
     public IEnumerable<string> VariableNames {
@@ -212 +212 @@
       set { throw new NotSupportedException(); }
     }
-    public bool ReadOnly {
+    public virtual bool ReadOnly {
       get { return false; }
     }
@@ -228 +228 @@
       return variableValues[variableNames[columnIndex]][rowIndex].ToString();
     }
-    public bool SetValue(string value, int rowIndex, int columnIndex) {
-      var values = variableValues[variableNames[columnIndex]];
-      object insertValue = null;
-      if (values is List<double>)
-        insertValue = Double.Parse(value); /// TODO: set culture
-      else if (values is List<string>)
-        insertValue = value;
-      else if (values is List<DateTime>)
-        insertValue = DateTime.Parse(value);
-      else
-        throw new ArgumentException("The variable values must be of type double, string or DateTime");
-
-      variableValues[variableNames[columnIndex]][rowIndex] = insertValue;
-      return true;
+    public virtual bool SetValue(string value, int rowIndex, int columnIndex) {
+      throw new NotSupportedException();
     }
     public bool Validate(string value, out string errorMessage) {