Changeset 10221 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Timestamp:

12/11/13 17:21:25 (11 years ago)

Author:

pfleck

Message:

• Cloned Algorithm and swapped Dataset an other members of the DataAnalysisProblemData
• Refactored GetMostOuterContent

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Files:

• PreprocessingContext.cs (modified) (3 diffs)
• PreprocessingData.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing {
   [Item("PreprocessingContext", "PreprocessingContext")]
   public class PreprocessingContext : Item, IPreprocessingContext {
-    public PreprocessingContext(IPreprocessingData data, IItem parentItem) {
+    public PreprocessingContext(IPreprocessingData data, IItem parentItem, IDataAnalysisProblemData dataAnalysisProblemData) {
       Data = data;
       ParentItem = parentItem;
+      DataAnalysisProblemData = dataAnalysisProblemData;
     }
 
@@ -35 +37 @@
       Data = cloner.Clone(original.Data);
       ParentItem = original.ParentItem;
+      DataAnalysisProblemData = original.DataAnalysisProblemData;
     }
 
@@ -44 +47 @@
     public IItem ParentItem { get; private set; }
 
+    public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PreprocessingContext(this, cloner);

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

@@ -142 +142 @@
     }
 
+    public IntRange TrainingPartition {
+      get { return new IntRange(0, (int)(Rows * trainingToTestRatio)); }
+    }
+
+    public IntRange TestPartition {
+      get { return new IntRange((int)(Rows * trainingToTestRatio), Math.Max(Rows - 1, 0)); }
+    }
+
     public IEnumerable<string> VariableNames {
       get { return variableNames; }
@@ -155 +163 @@
 
     public int Rows {
-      get { return variableValues.Count; }
+      get { return variableValues[variableNames[0]].Count; }
     }
     public IDictionary<string, IEnumerable<int>> GetMissingValueIndices() {