Changeset 8227

Timestamp:

07/05/12 13:22:38 (12 years ago)

Author:

jkarder

Message:

#1886:

• added BrokenInheritanceWildcardAnalyzer
• separated analyzers and data structure creators
• fixed CalculateBrokenInheritanceOccurrences method

Location:

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

Files:

• AlgorithmBehaviorHelpers.cs (added)
• Analyzers/BestIndividualSchemaAnalyzer.cs (modified) (3 diffs)
• Analyzers/BrokenInheritanceWildcardAnalyzer.cs (added)
• Analyzers/BrokenInteritanceSchemaAnalyzer.cs (modified) (4 diffs)
• Analyzers/BuildingBlockAnalyzer.cs (deleted)
• Analyzers/SchemaAnalyzer.cs (deleted)
• Analyzers/SchemaOccurenceInGenerationsAnalyzer.cs (modified) (3 diffs)
• Analyzers/SchemaQualityAnalyzer.cs (modified) (4 diffs)
• Creators (added)
• Creators/SchemataCreator.cs (added)
• Creators/WildcardsCreator.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior-3.3.csproj (modified) (2 diffs)
• SchemaEqualityComparer.cs (added)

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

@@ -26 +26 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.TravelingSalesman;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior {
-  using HeuristicLab.Problems.TravelingSalesman;
 
   /// <summary>
@@ -66 +66 @@
     public BestIndividualSchemaAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should are stored."));
+      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should be stored."));
     }
 
@@ -74 +74 @@
 
     public override IOperation Apply() {
-      var subtours = SchemaAnalyzer.ExtractSubtours(BestSolution.Permutation);
+      var subtours = AlgorithmBehaviorHelpers.ExtractSubtours(BestSolution.Permutation);
       Results.Add(new Result(SchemataParameterName, subtours));
       return base.Apply();

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

@@ -34 +34 @@
 
   /// <summary>
-  /// An operator that analyzes broken inheritance of building blocks.
+  /// An operator that analyzes broken inheritance of schemata.
   /// </summary>
-  [Item("BrokenInteritanceSchemaAnalyzer", "An operator that analyzes broken inheritance of building blocks.")]
+  [Item("BrokenInteritanceSchemaAnalyzer", "An operator that analyzes broken inheritance of schemata.")]
   [StorableClass]
   public sealed class BrokenInteritanceSchemaAnalyzer : SingleSuccessorOperator, IAnalyzer {
     private const string ResultsParameterName = "Results";
-    private const string PopulationGraphResultParameterName = "PopulationGraph";
-    private const string SchemataParameterName = "Schemata";
-    private const string BrokenInteritanceSchemaOccurrenceName = "BrokenInteritanceSchemaOccurrenceMatrix";
+    private const string PopulationGraphResultName = "PopulationGraph";
+    private const string SchemataResultName = "Schemata";
+    private const string BrokenInteritanceSchemaOccurrenceMatrixResultName = "BrokenInteritanceSchemaOccurrenceMatrix";
 
     #region IAnalyzer Members
@@ -67 +67 @@
     public BrokenInteritanceSchemaAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should are stored."));
+      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should be stored."));
     }
 
@@ -75 +75 @@
 
     public override IOperation Apply() {
-      var graph = (GenealogyGraph<Permutation>)Results[PopulationGraphResultParameterName].Value;
-      var schemata = (ItemArray<IntArray>)Results[SchemataParameterName].Value;
+      var graph = (GenealogyGraph<Permutation>)Results[PopulationGraphResultName].Value;
+      var schemata = (ItemArray<IntArray>)Results[SchemataResultName].Value;
       var generationZero = graph.Values.Where(x => x.Rank == 0);
 
@@ -88 +88 @@
           var individual = generationZero.ElementAt(j);
           if (i == 0) brokenColumnNames.Add(((Permutation)individual.Data).ToString());
-          brokenInteritanceSchemaOccurrenceMatrix[i, j] = CalculateBrokenInheritanceOccurrences(schema, individual).ToString();
+          brokenInteritanceSchemaOccurrenceMatrix[i, j] = AlgorithmBehaviorHelpers.CalculateBrokenInheritanceOccurrences(schema, individual);
         }
       }
       brokenInteritanceSchemaOccurrenceMatrix.RowNames = brokenRowNames;
       brokenInteritanceSchemaOccurrenceMatrix.ColumnNames = brokenColumnNames;
-      Results.Add(new Result(BrokenInteritanceSchemaOccurrenceName, brokenInteritanceSchemaOccurrenceMatrix));
+      Results.Add(new Result(BrokenInteritanceSchemaOccurrenceMatrixResultName, brokenInteritanceSchemaOccurrenceMatrix));
 
       return base.Apply();
     }
