Changeset 7850 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow

Timestamp:

05/21/12 10:30:41 (13 years ago)

Author:

mkommend

Message:

#1837: Added view for sliding window GP and updated analyzer.

Location:

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

Files:

• GenerationalSlidingWindowAnalyzer.cs (modified) (2 diffs)
• SlidingWindowAnalyzer.cs (modified) (7 diffs)

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

@@ -72 +72 @@
       Parameters.Add(new LookupParameter<IntValue>(IterationsParameterName, ""));
       Parameters.Add(new ValueLookupParameter<IntValue>(MaximumIterationsParameterName, ""));
-      Parameters.Add(new FixedValueParameter<IntValue>(GenerationsIntervalParameterName, "", new IntValue(0)));
-      Parameters.Add(new FixedValueParameter<IntValue>(GenerationsIntervalStartParameterName, "", new IntValue(10)));
+      Parameters.Add(new FixedValueParameter<IntValue>(GenerationsIntervalParameterName, "", new IntValue(5)));
+      Parameters.Add(new FixedValueParameter<IntValue>(GenerationsIntervalStartParameterName, "", new IntValue(0)));
+
+      GenerationsIntervalStartParameter.Hidden = true;
     }
 
@@ -80 +82 @@
       var start = GenerationsIntervalStart.Value;
       var step = GenerationsInterval.Value;
+      if (iteration == 0) return false;
       if (iteration < start) return false;
-
       if ((iteration - start) % step == 0) return true;
 

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +36 @@
     private const string ResultCollectionParameterName = "Results";
     private const string FitnessCalculationPartitionParameterName = "FitnessCalculationPartition";
-    private const string SlidingWindowParameterName = "Sliding Window";
     private const string SlidingWindowSizeParameterName = "Sliding Window Size";
     private const string SlidingWindowStepWidthParameterName = "Sliding Window Step Width";
@@ -52 +52 @@
     }
 
-    public IValueLookupParameter<IntRange> SlidingWindowParameter {
-      get { return (IValueLookupParameter<IntRange>)Parameters[SlidingWindowParameterName]; }
-    }
     public IFixedValueParameter<IntValue> SlidingWindowSizeParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters[SlidingWindowSizeParameterName]; }
@@ -65 +62 @@
     #region properties
     public bool EnabledByDefault { get { return false; } }
-    public IntRange SlidingWindow { get { return SlidingWindowParameter.Value; } }
     public IntValue SlidingWindowSize { get { return SlidingWindowSizeParameter.Value; } }
     public IntValue SlidingWindowStepWidth { get { return SlidingWindowStepWidthParameter.Value; } }
@@ -77 +73 @@
 
     protected SlidingWindowAnalyzer() {
+      Parameters.Add(new LookupParameter<ResultCollection>(ResultCollectionParameterName, "The result collection to store the analysis results."));
       Parameters.Add(new ValueLookupParameter<T>(ProblemDataParameterName, "The problem data on which the symbolic data analysis solution should be evaluated."));
       Parameters.Add(new LookupParameter<IntRange>(FitnessCalculationPartitionParameterName, ""));
-      Parameters.Add(new ValueLookupParameter<IntRange>(SlidingWindowParameterName, ""));
       Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowSizeParameterName, "", new IntValue(1)));
       Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowStepWidthParameterName, "", new IntValue(1)));
@@ -85 +81 @@
 
     public override IOperation Apply() {
-      if (!ExecutionContext.Scope.Variables.ContainsKey(FitnessCalculationPartitionParameter.ActualName))
-        ExecutionContext.Scope.Variables.Add(new Core.Variable(FitnessCalculationPartitionParameter.ActualName, (IntRange)SlidingWindow.Clone()));
-
       if (CheckForUpdate()) {
         var fitnessPartition = FitnessCalculationPartitionParameter.ActualValue;
+        if (fitnessPartition.End - fitnessPartition.Start == SlidingWindowSize.Value)
+          fitnessPartition.Start += SlidingWindowStepWidth.Value;
 
         fitnessPartition.End += SlidingWindowStepWidth.Value;
-        if (fitnessPartition.End - fitnessPartition.Start > SlidingWindowStepWidth.Value)
+        if (fitnessPartition.End - fitnessPartition.Start > SlidingWindowSize.Value)
           fitnessPartition.End = fitnessPartition.Start + SlidingWindowSize.Value;
-
-        if (fitnessPartition.End - fitnessPartition.Start == SlidingWindowSize.Value) {
-          fitnessPartition.Start += SlidingWindowStepWidth.Value;
-        }
       }
 
@@ -104 +95 @@
       SlidingWindowData slidingWindowData;
       if (!results.ContainsKey(SlidingWindowDataResultName)) {
-        slidingWindowData = new SlidingWindowData(FitnessCalculationPartitionParameter.ActualValue, new double[10]);
+        string targetVariable;
+        var classificationProblemData = ProblemDataParameter.ActualValue as IClassificationProblemData;
+        var regressionProblemData = ProblemDataParameter.ActualValue as IRegressionProblemData;
+        if (classificationProblemData != null) targetVariable = classificationProblemData.TargetVariable;
+        else if (regressionProblemData != null) targetVariable = regressionProblemData.TargetVariable;
+        else throw new NotSupportedException();
+
+        var targetData = ProblemDataParameter.ActualValue.Dataset.GetDoubleValues(targetVariable);
+        slidingWindowData = new SlidingWindowData(FitnessCalculationPartitionParameter.ActualValue, targetData);
         results.Add(new Result(SlidingWindowDataResultName, slidingWindowData));
-      } else slidingWindowData = (SlidingWindowData)results[SlidingWindowDataResultName];
+      } else slidingWindowData = (SlidingWindowData)results[SlidingWindowDataResultName].Value;
 
       slidingWindowData.SlidingWindowPosition.Start = FitnessCalculationPartitionParameter.ActualValue.Start;