Changeset 10256 for branches

Timestamp:

12/18/13 16:33:52 (11 years ago)

Author:

rstoll

Message:

Fixed View error

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/PreprocessingDataManipulation.cs (modified) (2 diffs)
• Interfaces/IPreprocessingDataManipulation.cs (modified) (1 diff)
• Views/DataPreprocessingView.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingDataManipulation.cs

@@ -5 +5 @@
 
 namespace HeuristicLab.DataPreprocessing {
-  class PreprocessingDataManipulation : IPreprocessingDataManipulation {
+  public class PreprocessingDataManipulation : IPreprocessingDataManipulation {
     private IPreprocessingData preprocessingData;
     private IStatisticsLogic statisticInfo;
@@ -115 +115 @@
         }
 
-        reOrdertoIndices(shuffledIndices);
+        reOrderToIndices(shuffledIndices);
       }
     }
 
-    public void reOrdertoIndices(IEnumerable<int> indices)
-    {
-        List<Tuple<int, int>> indicesTuple = new List<Tuple<int, int>>();
- 
-        for (int i = 0; i < indices.Count(); ++i) {
-            new Tuple<int, int>(i, indices.ElementAt(i));
-        }
+    public void reOrderToIndices(IEnumerable<int> indices) {
+      List<Tuple<int, int>> indicesTuple = new List<Tuple<int, int>>();
 
-        reOrdertoIndices(indicesTuple);
+      for (int i = 0; i < indices.Count(); ++i) {
+        new Tuple<int, int>(i, indices.ElementAt(i));
+      }
+
+      reOrderToIndices(indicesTuple);
     }
 
-    public void reOrdertoIndices(IList<Tuple<int, int>> indices) {
+    public void reOrderToIndices(IList<System.Tuple<int, int>> indices) {
       foreach (string variableName in preprocessingData.VariableNames) {
         if (preprocessingData.IsType<double>(variableName)) {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingDataManipulation.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 namespace HeuristicLab.DataPreprocessing {
-  interface IPreprocessingDataManipulation {
+  public interface IPreprocessingDataManipulation {
+    void reOrderToIndices(IEnumerable<int> indices);
     void reOrderToIndices(IList<Tuple<int, int>> indices);
     void ReplaceIndicesByAverageValue(string variableName, IEnumerable<int> indices);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.cs

@@ -40 +40 @@
 
     private void InitializeContents() {
-      dataGridContent = new DataGridContent(new DataGridLogic(Content != null ? this.Content.Data : null));
+      IPreprocessingData data = Content != null ? this.Content.Data : null;
+      ISearchLogic searchLogic = new SearchLogic(data);
+      dataGridContent = new DataGridContent(new DataGridLogic(data), new PreprocessingDataManipulation(data, searchLogic, new StatisticsLogic(data, searchLogic)));
 
       listViewItemItemMapping = new Dictionary<ListViewItem, IItem>();