Changeset 10235

Timestamp:

12/18/13 13:15:29 (10 years ago)

Author:

pfleck

Message:

Fixed bug with partition range.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs (modified) (1 diff)

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

@@ -36 +36 @@
 
     private IList<string> variableNames;
-    private IntRange trainingPartition;
-    private IntRange testPartition;
 
     private IDictionary<string, int> variableNameIndices;
@@ -75 +73 @@
       }
 
-      trainingPartition = problemData.TrainingPartition;
-      testPartition = problemData.TestPartition;
-
-      trainingToTestRatio = (double)problemData.TrainingPartition.Size / problemData.TestPartition.Size;
+      trainingToTestRatio = (double)problemData.TrainingPartition.Size / Math.Max(problemData.Dataset.Rows, double.Epsilon);
     }
 
@@ -147 +142 @@
 
     public IntRange TestPartition {
-      get { return new IntRange((int)(Rows * trainingToTestRatio), Math.Max(Rows - 1, 0)); }
+      get { return new IntRange((int)(Rows * trainingToTestRatio), Rows); }
     }
 

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Views/3.4/ProblemDataView.cs

@@ -107 +107 @@
 
       // TODO: ProblemDataView depends on DataPreprocessing
+      //ApplicationManager.Manager.GetInstances<IPreprocessingContext>();
       var context = new PreprocessingContext(preprocessingData, parentItem, Content);
       MainFormManager.MainForm.ShowContent(context);