Changeset 15269 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data

Timestamp:

07/18/17 14:19:29 (7 years ago)

Author:

pfleck

Message:

#2809: Removed SearchLogic

Location:

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data

Files:

• FilteredPreprocessingData.cs (modified) (3 diffs)
• IPreprocessingData.cs (modified) (1 diff)
• PreprocessingData.cs (modified) (2 diffs)
• TransactionalPreprocessingData.cs (modified) (2 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public class FilteredPreprocessingData : NamedItem, IFilteredPreprocessingData {
+  public sealed class FilteredPreprocessingData : NamedItem, IFilteredPreprocessingData {
     private readonly ITransactionalPreprocessingData originalData;
     private ITransactionalPreprocessingData filteredData;
@@ -83 +83 @@
     }
 
-    protected FilteredPreprocessingData(FilteredPreprocessingData original, Cloner cloner)
+    private FilteredPreprocessingData(FilteredPreprocessingData original, Cloner cloner)
       : base(original, cloner) {
       originalData = original.originalData;
@@ -90 +90 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new FilteredPreprocessingData(this, cloner);
+    }
+
+    public bool IsCellEmpty(int columnIndex, int rowIndex) {
+      return ActiveData.IsCellEmpty(columnIndex, rowIndex);
     }
 

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/IPreprocessingData.cs

@@ -28 +28 @@
 namespace HeuristicLab.DataPreprocessing {
   public interface IPreprocessingData : INamedItem {
+    bool IsCellEmpty(int columnIndex, int rowIndex);
     T GetCell<T>(int columnIndex, int rowIndex);
 

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs

@@ -160 +160 @@
     }
 
+    public static bool IsMissingValue(object value) {
+      if (value is double) return double.IsNaN((double)value);
+      if (value is string) return string.IsNullOrEmpty((string)value);
+      if (value is DateTime) return ((DateTime)value).Equals(DateTime.MinValue);
+      throw new ArgumentException();
+    }
 
     #region IPreprocessingData Members
+    public abstract bool IsCellEmpty(int columnIndex, int rowIndex);
     public abstract T GetCell<T>(int columnIndex, int rowIndex);
 
@@ -173 +180 @@
 
     public abstract bool VariableHasType<T>(int columnIndex);
-
-    [Obsolete("use the index based variant, is faster")]
-    public abstract IList<T> GetValues<T>(string variableName, bool considerSelection);
 
     public abstract IList<T> GetValues<T>(int columnIndex, bool considerSelection);

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/TransactionalPreprocessingData.cs

@@ -88 +88 @@
 
     #region Overridden IPreprocessingData Members
+    public override bool IsCellEmpty(int columnIndex, int rowIndex) {
+      var value = variableValues[columnIndex][rowIndex];
+      return IsMissingValue(value);
+    }
+
     public override T GetCell<T>(int columnIndex, int rowIndex) {
       return (T)variableValues[columnIndex][rowIndex];
@@ -119 +124 @@
     public override bool VariableHasType<T>(int columnIndex) {
       return columnIndex >= variableValues.Count || variableValues[columnIndex] is List<T>;
-    }
-
-    [Obsolete("use the index based variant, is faster")]
-    public override IList<T> GetValues<T>(string variableName, bool considerSelection) {
-      return GetValues<T>(GetColumnIndex(variableName), considerSelection);
     }