Changeset 9058

Timestamp:

12/14/12 15:12:56 (11 years ago)

Author:

ascheibe

Message:

#1886 also track quality of solutions

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionToPopulationAnalyzer.cs (modified) (7 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionToPopulationAnalyzer.cs

@@ -38 +38 @@
 
     #region Parameter properties
+    public IValueLookupParameter<BoolValue> MaximizationParameter {
+      get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
+    }
     public ILookupParameter<ResultCollection> ResultsParameter {
       get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
@@ -66 +69 @@
     }
     [Storable]
-    private ScatterPlotHelper populationDiversityPlot, populationQualityPlot;
+    private ScatterPlotHelper populationDiversityPlot, populationQualityPlot, qualityPlot;
     [Storable]
     private int cnt = 0;
@@ -81 +84 @@
       populationDiversityPlot = (ScatterPlotHelper)populationDiversityPlot.Clone(cloner);
       populationQualityPlot = (ScatterPlotHelper)populationQualityPlot.Clone(cloner);
+      qualityPlot = (ScatterPlotHelper)qualityPlot.Clone(cloner);
     }
 
@@ -94 +98 @@
       Parameters.Add(new ValueParameter<StringValue>("ChartPostfix", new StringValue(string.Empty)));
       Parameters.Add(new LookupParameter<ItemCollection<IItem>>("Operators", "The operators and items that the problem provides to the algorithms."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, false otherwise"));
 
       populationDiversityPlot = new ScatterPlotHelper(false, true);
       populationQualityPlot = new ScatterPlotHelper(false, true);
+      qualityPlot = new ScatterPlotHelper(false, true);
     }
 
@@ -110 +116 @@
       populationDiversityPlot.InitializePlot(Results, "Solution to Population Diversity " + ChartPostfixParameter.Value.Value, "Solution Index", "Diversity");
       populationQualityPlot.InitializePlot(Results, "Solution Quality Difference to Population " + ChartPostfixParameter.Value.Value, "Solution Index", "Quality Difference");
+      qualityPlot.InitializePlot(Results, "Solution Quality " + ChartPostfixParameter.Value.Value, "Solution Index", "Quality");
 
       Reset();
@@ -147 +154 @@
         }
 
-        var diversityPoint = new Point2D<double>(cnt++, solToPopDiversity / popSize);
-        var qualityPoint = new Point2D<double>(cnt, Math.Abs((oldPopQuality / popSize) - quality));
+        Point2D<double> popQualityPoint;
+        if (MaximizationParameter.ActualValue.Value) {
+          popQualityPoint = new Point2D<double>(cnt, quality - (oldPopQuality / popSize));
+        } else {
+          popQualityPoint = new Point2D<double>(cnt, (oldPopQuality / popSize) - quality);
+        }
+
+        Point2D<double> solQuality = new Point2D<double>(cnt, quality);
+        Point2D<double> diversityPoint = new Point2D<double>(cnt++, solToPopDiversity / popSize);
 
         populationDiversityPlot.AddPoint(curGenStr, diversityPoint);
-        populationQualityPlot.AddPoint(curGenStr, qualityPoint);
+        populationQualityPlot.AddPoint(curGenStr, popQualityPoint);
+        qualityPlot.AddPoint(curGenStr, solQuality);
       }
 
@@ -165 +180 @@
       populationQualityPlot.CleanUp();
       populationDiversityPlot.CleanUp();
+      qualityPlot.CleanUp();
     }