Changeset 11002 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

06/11/14 15:43:05 (10 years ago)

Author:

mleitner

Message:

Refactoring

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4

Files:

• HeuristicLab.DataPreprocessing-3.4.csproj (modified) (1 diff)
• Implementations/CorrelationMatrixContent.cs (modified) (1 diff)
• Implementations/DataCompletenessChartContent.cs (modified) (1 diff)
• Implementations/DataGridContent.cs (modified) (9 diffs)
• Implementations/DataGridLogic.cs (deleted)
• Implementations/ManipulationContent.cs (modified) (2 diffs)
• Implementations/ManipulationLogic.cs (modified) (3 diffs)
• Implementations/PreprocessingData.cs (modified) (4 diffs)
• Implementations/SearchLogic.cs (modified) (1 diff)
• Implementations/TransactionalPreprocessingData.cs (modified) (2 diffs)
• Interfaces/IDataGridContent.cs (modified) (1 diff)
• Interfaces/IDataGridLogic.cs (modified) (1 diff)
• Interfaces/IFilterLogic.cs (modified) (2 diffs)
• Interfaces/IManipulationLogic.cs (modified) (1 diff)
• Interfaces/IPreprocessingData.cs (modified) (1 diff)
• Interfaces/ISearchLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

@@ -78 +78 @@
     <Compile Include="Implementations\PreprocessingChartContent.cs" />
     <Compile Include="Implementations\PreprocessingData.cs" />
-    <Compile Include="Implementations\DataGridLogic.cs" />
     <Compile Include="Implementations\PreprocessingDataTable.cs" />
     <Compile Include="Interfaces\IViewChartShortcut.cs" />

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

@@ -50 +50 @@
     public CorrelationMatrixContent(CorrelationMatrixContent original, Cloner cloner)
       : base(original, cloner) {
+        Context = original.Context;
     }
 

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

