Changeset 10978 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs

Timestamp:

06/11/14 12:36:39 (10 years ago)

Author:

mleitner

Message:

Refactoring

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs (modified) (8 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs

@@ -33 +33 @@
 
   [Item("PreprocessingData", "Represents data used for preprocessing.")]
-  public class PreprocessingData : NamedItem, IPreprocessingData {
+  public abstract class PreprocessingData : NamedItem, IPreprocessingData {
+
+    protected double trainingToTestRatio;
+    public IntRange TrainingPartition {
+      get { return new IntRange(0, (int)(Rows * trainingToTestRatio)); }
+    }
+    public IntRange TestPartition {
+      get { return new IntRange((int)(Rows * trainingToTestRatio), Rows); }
+    }
+
+    protected IList<ITransformation> transformations;
+    public IList<ITransformation> Transformations {
+      get { return transformations; }
+    }
 
     protected IList<IList> variableValues;
-
     protected IList<string> variableNames;
 
-    protected double trainingToTestRatio;
-
-    protected IList<ITransformation> transformations;
-
-    protected IDictionary<int, IList<int>> currentSelection;
+    public IEnumerable<string> VariableNames {
+      get { return variableNames; }
+    }
+
+    public int Columns {
+      get { return variableNames.Count; }
+    }
+
+    public int Rows {
+      get { return variableValues.Count > 0 ? variableValues[0].Count : 0; }
+    }
+
+    protected IDictionary<int, IList<int>> selection;
+    public IDictionary<int, IList<int>> Selection {
+      get { return selection; }
+      set {
+          selection = value;
+          OnSelectionChanged();
+        }
+      }    
 
     protected PreprocessingData(PreprocessingData original, Cloner cloner)
@@ -53 +80 @@
     }
 
-    public PreprocessingData(IDataAnalysisProblemData problemData)
+    protected PreprocessingData(IDataAnalysisProblemData problemData)
       : base() {
       Name = "Preprocessing Data";
 
       transformations = new List<ITransformation>();
-      currentSelection = new Dictionary<int, IList<int>>();
+      selection = new Dictionary<int, IList<int>>();
 
       variableNames = new List<string>(problemData.Dataset.VariableNames);
-      // create dictionary from variable name to index
 
       int columnIndex = 0;
@@ -73 +99 @@
           variableValues.Insert(columnIndex, CreateColumn<DateTime>(problemData.Dataset, columnIndex, x => DateTime.Parse(x)));
         } else {
-          throw new ArgumentException("The datatype of column " + variableName + " must be of type List<double>, List<string> or List<DateTime>");
+          throw new ArgumentException("The datatype of column " + variableName + " must be of type double, string or DateTime");
         }
         ++columnIndex;
@@ -97 +123 @@
     }
 
-    #region NamedItem abstract Member Implementations
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PreprocessingData(this, cloner);
-    }
-
-    #endregion
 
     #region IPreprocessingData Members
@@ -111 +130 @@
     }
 
-
     public virtual void SetCell<T>(int columnIndex, int rowIndex, T value) {
       variableValues[columnIndex][rowIndex] = value;
     }
 
-
     public string GetCellAsString(int columnIndex, int rowIndex) {
       return variableValues[columnIndex][rowIndex].ToString();
     }
 
+    public string GetVariableName(int columnIndex) {
+      return variableNames[columnIndex];
+    }
+
+    public int GetColumnIndex(string variableName) {
+      return variableNames.IndexOf(variableName);
+    }
+
+    public bool IsType<T>(int columnIndex) {
+      return variableValues[columnIndex] is List<T>;
+    }
 
     [Obsolete("use the index based variant, is faster")]
@@ -130 +158 @@
       if (considerSelection) {
         var list = new List<T>();
-        foreach (var rowIdx in currentSelection[columnIndex]) {
+        foreach (var rowIdx in selection[columnIndex]) {
           list.Add((T)variableValues[columnIndex][rowIdx]);
         }
@@ -170 +198 @@
     }
 
-    public IntRange TrainingPartition {
-      get { return new IntRange(0, (int)(Rows * trainingToTestRatio)); }
-    }
-
-    public IntRange TestPartition {
-      get { return new IntRange((int)(Rows * trainingToTestRatio), Rows); }
-    }
-
-    public IList<ITransformation> Transformations {
-      get { return transformations; }
-    }
-
-    public string GetVariableName(int columnIndex) {
-      return variableNames[columnIndex];
-    }
-
-    public IEnumerable<string> VariableNames {
-      get { return variableNames; }
-    }
-
-    public int GetColumnIndex(string variableName) {
-      return variableNames.IndexOf(variableName);
-    }
-
-    public bool IsType<T>(int columnIndex) {
-      return variableValues[columnIndex] is List<T>;
-    }
-
-    public int Columns {
-      get { return variableNames.Count; }
-    }
-
-    public int Rows {
-      get { return variableValues.Count > 0 ? variableValues[0].Count : 0; }
-    }
-
     public Dataset ExportToDataset() {
       IList<IList> values = new List<IList>();
@@ -217 +209 @@
     }
 
-    public void SetSelection(IDictionary<int, IList<int>> selection) {
-      currentSelection = selection;
-      if (SelectionChanged != null) {
-        SelectionChanged(this, new EventArgs());
-      }
-    }
-
-    public IDictionary<int, IList<int>> GetSelection() {
-      return currentSelection;
-    }
-
     public void ClearSelection() {
-      currentSelection = new Dictionary<int, IList<int>>();
+      Selection = new Dictionary<int, IList<int>>();
     }
 
     public event EventHandler SelectionChanged;
-
+    protected virtual void OnSelectionChanged() { 
+       var listeners = SelectionChanged;
+       if (listeners != null) listeners(this, EventArgs.Empty);
+    }
+
+    public event DataPreprocessingChangedEventHandler Changed;
+    protected virtual void OnChanged(DataPreprocessingChangedEventType type, int column, int row) {
+      var listeners = Changed;
+      if (listeners != null) listeners(this, new DataPreprocessingChangedEventArgs(type, column, row));
+    }
     #endregion
   }