Changeset 9054

Timestamp:

12/14/12 11:06:24 (11 years ago)

Author:

ascheibe

Message:

#1886 added an analyzer for comparing the current solution to the rest of the population

Location:

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

Files:

• AfterCrossoverCombinedOperator.cs (modified) (3 diffs)
• AfterMutationCombinedOperator.cs (modified) (3 diffs)
• CombinedOperators/QAPAfterCrossoverCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/QAPAfterMutationCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/TFAfterCrossoverCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/TFAfterMutationCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/VRPAfterCrossoverCombinedOperator.cs (modified) (1 diff)
• CombinedOperators/VRPAfterMutationCombinedOperator.cs (modified) (1 diff)
• CrossoverPerformanceAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• SolutionToPopulationAnalyzer.cs (added)

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

@@ -35 +35 @@
 
     [Storable]
+    protected SolutionToPopulationAnalyzer solToPopAnalyzer;
+
+    [Storable]
     protected VariableDuplicator varDuplicator;
 
@@ -50 +53 @@
       cxAnalyzer = original.cxAnalyzer != null ? (CrossoverPerformanceAnalyzer)original.cxAnalyzer.Clone(cloner) : null;
       varDuplicator = original.varDuplicator != null ? (VariableDuplicator)original.cxAnalyzer.Clone(cloner) : null;
+      solToPopAnalyzer = original.solToPopAnalyzer != null ? (SolutionToPopulationAnalyzer)original.solToPopAnalyzer.Clone(cloner) : null;
     }
 
@@ -73 +77 @@
       cxAnalyzer.SimilarityCalculatorParameter.Value = SimilarityCalculatorParameter.Value;
       varDuplicator = new VariableDuplicator();
+      solToPopAnalyzer = new SolutionToPopulationAnalyzer();
+      solToPopAnalyzer.ChartPostfixParameter.Value = new Data.StringValue("after Crossover");
 
       Operators.Add(EvaluatorParameter.ActualValue);
       Operators.Add(cxAnalyzer);
       Operators.Add(varDuplicator);
+      Operators.Add(solToPopAnalyzer);
     }
   }

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

@@ -44 +44 @@
     [Storable]
     protected IEvaluator evaluatorClone;
+    [Storable]
+    protected SolutionToPopulationAnalyzer solToPopAnalyzer;
 
     [StorableConstructor]
@@ -49 +51 @@
     protected AfterMutationCombinedOperator(AfterMutationCombinedOperator original, Cloner cloner)
       : base(original, cloner) {
-      this.mAnalyzer = original.mAnalyzer != null ? (MutationPerformanceAnalyzer)original.mAnalyzer.Clone(cloner) : null;
-      this.varRemover = original.varRemover != null ? (VariableRemover)original.varRemover.Clone(cloner) : null;
+      mAnalyzer = original.mAnalyzer != null ? (MutationPerformanceAnalyzer)original.mAnalyzer.Clone(cloner) : null;
+      varRemover = original.varRemover != null ? (VariableRemover)original.varRemover.Clone(cloner) : null;
+      solToPopAnalyzer = original.solToPopAnalyzer != null ? (SolutionToPopulationAnalyzer)original.solToPopAnalyzer.Clone(cloner) : null;
     }
 
@@ -76 +79 @@
       varRemover = new VariableRemover();
 
+      solToPopAnalyzer = new SolutionToPopulationAnalyzer();
+      solToPopAnalyzer.ChartPostfixParameter.Value = new Data.StringValue("after Mutation");
+
       Operators.Add(evaluatorClone);
       Operators.Add(mAnalyzer);
       Operators.Add(varRemover);
+      Operators.Add(solToPopAnalyzer);
     }
   }

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

@@ -60 +60 @@
       umAnalyzer.SolutionVariableName = "Assignment";
       cxAnalyzer.UnwantedMutationAnalyzerParameter.Value = umAnalyzer;
+
+      solToPopAnalyzer.SolutionParameter.ActualName = "Assignment";
+      solToPopAnalyzer.QualityParameter.ActualName = "Quality";
     }
   }

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

@@ -56 +56 @@
 
       varRemover.VariableNameParameter.Value.Value = "AssignmentClone";
+      solToPopAnalyzer.SolutionParameter.ActualName = "Assignment";
+      solToPopAnalyzer.QualityParameter.ActualName = "Quality";
     }
   }

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

@@ -57 +57 @@
       varDuplicator.CloneParameter.ActualName = "PointClone";
 
+      solToPopAnalyzer.SolutionParameter.ActualName = "Point";
+      solToPopAnalyzer.QualityParameter.ActualName = "Quality";
       //TODO: add unwanted mutation analyzer for TF
     }

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

@@ -58 +58 @@
 
       varRemover.VariableNameParameter.Value.Value = "PointClone";
+      solToPopAnalyzer.SolutionParameter.ActualName = "Point";
+      solToPopAnalyzer.QualityParameter.ActualName = "Quality";
     }
   }

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

@@ -56 +56 @@
       varDuplicator.OriginalParameter.ActualName = "VRPTours";
       varDuplicator.CloneParameter.ActualName = "VRPToursClone";
+
+      solToPopAnalyzer.SolutionParameter.ActualName = "VRPTours";
+      solToPopAnalyzer.QualityParameter.ActualName = "Quality";
     }
   }

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

@@ -56 +56 @@
 
       varRemover.VariableNameParameter.Value.Value = "VRPToursClone";
+      solToPopAnalyzer.SolutionParameter.ActualName = "VRPTours";
+      solToPopAnalyzer.QualityParameter.ActualName = "Quality";
     }
   }

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

@@ -73 +73 @@
       get { return ResultsParameter.ActualValue; }
     }
+
+    [Storable]
+    private ScatterPlotHelper worseParentCrossoverPerformancePlot, betterParentCrossoverPerformancePlot, childDiversityToWorseParentHelper, childDiversityToBetterParentHelper, parentDiversityHelper, parentQualityHelper, unwantedMutationsHelper;
+    [Storable]
+    private DataTableHelper successHelper, equalParentsHelper;
+    [Storable]
+    private int cnt = 0;
+    [Storable]
+    private int[] success;
+    [Storable]
+    private int lastGeneration = 0;
+    [Storable]
+    private int equalParents = 0;
     #endregion
 
-    [Storable]
-    private ScatterPlotHelper worseParentCrossoverPerformancePlot, betterParentCrossoverPerformancePlot, childDiversityToWorseParentHelper, childDiversityToBetterParentHelper, parentDiversityHelper, parentQualityHelper, unwantedMutationsHelper;
-    [Storable]
-    private DataTableHelper successHelper, equalParentsHelper;
-    [Storable]
-    private int cnt = 0;
-    [Storable]
-    private int[] success;
-    [Storable]
-    private int lastGeneration = 0;
-    [Storable]
-    private int equalParents = 0;
 
     [StorableConstructor]

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

@@ -134 +134 @@
     <Compile Include="CombinedOperators\QAPAfterCrossoverCombinedOperator.cs" />
     <Compile Include="InitializableOperator.cs" />
+    <Compile Include="SolutionToPopulationAnalyzer.cs" />
     <Compile Include="UnwantedMutationAnalyzers\PermutationUnwantedMutationAnalyzer.cs" />
     <Compile Include="UnwantedMutationAnalyzers\IUnwantedMutationAnalyzer.cs" />