-
-    private int CalculateBrokenInheritanceOccurrences(IntArray schema, GenealogyGraphNode individual) {
-      var filteredDescendants = individual.Descendants().Where(x => IsMatch(schema, ((Permutation)x.Data).ToArray()));
-      return filteredDescendants.Any() ? (int)filteredDescendants.Max(x => x.Rank) : 0;
-    }
-
-    // attention: brute force matching
-    // should be replaced with KMP, BM or RK
-    private bool IsMatch(IntArray pattern, int[] tour) {
-      bool match = false;
-      for (int i = 0; i <= tour.Length - pattern.Length && !match; i++) {
-        for (int j = 0; j < pattern.Length && (match = pattern[j] == tour[i + j] || pattern[j] == -1); j++) ;
-      }
-      return match;
-    }
   }
 }

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

@@ -84 +84 @@
     public SchemaOccurenceInGenerationsAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should are stored."));
+      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should be stored."));
       Parameters.Add(new LookupParameter<DistanceMatrix>(DistanceMatrixParameterName, "The distance matrix of the TSP."));
       Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "Nr of generations."));
@@ -97 +97 @@
       var schemata = (ItemArray<IntArray>)Results[SchemataParameterName].Value;
 
-      var schemataMatrix = new Dictionary<IntArray, string>(new HeuristicLab.Analysis.AlgorithmBehavior.SchemaAnalyzer.SchemaEqualityComparer());
+      var schemataMatrix = new Dictionary<IntArray, string>(new SchemaEqualityComparer());
       foreach (var schema in schemata) {
         if (!schemataMatrix.ContainsKey(schema)) {
@@ -125 +125 @@
 
       foreach (var individual in graph.Values) {
-        if (SchemaAnalyzer.IsSubtour(schema, (Permutation)individual.Data)) {
+        if (AlgorithmBehaviorHelpers.IsSubtour(schema, (Permutation)individual.Data)) {
           occurences[(int)individual.Rank]++;
         }

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

@@ -84 +84 @@
     public SchemaQualityAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should are stored."));
+      Parameters.Add(new LookupParameter<ResultCollection>(ResultsParameterName, "The results collection where the analysis values should be stored."));
       Parameters.Add(new LookupParameter<DistanceMatrix>(DistanceMatrixParameterName, "The distance matrix of the TSP."));
       Parameters.Add(new LookupParameter<IntValue>(GenerationsParameterName, "Nr of generations."));
@@ -97 +97 @@
       var schemata = (ItemArray<IntArray>)Results[SchemataParameterName].Value;
 
-      var schemataMatrix = new Dictionary<IntArray, int[]>(new HeuristicLab.Analysis.AlgorithmBehavior.SchemaAnalyzer.SchemaEqualityComparer());
+      var schemataMatrix = new Dictionary<IntArray, int[]>(new SchemaEqualityComparer());
       int qualityPoints = 0;
       int worseQualityPoints = 0;
@@ -135 +135 @@
 
       foreach (var individual in graph.Values) {
-        if (SchemaAnalyzer.IsSubtour(schema, (Permutation)individual.Data)) {
+        if (AlgorithmBehaviorHelpers.IsSubtour(schema, (Permutation)individual.Data)) {
           occurences[(int)individual.Rank]++;
         }
@@ -160 +160 @@
       worstQualityPoint = 0;
       foreach (var individual in graph.Values) {
-        if (SchemaAnalyzer.IsSubtour(schema, (Permutation)individual.Data)) {
+        if (AlgorithmBehaviorHelpers.IsSubtour(schema, (Permutation)individual.Data)) {
           occurrences++;
 

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

@@ -95 +95 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Analyzers\BuildingBlockAnalyzer.cs" />
+    <Compile Include="AlgorithmBehaviorHelpers.cs" />
+    <Compile Include="Analyzers\BrokenInheritanceWildcardAnalyzer.cs" />
     <Compile Include="Analyzers\BrokenInteritanceSchemaAnalyzer.cs" />
     <Compile Include="Analyzers\BestIndividualSchemaAnalyzer.cs" />
     <Compile Include="Analyzers\SchemaOccurenceInGenerationsAnalyzer.cs" />
     <Compile Include="Analyzers\SchemaQualityAnalyzer.cs" />
-    <Compile Include="Analyzers\SchemaAnalyzer.cs" />
+    <Compile Include="Creators\SchemataCreator.cs" />
+    <Compile Include="Creators\WildcardsCreator.cs" />
     <Compile Include="Analyzers\GenealogyAnalyzer.cs" />
     <Compile Include="GenealogyGraph.cs" />
@@ -106 +108 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SchemaEqualityComparer.cs" />
   </ItemGroup>
   <ItemGroup />