Changeset 10413 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Timestamp:

01/28/14 19:12:39 (10 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.

File:

• branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/SlidingWindowBestSolutionsCollectionView.cs (modified) (3 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) {