Changeset 9044

Timestamp:

12/12/12 23:28:52 (12 years ago)

Author:

ascheibe

Message:

#1886

• improved unwanted mutation analyzer
• added test functions crossover performance analyzer

Location:

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

Files:

• CombinedOperators (added)
• CombinedOperators/QAPAfterCrossoverCombinedOperator.cs (added)
• CombinedOperators/QAPAfterMutationCombinedOperator.cs (added)
• CombinedOperators/TFAfterCrossoverCombinedOperator.cs (added)
• CombinedOperators/TSPAfterCrossoverCombinedOperator.cs (added)
• CombinedOperators/TSPAfterMutationCombinedOperator.cs (added)
• CrossoverPerformanceAnalyzer.cs (modified) (6 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (2 diffs)
• QAPAfterCrossoverCombinedOperator.cs (deleted)
• QAPAfterMutationCombinedOperator.cs (deleted)
• TSPAfterCrossoverCombinedOperator.cs (deleted)
• TSPAfterMutationCombinedOperator.cs (deleted)
• UnwantedMutationAnalyzer.cs (deleted)
• UnwantedMutationAnalyzers (added)
• UnwantedMutationAnalyzers/IUnwantedMutationAnalyzer.cs (added)
• UnwantedMutationAnalyzers/PermutationUnwantedMutationAnalyzer.cs (added)
• UnwantedMutationAnalyzers/UnwantedMutationAnalyzer.cs (added)

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

@@ -53 +53 @@
       get { return (ILookupParameter<IntValue>)Parameters[GenerationsParameterName]; }
     }
-    public ILookupParameter<ItemArray<Permutation>> ParentsParameter {
-      get { return (ScopeTreeLookupParameter<Permutation>)Parameters["Parents"]; }
-    }
     public ILookupParameter<ItemArray<DoubleValue>> ParentsQualityParameter {
       get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["ParentsQuality"]; }
     }
-    public ILookupParameter<Permutation> ChildParameter {
-      get { return ((LookupParameter<Permutation>)Parameters["Child"]); }
-    }
     public ILookupParameter<DoubleValue> QualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
@@ -67 +61 @@
     public IValueParameter<ISingleObjectiveSolutionSimilarityCalculator> SimilarityCalculatorParameter {
       get { return (IValueParameter<ISingleObjectiveSolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
+    }
+    public IValueParameter<IUnwantedMutationAnalyzer> UnwantedMutationAnalyzerParameter {
+      get { return (IValueParameter<IUnwantedMutationAnalyzer>)Parameters["UnwantedMutationAnalyzer"]; }
     }
     public ILookupParameter<ItemCollection<IItem>> OperatorsParameter {
@@ -117 +114 @@
 
       Parameters.Add(new ScopeTreeLookupParameter<Permutation>("Parents", "The parent permutations which have been crossed."));
-      ParentsParameter.ActualName = "TSPTour";
 
       Parameters.Add(new LookupParameter<Permutation>("Child", "The child permutation resulting from the crossover."));
-      ChildParameter.ActualName = "TSPTour";
 
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("ParentsQuality", "The quality of the parent solutions."));
@@ -129 +124 @@
 
       Parameters.Add(new ValueParameter<ISingleObjectiveSolutionSimilarityCalculator>("SimilarityCalculator"));
+      Parameters.Add(new ValueParameter<IUnwantedMutationAnalyzer>("UnwantedMutationAnalyzer"));
       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"));
@@ -187 +183 @@
 
       Point2D<double> worseQualityPoint, betterQualityPoint, childDiversityToWorseParent, childDiversityToBetterParent, diversityPointParent, qualityPointParent, unwantedMutationPoint;
-      var parent1 = ParentsParameter.ActualValue.First();
-      var parent2 = ParentsParameter.ActualValue.Last();
       var qualityParent1 = ParentsQualityParameter.ActualValue.First().Value;
       var qualityParent2 = ParentsQualityParameter.ActualValue.Last().Value;
-      var child = ChildParameter.ActualValue;
       var qualityChild = QualityParameter.ActualValue.Value;
 
@@ -199 +192 @@
       diversityPointParent = new Point2D<double>(cnt, parentDiversity);
       qualityPointParent = new Point2D<double>(cnt, Math.Abs(qualityParent1 - qualityParent2));
-      unwantedMutationPoint = new Point2D<double>(cnt, UnwantedMutationAnalyzer.AnalyzeUnwantedMutationsForPermutationEncoding(parent1, parent2, child));
+      if (UnwantedMutationAnalyzerParameter.Value != null) {
+        unwantedMutationPoint = new Point2D<double>(cnt, UnwantedMutationAnalyzerParameter.Value.AnalyzeUnwantedMutations(ExecutionContext.Scope.SubScopes.First(), ExecutionContext.Scope.SubScopes.Last(), ExecutionContext.Scope));
+      } else {
+        //TODO: this is not a good solution
+        unwantedMutationPoint = new Point2D<double>(cnt, 0.0);
+      }
 
       double worseQuality, betterQuality;

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

@@ -120 +120 @@
     <Compile Include="AfterCrossoverCombinedOperator.cs" />
     <Compile Include="AfterMutationCombinedOperator.cs" />
-    <Compile Include="TSPAfterMutationCombinedOperator.cs" />
-    <Compile Include="TSPAfterCrossoverCombinedOperator.cs" />
-    <Compile Include="QAPAfterMutationCombinedOperator.cs" />
-    <Compile Include="QAPAfterCrossoverCombinedOperator.cs" />
+    <Compile Include="CombinedOperators\TFAfterCrossoverCombinedOperator.cs" />
+    <Compile Include="CombinedOperators\TSPAfterMutationCombinedOperator.cs" />
+    <Compile Include="CombinedOperators\TSPAfterCrossoverCombinedOperator.cs" />
+    <Compile Include="CombinedOperators\QAPAfterMutationCombinedOperator.cs" />
+    <Compile Include="CombinedOperators\QAPAfterCrossoverCombinedOperator.cs" />
     <Compile Include="InitializableOperator.cs" />
-    <Compile Include="UnwantedMutationAnalyzer.cs" />
+    <Compile Include="UnwantedMutationAnalyzers\PermutationUnwantedMutationAnalyzer.cs" />
+    <Compile Include="UnwantedMutationAnalyzers\IUnwantedMutationAnalyzer.cs" />
+    <Compile Include="UnwantedMutationAnalyzers\UnwantedMutationAnalyzer.cs" />
     <Compile Include="VariableRemover.cs" />
     <Compile Include="LinearLeastSquaresFitting.cs" />
@@ -149 +152 @@
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>