Changeset 9145

Timestamp:

01/11/13 13:03:54 (11 years ago)

Author:

mkommend

Message:

#1837: Improved Sliding Window Analyzers to work with user defined algorithms.

Location:

branches/Sliding Window GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/GenerationalSlidingWindowAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowAnalyzer.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs (modified) (2 diffs)
• Regression Sliding Window GA.hl (added)

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

@@ -74 +74 @@
       Parameters.Add(new FixedValueParameter<IntValue>(GenerationsIntervalParameterName, "", new IntValue(5)));
       Parameters.Add(new FixedValueParameter<IntValue>(GenerationsIntervalStartParameterName, "", new IntValue(0)));
-
-      GenerationsIntervalStartParameter.Hidden = true;
     }
 

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

@@ -38 +38 @@
     private const string SlidingWindowSizeParameterName = "Sliding Window Size";
     private const string SlidingWindowStepWidthParameterName = "Sliding Window Step Width";
+    private const string InitialSlidingWindowParameterName = "Initial Sliding Window";
 
     private const string SlidingWindowDataResultName = "Sliding Window";
@@ -58 +59 @@
       get { return (IFixedValueParameter<IntValue>)Parameters[SlidingWindowStepWidthParameterName]; }
     }
+    public IFixedValueParameter<IntRange> InitialSlidingWindowParameter {
+      get {
+        return (IFixedValueParameter<IntRange>)Parameters[InitialSlidingWindowParameterName];
+      }
+    }
     #endregion
 
@@ -64 +70 @@
     public IntValue SlidingWindowSize { get { return SlidingWindowSizeParameter.Value; } }
     public IntValue SlidingWindowStepWidth { get { return SlidingWindowStepWidthParameter.Value; } }
+    public IntRange InitialSlidingWindow { get { return InitialSlidingWindowParameter.Value; } }
     #endregion
 
@@ -78 +85 @@
       Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowSizeParameterName, "", new IntValue(1)));
       Parameters.Add(new FixedValueParameter<IntValue>(SlidingWindowStepWidthParameterName, "", new IntValue(1)));
+      Parameters.Add(new FixedValueParameter<IntRange>(InitialSlidingWindowParameterName, "", new IntRange(0, 1)));
+
+      FitnessCalculationPartitionParameter.ActualName = "Sliding Window";
     }
 
     public override IOperation Apply() {
-      if (CheckForUpdate()) {
+      if (FitnessCalculationPartitionParameter.ActualValue == null) {
+        FitnessCalculationPartitionParameter.ActualValue = (IntRange)InitialSlidingWindow.Clone();
+      } else if (CheckForUpdate()) {
         var fitnessPartition = FitnessCalculationPartitionParameter.ActualValue;
         if (fitnessPartition.End - fitnessPartition.Start == SlidingWindowSize.Value)
@@ -89 +101 @@
         if (fitnessPartition.End - fitnessPartition.Start > SlidingWindowSize.Value)
           fitnessPartition.End = fitnessPartition.Start + SlidingWindowSize.Value;
+
+        //TODO check if fitnesspartition exceeds training partition
       }
 
@@ -109 +123 @@
       slidingWindowData.SlidingWindowPosition.Start = FitnessCalculationPartitionParameter.ActualValue.Start;
       slidingWindowData.SlidingWindowPosition.End = FitnessCalculationPartitionParameter.ActualValue.End;
+
       return base.Apply();
     }

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

@@ -231 +231 @@
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeLengthAnalyzer());
       Operators.Add(new SymbolicExpressionTreeLengthAnalyzer());
-      Operators.Add(new GenerationalSlidingWindowAnalyzer<T>());
       ParameterizeOperators();
     }
@@ -351 +350 @@
         op.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       }
-
-      foreach (var op in operators.OfType<SlidingWindowAnalyzer<T>>()) {
-        op.FitnessCalculationPartitionParameter.ActualName = FitnessCalculationPartitionParameter.Name;
-        op.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
-
-        var start = ProblemData.TrainingPartition.Start;
-        var end = ProblemData.TrainingPartition.End;
-        var size = (end - start) / 5;
-        op.SlidingWindowSize.Value = size;
-        op.SlidingWindowStepWidth.Value = size / 2;
-      }
     }