Changeset 13037 for branches/ALPS/HeuristicLab.Algorithms.ALPS

Timestamp:

10/19/15 17:33:06 (9 years ago)

Author:

pfleck

Message:

#2269 When creating a new layer, reset the old results (e.g. quality chart) to NaN to symbolize that the layer did not exist during that time.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerCreator.cs (modified) (3 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerCreator.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -28 +27 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -73 +73 @@
       scopes.Add(clone);
 
+      // Set new layernumber
       clone.Variables["Layer"].Value = new IntValue(OpenLayersParameter.ActualValue.Value);
+
+      // Decrement ages, because MainOperator is goint to increment it
       foreach (var solution in clone.SubScopes)
-        ((IntValue)solution.Variables["Age"].Value).Value -= 1; // Decrement age, because MainOperator is goint to increment it
-      //foreach (var variable in clone.Variables.Where(v => !SavedVariables.Contains(v.Name)))
-      //  variable.Value = null;
+        ((IntValue)solution.Variables["Age"].Value).Value -= 1;
 
-      //HACK: delete old values from quality table
-      /*var rows = ((DataTable)clone.Variables["Qualities"].Value).Rows;
-      var last = rows.Last();
-      rows.Clear();
-      rows.Add(last);*/
+      // Reset existing values in the results to NaN to symbolize that no layer existed during that duration
+      var results = (ResultCollection)clone.Variables["LayerResults"].Value;
+      ResetResults(results);
 
       return base.Apply();
     }
 
+    private void ResetResults(ResultCollection results) {
+      var values = results.Select(r => r.Value);
+
+      // Reset all values within results in results
+      foreach (var resultsCollection in values.OfType<ResultCollection>())
+        ResetResults(resultsCollection);
+
+      // Reset values
+      foreach (var dataTable in values.OfType<DataTable>()) {
+        foreach (var row in dataTable.Rows)
+          for (int i = 0; i < row.Values.Count; i++)
+            row.Values[i] = double.NaN;
+      }
+    }
+
   }
 }