Changeset 9185 for branches

Timestamp:

01/24/13 01:06:46 (12 years ago)

Author:

ascheibe

Message:

#1886 fixed scaling of qualities

Location:

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

Files:

• AfterCrossoverCombinedOperator.cs (modified) (2 diffs)
• CombinedOperators/QAPAfterCrossoverCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/TFAfterCrossoverCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/VRPAfterCrossoverCombinedOperator.cs (modified) (1 diff)
• CrossoverPerformanceAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• MutationPerformanceAnalyzer.cs (modified) (3 diffs)
• ScatterPlotHelper.cs (modified) (4 diffs)
• SolutionToPopulationAnalyzer.cs (modified) (3 diffs)
• WorstQualityAnalyzer.cs (added)

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

@@ -40 +40 @@
     protected VariableDuplicator varDuplicator;
 
+    [Storable]
+    protected WorstQualityAnalyzer wqAnalyzer;
+
     public ILookupParameter<IEvaluator> EvaluatorParameter {
       get { return ((LookupParameter<IEvaluator>)Parameters["Evaluator"]); }
@@ -79 +82 @@
       solToPopAnalyzer = new SolutionToPopulationAnalyzer();
       solToPopAnalyzer.ChartPostfixParameter.Value = new Data.StringValue("after Crossover");
+      wqAnalyzer = new WorstQualityAnalyzer();
 
+      Operators.Add(wqAnalyzer);
       Operators.Add(EvaluatorParameter.ActualValue);
       Operators.Add(cxAnalyzer);

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperators/QAPAfterCrossoverCombinedOperator.cs

@@ -63 +63 @@
       solToPopAnalyzer.SolutionParameter.ActualName = "Assignment";
       solToPopAnalyzer.QualityParameter.ActualName = "Quality";
+
+      wqAnalyzer.ParentsQualityParameter.ActualName = "Quality";
     }
   }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperators/TFAfterCrossoverCombinedOperator.cs

@@ -59 +59 @@
       solToPopAnalyzer.SolutionParameter.ActualName = "Point";
       solToPopAnalyzer.QualityParameter.ActualName = "Quality";
+
+      wqAnalyzer.ParentsQualityParameter.ActualName = "Quality";
       //TODO: add unwanted mutation analyzer for TF
     }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperators/VRPAfterCrossoverCombinedOperator.cs

@@ -59 +59 @@
       solToPopAnalyzer.SolutionParameter.ActualName = "VRPTours";
       solToPopAnalyzer.QualityParameter.ActualName = "Quality";
+
+      wqAnalyzer.ParentsQualityParameter.ActualName = "Quality";
     }
   }

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

@@ -67 +67 @@
       get { return (ILookupParameter<ItemCollection<IItem>>)Parameters["Operators"]; }
     }
+    public ILookupParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
+    }
+    public ILookupParameter<DoubleValue> WorstKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["WorstKnownQuality"]; }
+    }
     #endregion
 
@@ -124 +130 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, false otherwise"));
       Parameters.Add(new ValueLookupParameter<ItemCollection<DoubleValue>>("ComparisonFactor", "Determines if the quality should be compared to the better parent (1.0), to the worse (0.0) or to any linearly interpolated value between them."));
-
+      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
+      Parameters.Add(new LookupParameter<DoubleValue>("WorstKnownQuality", "The quality of the worst known solution of this problem."));
 
       worseParentCrossoverPerformancePlot = new ScatterPlotHelper(false, true, true);
@@ -172 +179 @@
       }
       successHelper.InitializeChart(Results, "Successfull Crossovers", successfullCXRowNames.ToArray());
+
       Reset();
     }
@@ -234 +242 @@
       }
 
