Changeset 9341

Timestamp:

04/02/13 22:39:11 (11 years ago)

Author:

ascheibe

Message:

#1886 some minor AB fixes

Location:

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

Files:

• MutationPerformanceAnalyzer.cs (modified) (2 diffs)
• SelectionPressureAnalyzer.cs (modified) (1 diff)
• WorstQualityAnalyzer.cs (modified) (5 diffs)

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

@@ -133 +133 @@
         SimilarityCalculatorParameter.Value = OperatorsParameter.ActualValue.OfType<ISingleObjectiveSolutionSimilarityCalculator>().FirstOrDefault();
       }
-      qualityPlotHelper.InitializePlot(Results, "Mutation Quality", "Solution Index", "Absolut Quality Difference");
+      qualityPlotHelper.InitializePlot(Results, "Mutation Performance compared to parent", "Solution Index", "Absolut Quality Difference");
       diversityPlotHelper.InitializePlot(Results, "Mutation Diversity", "Solution Index", "Diversity");
       successHelper.InitializeChart(Results, "Successfull Mutations", new string[] { "Successfull Mutations per Generation" });
@@ -184 +184 @@
       if (GenerationsParameter.ActualValue.Value != 0) {
         if (GenerationsParameter.ActualValue.Value > lastGeneration) {
-          successHelper.AddPoint((double)success / (cnt - 1));
+          if (cnt > 1) {
+            successHelper.AddPoint((double)success / (cnt - 1));
+          } else {
+            successHelper.AddPoint(0.0);
+          }
 
           Reset();

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

@@ -92 +92 @@
       SolutionQualityName = "TSPTourLength";
 
-      selPressurePlot = new ScatterPlotHelper(false, true, true, false);
+      selPressurePlot = new ScatterPlotHelper(false, true, true, true);
     }
 

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

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +34 @@
   public class WorstQualityAnalyzer : SingleSuccessorOperator, IStatefulItem {
     private const string GenerationsParameterName = "Generations";
+    private const string ResultsParameterName = "Results";
 
     public IValueLookupParameter<BoolValue> MaximizationParameter {
@@ -45 +47 @@
     public ILookupParameter<DoubleValue> WorstKnownQualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["WorstKnownQuality"]; }
+    }
+    public ILookupParameter<ResultCollection> ResultsParameter {
+      get { return (ILookupParameter<ResultCollection>)Parameters[ResultsParameterName]; }
     }
     [Storable]
@@ -63 +68 @@
       Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "Nr of generations."));
       Parameters.Add(new LookupParameter<DoubleValue>("WorstKnownQuality", "The quality of the worst known solution of this problem."));
+      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should be stored."));
     }
 
@@ -90 +96 @@
         }
       } else {
-        if (WorstKnownQualityParameter.ActualValue == null)
+        if (WorstKnownQualityParameter.ActualValue == null) {
           AddVariableToGlobalScope("WorstKnownQuality", "The quality of the worst known solution of this problem.", new DoubleValue(upperBound));
+          ResultsParameter.ActualValue.Add(new Result("WorstQuality", new DoubleValue(upperBound)));
+        }
       }