@@ -5 +5 @@
 namespace HeuristicLab.DataPreprocessing {
   [Item("DataCompletenessChart", "Represents a datacompleteness chart.")]
-  public class DataCompletenessChartContent : Item, IViewChartShortcut {
 
+  public class DataCompletenessChartContent : Item, IViewChartShortcut
+  {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.EditBrightnessContrast; }
     }
 
+    private readonly SearchLogic searchLogic;
+
     public IDataGridLogic DataGridLogic { get; private set; }
     public ISearchLogic SearchLogic { get; private set; }
 
-    public DataCompletenessChartContent(DataGridLogic dataGridLogic, SearchLogic searchLogic) {
-      DataGridLogic = dataGridLogic;
-      SearchLogic = searchLogic;
+    public DataCompletenessChartContent(SearchLogic searchLogic)
+    {
+      this.searchLogic = searchLogic;
     }
-
+    
     public DataCompletenessChartContent(DataCompletenessChartContent content, Cloner cloner)
-      : base(content, cloner) {
-      DataGridLogic = content.DataGridLogic;
-      SearchLogic = content.SearchLogic;
+      : base(content, cloner)
+    {
+      this.searchLogic = content.searchLogic;
     }
 

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -31 +34 @@
   public class DataGridContent : Item, IViewShortcut, IDataGridContent {
 
+    public ITransactionalPreprocessingData PreProcessingData { get; private set; }
+
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
@@ -36 +41 @@
 
     public IManipulationLogic ManipulationLogic { get; private set; }
-    public IDataGridLogic DataGridLogic { get; private set; }
     public IFilterLogic FilterLogic { get; private set; }
+
+    private IEnumerable<string> rowNames;
 
     public int Rows {
       get {
-        return DataGridLogic.Rows;
+        return PreProcessingData.Rows;
       }
       set {
@@ -50 +56 @@
     public int Columns {
       get {
-        return DataGridLogic.Columns;
+        return PreProcessingData.Columns;
       }
       set {
@@ -59 +65 @@
     public IEnumerable<string> ColumnNames {
       get {
-        return DataGridLogic.ColumnNames;
+        return PreProcessingData.VariableNames;
       }
       set {
@@ -68 +74 @@
     public IEnumerable<string> RowNames {
       get {
-        return DataGridLogic.RowNames;
+        return rowNames;
       }
       set {
@@ -88 +94 @@
     }
 
-    public DataGridContent(IDataGridLogic theDataGridLogic, IManipulationLogic theManipulationLogic, IFilterLogic theFilterLogic) {
-      DataGridLogic = theDataGridLogic;
+
+    private IDictionary<int, IList<int>> selection;
+    public IDictionary<int, IList<int>> Selection {
+      get { return PreProcessingData.Selection; }
+      set { PreProcessingData.Selection = value; }
+    }
+
+
+    public DataGridContent(ITransactionalPreprocessingData preProcessingData, IManipulationLogic theManipulationLogic, IFilterLogic theFilterLogic) {
       ManipulationLogic = theManipulationLogic;
       FilterLogic = theFilterLogic;
+      PreProcessingData = preProcessingData;
+      createRowNames();
     }
 
@@ -102 +117 @@
     }
 
+    public void DeleteRow(IEnumerable<int> rows) {
+      PreProcessingData.DeleteRowsWithIndices(rows);
+      createRowNames();
+    }
+
+    public bool Validate(string value, out string errorMessage, int columnIndex) {
+      return PreProcessingData.Validate(value, out errorMessage, columnIndex);
+    }
+
     public string GetValue(int rowIndex, int columnIndex) {
-      return DataGridLogic.GetValue(columnIndex, rowIndex);
+      return PreProcessingData.GetCellAsString(columnIndex, rowIndex);
     }
 
     public bool SetValue(string value, int rowIndex, int columnIndex) {
-      return DataGridLogic.SetValue(value, columnIndex, rowIndex);
+      return PreProcessingData.SetValue(value, columnIndex, rowIndex);
+    }
+
+    private void createRowNames() {
+      rowNames = Enumerable.Range(1, Rows).Select(n => n.ToString());
     }
 
     public event DataPreprocessingChangedEventHandler Changed {
-      add { DataGridLogic.Changed += value; }
-      remove { DataGridLogic.Changed -= value; }
+      add { PreProcessingData.Changed += value; }
+      remove { PreProcessingData.Changed -= value; }
     }
 
@@ -126 +154 @@
 
     public event EventHandler ColumnsChanged;
-
     public event EventHandler RowsChanged;
-
     public event EventHandler ColumnNamesChanged;
-
     public event EventHandler RowNamesChanged;
-
     public event EventHandler SortableViewChanged;
-
     public event EventHandler<EventArgs<int, int>> ItemChanged;
-
     public event EventHandler Reset;
     #endregion

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

@@ -31 +31 @@
     private IManipulationLogic manipulationLogic;
     private ISearchLogic searchLogic;
-    private IDataGridLogic dataGridLogic;
     private IFilterLogic filterLogic;
 
     public IManipulationLogic ManipulationLogic { get { return manipulationLogic; } }
     public ISearchLogic SearchLogic { get { return searchLogic; } }
-    public IDataGridLogic DataGridLogic { get { return dataGridLogic; } }
     public IFilterLogic FilterLogic { get { return filterLogic; } }
 
@@ -43 +41 @@
     }
 
-    public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic, IDataGridLogic theDataGridLogic, IFilterLogic theFitlerLogic) {
+    public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic, IFilterLogic theFitlerLogic) {
       manipulationLogic = theManipulationLogic;
       searchLogic = theSearchLogic;
-      dataGridLogic = theDataGridLogic;
       filterLogic = theFitlerLogic;
     }

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

@@ -30 +30 @@
     private IStatisticsLogic statisticsLogic;
     private ISearchLogic searchLogic;
-    private IDataGridLogic dataGridLogic;
-
-    public ManipulationLogic(ITransactionalPreprocessingData _prepocessingData, ISearchLogic theSearchLogic, IStatisticsLogic theStatisticsLogic, IDataGridLogic theDataGridLogic) {
+
+    public IEnumerable<string> VariableNames {
+      get { return preprocessingData.VariableNames; }
+    }
+
+    public ITransactionalPreprocessingData PreProcessingData {
+      get { return preprocessingData; }
+    }
+
+    public ManipulationLogic(ITransactionalPreprocessingData _prepocessingData, ISearchLogic theSearchLogic, IStatisticsLogic theStatisticsLogic) {
       preprocessingData = _prepocessingData;
       searchLogic = theSearchLogic;
       statisticsLogic = theStatisticsLogic;
-      dataGridLogic = theDataGridLogic;
     }
 
@@ -316 +322 @@
         foreach (var column in cells) {
           foreach (var rowIdx in column.Value) {
-            dataGridLogic.SetValue(value, column.Key, rowIdx);
+            preprocessingData.SetValue(value, column.Key, rowIdx);
           }
         }
@@ -396 +402 @@
     }
 
-    public event DataPreprocessingChangedEventHandler Changed {
-      add { dataGridLogic.Changed += value; }
-      remove { dataGridLogic.Changed -= value; }
-    }
+    public event DataPreprocessingChangedEventHandler Changed;
   }
 }

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

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using HeuristicLab.Common;
@@ -95 +96 @@
       selection = new Dictionary<int, IList<int>>();
 
+      Dataset dataset = problemData.Dataset;
       variableNames = new List<string>(problemData.Dataset.VariableNames);
 
@@ -100 +102 @@
       variableValues = new List<IList>();
       foreach (var variableName in problemData.Dataset.VariableNames) {
-        if (problemData.Dataset.IsType<double>(variableName)) {
-          variableValues.Insert(columnIndex, problemData.Dataset.GetDoubleValues(variableName).ToList());
-        } else if (problemData.Dataset.IsType<string>(variableName)) {
-          variableValues.Insert(columnIndex, CreateColumn<string>(problemData.Dataset, columnIndex, x => x));
-        } else if (problemData.Dataset.IsType<DateTime>(variableName)) {
-          variableValues.Insert(columnIndex, CreateColumn<DateTime>(problemData.Dataset, columnIndex, x => DateTime.Parse(x)));
+        if (dataset.IsType<double>(variableName)) {
+          variableValues.Insert(columnIndex, dataset.GetDoubleValues(variableName).ToList());
+        } else if (dataset.IsType<string>(variableName)) {
+          variableValues.Insert(columnIndex, dataset.GetStringValues(variableName).ToList());
+        } else if (dataset.IsType<DateTime>(variableName)) {
+          variableValues.Insert(columnIndex, dataset.GetDateTimeValues(variableName).ToList());
         } else {
           throw new ArgumentException("The datatype of column " + variableName + " must be of type double, string or DateTime");
@@ -180 +182 @@
     public abstract void SetValues<T>(int columnIndex, IList<T> values);
 
+    public abstract bool SetValue(string value, int columnIndex, int rowIndex);
+
+    public abstract bool Validate(string value, out string errorMessage, int columnIndex);
+
+    public abstract bool AreAllStringColumns(IEnumerable<int> columnIndices);
+
+    public abstract void DeleteRowsWithIndices(IEnumerable<int> rows);
+
     public abstract void InsertRow(int rowIndex);
 

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

@@ -31 +31 @@
     private Dictionary<int, IList<int>> MissingValueIndicies { get; set; }
     private Dictionary<int, IList> ValuesWithoutNaN { get; set; }
+
+    public IEnumerable<string> VariableNames {
+      get { return preprocessingData.VariableNames; }
+    }
+
+    public int Columns {
+      get { return preprocessingData.Columns; }
+    }
+
+    public int Rows {
+      get { return preprocessingData.Rows; }
+    }
 
     public SearchLogic(ITransactionalPreprocessingData thePreprocessingData) {

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

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -159 +161 @@
       if (!IsInTransaction)
         OnChanged(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
+    }
+
+    public override bool SetValue(string value, int columnIndex, int rowIndex) {
+      bool valid = false;
+      if (IsType<double>(columnIndex)) {
+        double val;
+        valid = double.TryParse(value, out val);
+        SetValueIfValid(columnIndex, rowIndex, valid, val);
+      } else if (IsType<string>(columnIndex)) {
+        valid = value != null;
+        SetValueIfValid(columnIndex, rowIndex, valid, value);
+      } else if (IsType<DateTime>(columnIndex)) {
+        DateTime date;
+        valid = DateTime.TryParse(value, out date);
+        SetValueIfValid(columnIndex, rowIndex, valid, date);
+      } else {
+        throw new ArgumentException("column " + columnIndex + " contains a non supported type.");
+      }
+
+      if (!IsInTransaction)
+        OnChanged(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
+
+      return valid;
+    }
+    
+    public override bool Validate(string value, out string errorMessage, int columnIndex){
+     if (columnIndex < 0 || columnIndex > VariableNames.Count()) {
+        throw new ArgumentOutOfRangeException("column index is out of range");
+      }
+
+      bool valid = false;
+      errorMessage = string.Empty;
+      if (IsType<double>(columnIndex)) {
+        double val;
+        valid = double.TryParse(value, out val);
+        if (!valid) {
+          errorMessage = "Invalid Value (Valid Value Format: \"" + FormatPatterns.GetDoubleFormatPattern() + "\")";
+        }
+      } else if (IsType<string>(columnIndex)) {
+        valid = value != null;
+        if (!valid) {
+          errorMessage = "Invalid Value (string must not be null)";
+        }
+      } else if (IsType<DateTime>(columnIndex)) {
+        DateTime date;
+        valid = DateTime.TryParse(value, out date);
+        if (!valid) {
+          errorMessage = "Invalid Value (Valid Value Format: \"" + CultureInfo.CurrentCulture.DateTimeFormat + "\"";
+        }
+      } else {
+        throw new ArgumentException("column " + columnIndex + " contains a non supported type.");
+      }
+
+      return valid;
+    }
+
+    private void SetValueIfValid<T>(int columnIndex, int rowIndex, bool valid, T value) {
+      if (valid)
+        SetCell<T>(columnIndex, rowIndex, value);
+    }
+
+    public override bool AreAllStringColumns(IEnumerable<int> columnIndices) {
+      return columnIndices.All(x => IsType<string>(x));
+    }
+
+    public override void DeleteRowsWithIndices(IEnumerable<int> rows) {
+      foreach (int rowIndex in rows) {
+        DeleteRow(rowIndex);
+      }
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IDataGridContent.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Data;
 
 namespace HeuristicLab.DataPreprocessing {
   public interface IDataGridContent : IStringConvertibleMatrix {
-    IDataGridLogic DataGridLogic { get; }
+    ITransactionalPreprocessingData PreProcessingData { get; }
     IManipulationLogic ManipulationLogic { get; }
     IFilterLogic FilterLogic { get; }
+
+    IDictionary<int, IList<int>> Selection { get; set; }
+
+    void DeleteRow(IEnumerable<int> rows);
+    bool Validate(string value, out string errorMessage, int columnIndex);
 
     event DataPreprocessingChangedEventHandler Changed;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IDataGridLogic.cs

@@ -40 +40 @@
     void DeleteRow(List<int> rows);
 
-    void SetSelection(IDictionary<int, IList<int>> selection);
-    IDictionary<int, IList<int>> GetSelection();
+    IDictionary<int, IList<int>> Selection { get; set; }
     void ClearSelection();
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IFilterLogic.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.DataPreprocessing.Filter;
+using HeuristicLab.DataPreprocessing.Interfaces;
 namespace HeuristicLab.DataPreprocessing {
   public interface IFilterLogic {
@@ -34 +35 @@
     bool[] Preview(IList<IFilter> filters, bool isAndCombination);
     void Apply(IList<IFilter> filters, bool isAndCombination);
-    IPreprocessingData PreprocessingData { get; }
+    IFilteredPreprocessingData PreprocessingData { get; }
     void Reset();
     bool IsFiltered { get; }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IManipulationLogic.cs

@@ -25 +25 @@
 namespace HeuristicLab.DataPreprocessing {
   public interface IManipulationLogic {
+    IEnumerable<string> VariableNames { get; }
+    ITransactionalPreprocessingData PreProcessingData { get; }
     void ReOrderToIndices(IEnumerable<int> indices);
     void ReOrderToIndices(IList<Tuple<int, int>> indices);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/IPreprocessingData.cs

@@ -41 +41 @@
 
     void SetValues<T>(int columnIndex, IList<T> values);
+    bool SetValue(string value, int columnIndex, int rowIndex);
 
     void InsertRow(int rowIndex);
     void DeleteRow(int rowIndex);
-
+    void DeleteRowsWithIndices(IEnumerable<int> rows);
     void InsertColumn<T>(string variableName, int columnIndex);
 
     void DeleteColumn(int columnIndex);
 
-    IntRange TrainingPartition { get; }
+    bool AreAllStringColumns(IEnumerable<int> columnIndices);
+    bool Validate(string value, out string errorMessage, int columnIndex);
+    
+      IntRange TrainingPartition { get; }
     IntRange TestPartition { get; }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Interfaces/ISearchLogic.cs

@@ -24 +24 @@
 namespace HeuristicLab.DataPreprocessing {
   public interface ISearchLogic {
+
+    int Rows { get; }
+    int Columns { get; }
+    IEnumerable<string> VariableNames { get; }
+
     /// <summary>
     /// Return the indices of the missing values where the key