Changeset 4848

Timestamp:

11/19/10 11:23:37 (14 years ago)

Author:

gkronber

Message:

Reviewed classes HeatMap, HeatMapHistory, PopulationDiversityAnalyzer, DataTableHistory, !TSPPopulationDiversityAnalyzer and made minor changes. #1188

Location:

trunk/sources/HeuristicLab.Analysis/3.3

Files:

• HeatMap.cs (modified) (1 diff)
• PopulationDiversityAnalyzer.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/HeatMap.cs

@@ -39 +39 @@
       get { return title; }
       set {
-        if (!(title.Equals(value) || (value == null) && (title == string.Empty))) {
-          title = value == null ? string.Empty : value;
+        if (value == null) value = string.Empty;
+        if (title != value) {
+          title = value;
           OnTitleChanged();
         }

trunk/sources/HeuristicLab.Analysis/3.3/PopulationDiversityAnalyzer.cs

@@ -75 +75 @@
       int updateInterval = UpdateIntervalParameter.Value.Value;
       IntValue updateCounter = UpdateCounterParameter.ActualValue;
+      // if counter does not yet exist then initialize it with update interval 
+      // to make sure the solutions are analyzed on the first application of this operator
       if (updateCounter == null) {
         updateCounter = new IntValue(updateInterval);
@@ -80 +82 @@
       } else updateCounter.Value++;
 
+      //analyze solutions only every 'updateInterval' times
       if (updateCounter.Value == updateInterval) {
         updateCounter.Value = 0;
@@ -93 +96 @@
           T[] sortedSolutions = null;
           if (max)
-            sortedSolutions = solutions.Select((x, index) => new { Solution = x, Quality = qualities[index] }).OrderByDescending(x => x.Quality).Select(x => x.Solution).ToArray();
-          else
-            sortedSolutions = solutions.Select((x, index) => new { Solution = x, Quality = qualities[index] }).OrderBy(x => x.Quality).Select(x => x.Solution).ToArray();
+            sortedSolutions = solutions
+              .Select((x, index) => new { Solution = x, Quality = qualities[index] })
+              .OrderByDescending(x => x.Quality)
+              .Select(x => x.Solution)
+              .ToArray();
+          else
+            sortedSolutions = solutions
+              .Select((x, index) => new { Solution = x, Quality = qualities[index] })
+              .OrderBy(x => x.Quality)
+              .Select(x => x.Solution)
+              .ToArray();
 
           // calculate solution similarities
@@ -102 +113 @@
           // calculate minimum, average and maximum similarities
           double similarity;
-          double[] minSimilarities = new double[sortedSolutions.Length];
-          double[] avgSimilarities = new double[sortedSolutions.Length];
-          double[] maxSimilarities = new double[sortedSolutions.Length];
+          double[] minSimilarities = new double[count];
+          double[] avgSimilarities = new double[count];
+          double[] maxSimilarities = new double[count];
           for (int i = 0; i < count; i++) {
             minSimilarities[i] = 1;