Changeset 10413

Timestamp:

01/28/14 19:12:39 (11 years ago)

Author:

bburlacu

Message:

#1837: Modified the SlidingWindowBestSolutionsCollection to use a dictionary for sliding window positions mapped to best solutions, because the last sliding window position before the algorithm reached its stop was not registered correctly.

Location:

branches/Sliding Window GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowBestSolutionsCollectionView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowBestSolutionsCollection.cs (modified) (4 diffs)

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

@@ -64 +64 @@
       var dataGridView = (DataGridView)sender;
       var cell = dataGridView.SelectedCells[0];
-      var bestSolutions = Content.BestSolutions.ToList();
+      var bestSolutions = Content.BestSolutions.Values.ToList();
       var tree = bestSolutions[cell.RowIndex];
       var model = Content.CreateModel(tree, Content.Interpreter);
@@ -115 +115 @@
 
     private void UpdateQualitiesMap() {
-      var bestSolutions = Content.BestSolutions.ToList();
-      var swPositions = Content.SlidingWindowPositions.ToList();
+      var bestSolutions = Content.BestSolutions.Values.ToList();
+      var swPositions = Content.BestSolutions.Keys.ToList();
       var qualitiesMap = new DoubleMatrix(bestSolutions.Count, swPositions.Count + 1);
-      qualitiesMap.ColumnNames = Content.SlidingWindowPositions.Select(x => x.Start + "-" + x.End).Concat(new List<string> { "Training" });
+      qualitiesMap.ColumnNames = swPositions.Select(x => x.Item1 + "-" + x.Item2).Concat(new List<string> { "Training" });
       qualitiesMap.RowNames = Enumerable.Range(1, bestSolutions.Count).Select(x => "M" + x);
       double min = 0, max = 0;
@@ -124 +124 @@
       for (int i = 0; i < qualitiesMap.Columns - 1; ++i) {
         var pos = swPositions[i];
-        var rows = Enumerable.Range(pos.Start, pos.End - pos.Start).ToList();
+        var rows = Enumerable.Range(pos.Item1, pos.Item2 - pos.Item1).ToList();
 
         for (int j = 0; j < qualitiesMap.Rows; ++j) {

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

@@ -138 +138 @@
       }
 
+      SaveBestSolution();
+
       if (!CheckForUpdate()) return base.Apply();
-
-      SaveBestSolution();
 
       //update necessary - move sliding window
@@ -189 +189 @@
       var fitnessPartition = FitnessCalculationPartitionParameter.ActualValue;
       var best = FindBestIndividual();
-      var range = new IntRange(fitnessPartition.Start, fitnessPartition.End);
+      var range = new Tuple<int, int>(fitnessPartition.Start, fitnessPartition.End);
 
-      bestSolutionsCollection.Add(best, range);
+      bestSolutionsCollection[range] = best;
     }
 

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
+using SlidingWindowRange = System.Tuple<int, int>;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -31 +32 @@
   [Item("SlidingWindowBestSolutionsCollection", "An object holding a collection of the best sliding window solutions.")]
   public abstract class SlidingWindowBestSolutionsCollection : Item {
-
-    private List<ISymbolicExpressionTree> bestSolutions;
     [Storable]
-    public IEnumerable<ISymbolicExpressionTree> BestSolutions {
+    private Dictionary<SlidingWindowRange, ISymbolicExpressionTree> bestSolutions;
+    public Dictionary<SlidingWindowRange, ISymbolicExpressionTree> BestSolutions {
       get { return bestSolutions; }
-      set { bestSolutions = new List<ISymbolicExpressionTree>(value); }
-    }
-
-    private List<IntRange> slidingWindowPositions;
-    [Storable]
-    public IEnumerable<IntRange> SlidingWindowPositions {
-      get { return slidingWindowPositions; }
-      set { slidingWindowPositions = new List<IntRange>(value); }
+      set { bestSolutions = value; }
     }
 
@@ -68 +61 @@
       : base(original, cloner) {
       this.bestSolutions = original.bestSolutions;
-      this.slidingWindowPositions = original.slidingWindowPositions;
       this.problemData = original.problemData;
       this.interpreter = original.interpreter;
     }
     protected SlidingWindowBestSolutionsCollection() {
-      bestSolutions = new List<ISymbolicExpressionTree>();
-      slidingWindowPositions = new List<IntRange>();
+      bestSolutions = new Dictionary<SlidingWindowRange, ISymbolicExpressionTree>();
     }
 
-    public void Add(ISymbolicExpressionTree solution, IntRange range) {
-      if (bestSolutions == null) bestSolutions = new List<ISymbolicExpressionTree>();
-      bestSolutions.Add(solution);
-      if (slidingWindowPositions == null) slidingWindowPositions = new List<IntRange>();
-      slidingWindowPositions.Add(range);
+    public bool ContainsKey(SlidingWindowRange key) {
+      return bestSolutions.ContainsKey(key);
+    }
+
+    public ISymbolicExpressionTree this[SlidingWindowRange key] {
+      get {
+        return bestSolutions[key];
+      }
+      set {
+        if (bestSolutions.ContainsKey(key))
+          bestSolutions[key] = value;
+        else
+          bestSolutions.Add(key, value);
+      }
+    }
+
+    public void Add(SlidingWindowRange range, ISymbolicExpressionTree solution) {
+      bestSolutions.Add(range, solution);
     }
 
     public void Clear() {
       if (bestSolutions != null) bestSolutions.Clear();
-      if (slidingWindowPositions != null) slidingWindowPositions.Clear();
     }
 
@@ -92 +95 @@
      double lowerEstimationLimit = double.MinValue, double upperEstimationLimit = double.MaxValue);
 
-    public abstract ISymbolicDataAnalysisSolution CreateSolution(ISymbolicDataAnalysisModel model,
-      IDataAnalysisProblemData problemData);
+    public abstract ISymbolicDataAnalysisSolution CreateSolution(ISymbolicDataAnalysisModel model, IDataAnalysisProblemData problemData);
   }
 }