+      if (GenerationsParameter.ActualValue.Value == 1) {
+        double bkQuality = BestKnownQualityParameter.ActualValue.Value;
+        double wkQuality = WorstKnownQualityParameter.ActualValue.Value;
+
+        if (MaximizationParameter.ActualValue.Value) {
+          if (worseParentCrossoverPerformancePlot.Max == double.MinValue) {
+            worseParentCrossoverPerformancePlot.Max = bkQuality - wkQuality;
+            betterParentCrossoverPerformancePlot.Max = bkQuality - wkQuality;
+            parentQualityHelper.Max = bkQuality - wkQuality;
+            worseParentCrossoverPerformancePlot.Min = 0;
+            betterParentCrossoverPerformancePlot.Min = 0;
+            parentQualityHelper.Min = 0;
+          }
+        } else {
+          if (worseParentCrossoverPerformancePlot.Min == double.MaxValue) {
+            worseParentCrossoverPerformancePlot.Max = wkQuality - bkQuality;
+            betterParentCrossoverPerformancePlot.Max = wkQuality - bkQuality;
+            parentQualityHelper.Max = wkQuality - bkQuality;
+            worseParentCrossoverPerformancePlot.Min = 0;
+            betterParentCrossoverPerformancePlot.Min = 0;
+            parentQualityHelper.Min = 0;
+          }
+        }
+      }
+
       if (GenerationsParameter.ActualValue.Value != 0) {
         if (GenerationsParameter.ActualValue.Value > lastGeneration) {

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

@@ -113 +113 @@
     <Compile Include="CombinedOperators\QAPAfterMutationCombinedOperator.cs" />
     <Compile Include="CombinedOperators\QAPAfterCrossoverCombinedOperator.cs" />
+    <Compile Include="WorstQualityAnalyzer.cs" />
     <Compile Include="InitializableOperator.cs" />
     <Compile Include="SolutionToPopulationAnalyzer.cs" />

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

@@ -63 +63 @@
     public IValueParameter<ISingleObjectiveSolutionSimilarityCalculator> SimilarityCalculatorParameter {
       get { return (IValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
+    }
+    public ILookupParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
+    }
+    public ILookupParameter<DoubleValue> WorstKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["WorstKnownQuality"]; }
     }
     #endregion
@@ -111 +117 @@
       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"));
+      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
+      Parameters.Add(new LookupParameter<DoubleValue>("WorstKnownQuality", "The quality of the worst known solution of this problem."));
 
       diversityPlotHelper = new ScatterPlotHelper(false, true);
@@ -157 +165 @@
       }
 
+      if (GenerationsParameter.ActualValue.Value == 1) {
+        double bkQuality = BestKnownQualityParameter.ActualValue.Value;
+        double wkQuality = WorstKnownQualityParameter.ActualValue.Value;
+
+        if (MaximizationParameter.ActualValue.Value) {
+          if (qualityPlotHelper.Max == double.MinValue) {
+            qualityPlotHelper.Max = bkQuality - wkQuality;
+            qualityPlotHelper.Min = 0;
+          }
+        } else {
+          if (qualityPlotHelper.Min == double.MaxValue) {
+            qualityPlotHelper.Max = wkQuality - bkQuality;
+            qualityPlotHelper.Min = 0;
+          }
+        }
+      }
+
       if (GenerationsParameter.ActualValue.Value != 0) {
         if (GenerationsParameter.ActualValue.Value > lastGeneration) {

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

@@ -52 +52 @@
     [Storable]
     private double min;
+    public double Min {
+      get { return min; }
+      set { min = value; }
+    }
     [Storable]
     private double max;
+    public double Max {
+      get { return max; }
+      set { max = value; }
+    }
+
     [Storable]
     private ResultCollection Results;
@@ -70 +79 @@
       StoreHistory = original.StoreHistory;
       CreateDataTable = original.CreateDataTable;
+      min = original.min;
+      max = original.max;
+
+      chartName = original.chartName;
+      chartName = original.chartName;
+      xAxisTitle = original.xAxisTitle;
+      yAxisTitle = original.yAxisTitle;
     }
 
@@ -120 +136 @@
 
     public void AddPoint(string rowName, Point2D<double> point) {
-      if (point.Y > max)
-        max = point.Y;
-      if (point.Y < min)
-        min = point.Y;
-
       if (!Plot.Rows.ContainsKey(rowName)) {
         if (StoreHistory)
@@ -166 +177 @@
         plot = null;
       }
+      min = double.MaxValue;
+      max = double.MinValue;
     }
   }

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

@@ -61 +61 @@
     public IValueParameter<StringValue> ChartPostfixParameter {
       get { return (IValueParameter<StringValue>)Parameters["ChartPostfix"]; }
+    }
+    public ILookupParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
+    }
+    public ILookupParameter<DoubleValue> WorstKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["WorstKnownQuality"]; }
     }
     #endregion
@@ -99 +105 @@
       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"));
+      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
+      Parameters.Add(new LookupParameter<DoubleValue>("WorstKnownQuality", "The quality of the worst known solution of this problem."));
 
       populationDiversityPlot = new ScatterPlotHelper(false, true);
@@ -154 +162 @@
         }
 
+        if (GenerationsParameter.ActualValue.Value == 1) {
+          double bkQuality = BestKnownQualityParameter.ActualValue.Value;
+          double wkQuality = WorstKnownQualityParameter.ActualValue.Value;
+
+          if (MaximizationParameter.ActualValue.Value) {
+            if (populationQualityPlot.Max == double.MinValue) {
+              populationQualityPlot.Max = bkQuality - wkQuality;
+              qualityPlot.Max = bkQuality;
+              populationQualityPlot.Min = 0;
+              qualityPlot.Min = wkQuality;
+            }
+          } else {
+            if (populationQualityPlot.Min == double.MaxValue) {
+              populationQualityPlot.Max = wkQuality - bkQuality;
+              qualityPlot.Max = wkQuality;
+              populationQualityPlot.Min = 0;
+              qualityPlot.Min = bkQuality;
+            }
+          }
+        }
+
         Point2D<double> popQualityPoint;
         if (MaximizationParameter.ActualValue.Value) {