Changeset 13508 for trunk/sources/HeuristicLab.DataPreprocessing/3.4/Logic

Timestamp:

01/14/16 17:51:48 (8 years ago)

Author:

pfleck

Message:

#2559

• Enabled type selection for creating/importing/exporting/applying.
• Deleted unnecessary interfaces.
• Reorganized source files of DataPreprocessing.

Location:

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Logic

Files:

• . (added)
• Filter (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/Filter)
• FilterLogic.cs (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/FilterLogic.cs) (1 diff)
• ManipulationLogic.cs (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationLogic.cs) (6 diffs)
• SearchLogic.cs (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/SearchLogic.cs) (2 diffs)
• StatisticsLogic.cs (copied) (copied from trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs) (8 diffs)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Logic/FilterLogic.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public class FilterLogic : IFilterLogic {
+  public class FilterLogic {
 
     public IFilteredPreprocessingData PreprocessingData { get; private set; }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Logic/ManipulationLogic.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public class ManipulationLogic : IManipulationLogic {
+  public class ManipulationLogic {
     private readonly ITransactionalPreprocessingData preprocessingData;
-    private readonly IStatisticsLogic statisticsLogic;
-    private readonly ISearchLogic searchLogic;
+    private readonly StatisticsLogic statisticsLogic;
+    private readonly SearchLogic searchLogic;
 
     public IEnumerable<string> VariableNames {
@@ -39 +39 @@
     }
 
-    public ManipulationLogic(ITransactionalPreprocessingData _prepocessingData, ISearchLogic theSearchLogic, IStatisticsLogic theStatisticsLogic) {
+    public ManipulationLogic(ITransactionalPreprocessingData _prepocessingData, SearchLogic theSearchLogic, StatisticsLogic theStatisticsLogic) {
       preprocessingData = _prepocessingData;
       searchLogic = theSearchLogic;
@@ -51 +51 @@
     }
 
-    public void ReplaceIndicesByAverageValue(IDictionary<int, IList<int>> cells, bool considerSelection) {
+    public void ReplaceIndicesByAverageValue(IDictionary<int, IList<int>> cells, bool considerSelection = false) {
       preprocessingData.InTransaction(() => {
         foreach (var column in cells) {
@@ -65 +65 @@
     }
 
-    public void ReplaceIndicesByMedianValue(IDictionary<int, IList<int>> cells, bool considerSelection) {
+    public void ReplaceIndicesByMedianValue(IDictionary<int, IList<int>> cells, bool considerSelection = false) {
       preprocessingData.InTransaction(() => {
         foreach (var column in cells) {
@@ -79 +79 @@
     }
 
-    public void ReplaceIndicesByRandomValue(IDictionary<int, IList<int>> cells, bool considerSelection) {
+    public void ReplaceIndicesByRandomValue(IDictionary<int, IList<int>> cells, bool considerSelection = false) {
       preprocessingData.InTransaction(() => {
         Random r = new Random();
@@ -209 +209 @@
     }
 
-    public void ReplaceIndicesByMostCommonValue(IDictionary<int, IList<int>> cells, bool considerSelection) {
+    public void ReplaceIndicesByMostCommonValue(IDictionary<int, IList<int>> cells, bool considerSelection = false) {
       preprocessingData.InTransaction(() => {
         foreach (var column in cells) {

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Logic/SearchLogic.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public class SearchLogic : ISearchLogic {
+  public class SearchLogic {
     private readonly ITransactionalPreprocessingData preprocessingData;
-    private readonly IFilterLogic filterLogic;
+    private readonly FilterLogic filterLogic;
 
     private Dictionary<int, IList<int>> MissingValueIndicies { get; set; }
@@ -44 +44 @@
     }
 
-    public SearchLogic(ITransactionalPreprocessingData thePreprocessingData, IFilterLogic theFilterLogic) {
+    public SearchLogic(ITransactionalPreprocessingData thePreprocessingData, FilterLogic theFilterLogic) {
       preprocessingData = thePreprocessingData;
       filterLogic = theFilterLogic;

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Logic/StatisticsLogic.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  public class StatisticsLogic : IStatisticsLogic {
+  public class StatisticsLogic {
 
     private readonly ITransactionalPreprocessingData preprocessingData;
-    private readonly ISearchLogic searchLogic;
-
-    public StatisticsLogic(ITransactionalPreprocessingData thePreprocessingData, ISearchLogic theSearchLogic) {
+    private readonly SearchLogic searchLogic;
+
+    public StatisticsLogic(ITransactionalPreprocessingData thePreprocessingData, SearchLogic theSearchLogic) {
       preprocessingData = thePreprocessingData;
       searchLogic = theSearchLogic;
@@ -71 +71 @@
     }
 
-    public T GetMin<T>(int columnIndex, bool considerSelection) where T : IComparable<T> {
+    public T GetMin<T>(int columnIndex, bool considerSelection = false) where T : IComparable<T> {
       var min = default(T);
       if (preprocessingData.VariableHasType<T>(columnIndex)) {
@@ -82 +82 @@
     }
 
-    public T GetMax<T>(int columnIndex, bool considerSelection) where T : IComparable<T> {
+    public T GetMax<T>(int columnIndex, bool considerSelection = false) where T : IComparable<T> {
       var max = default(T);
       if (preprocessingData.VariableHasType<T>(columnIndex)) {
@@ -93 +93 @@
     }
 
-    public double GetMedian(int columnIndex, bool considerSelection) {
+    public double GetMedian(int columnIndex, bool considerSelection = false) {
       double median = double.NaN;
       if (preprocessingData.VariableHasType<double>(columnIndex)) {
@@ -104 +104 @@
     }
 
-    public double GetAverage(int columnIndex, bool considerSelection) {
+    public double GetAverage(int columnIndex, bool considerSelection = false) {
       double avg = double.NaN;
       if (preprocessingData.VariableHasType<double>(columnIndex)) {
@@ -115 +115 @@
     }
 
-    public DateTime GetMedianDateTime(int columnIndex, bool considerSelection) {
+    public DateTime GetMedianDateTime(int columnIndex, bool considerSelection = false) {
       DateTime median = new DateTime();
       if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
@@ -123 +123 @@
     }
 
-    public DateTime GetAverageDateTime(int columnIndex, bool considerSelection) {
+    public DateTime GetAverageDateTime(int columnIndex, bool considerSelection = false) {
       DateTime avg = new DateTime();
       if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
@@ -131 +131 @@
     }
 
-    public T GetMostCommonValue<T>(int columnIndex, bool considerSelection) {
+    public T GetMostCommonValue<T>(int columnIndex, bool considerSelection = false) {
       var values = GetValuesWithoutNaN<T>(columnIndex, considerSelection);
       if (!values.Any())