Changeset 9870 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowData.cs

Timestamp:

08/07/13 17:00:16 (11 years ago)

Author:

bburlacu

Message:

#1837: Merged trunk changes and fixed sliding window visualization.

Location:

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4/SlidingWindow/SlidingWindowData.cs (modified) (6 diffs)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowData.cs

@@ -32 +32 @@
   [Item("Sliding Window Position", "")]
   public sealed class SlidingWindowData : Item {
-
     [Storable]
     private IntRange slidingWindowPosition;
@@ -39 +38 @@
     }
 
-    [Storable]
-    private IEnumerable<double> targetValues;
     public IEnumerable<double> TargetValues {
-      get { return targetValues; }
+      get {
+        return problemData.Dataset.GetDoubleValues(GetTargetVariableName(problemData), problemData.TrainingIndices);
+      }
     }
 
@@ -56 +55 @@
     }
 
+    [Storable]
+    private readonly IDataAnalysisProblemData problemData;
+
+    public IDataAnalysisProblemData ProblemData {
+      get { return problemData; }
+    }
+
+    public int TrainingPartitionStart {
+      get { return problemData.TrainingPartition.Start; }
+    }
+
+    public int TrainingPartitionEnd {
+      get { return problemData.TrainingPartition.End; }
+    }
+
     [StorableConstructor]
     private SlidingWindowData(bool deserializing) : base(deserializing) { }
@@ -61 +75 @@
       : base(original, cloner) {
       slidingWindowPosition = cloner.Clone(original.slidingWindowPosition);
-      targetValues = new List<double>(original.targetValues);
+      problemData = cloner.Clone(original.ProblemData);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -67 +81 @@
     }
 
-    public SlidingWindowData(IntRange slidingWindowPosition, IEnumerable<double> targetValues)
+    public SlidingWindowData(IntRange slidingWindowPosition, IDataAnalysisProblemData problemData)
       : base() {
       this.slidingWindowPosition = slidingWindowPosition;
-      this.targetValues = targetValues.ToArray();
+      this.problemData = (IDataAnalysisProblemData)problemData.Clone();
     }
 
@@ -78 +92 @@
       if (handler != null) EstimatedValuesChanged(this, EventArgs.Empty);
     }
+
+    private string GetTargetVariableName(IDataAnalysisProblemData problemData) {
+      var classificationProblemData = problemData as IClassificationProblemData;
+      var regressionProblemData = problemData as IRegressionProblemData;
+      string targetVariable;
+      if (classificationProblemData != null) targetVariable = classificationProblemData.TargetVariable;
+      else if (regressionProblemData != null) targetVariable = regressionProblemData.TargetVariable;
+      else throw new NotSupportedException();
+      return targetVariable;
+    }
   }
 }