Changeset 8229

Timestamp:

07/05/12 14:11:08 (12 years ago)

Author:

ascheibe

Message:

#1886 worked on an analyzer for the best found solution

Location:

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

Files:

• AlgorithmBehaviorHelpers.cs (modified) (3 diffs)
• Analyzers/BestIndividualQualityAnalyzer.cs (added)
• Analyzers/BestIndividualSchemaAnalyzer.cs (deleted)
• Creators/BestIndividualSchemataCreator.cs (added)
• Creators/SchemataCreator.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior-3.3.csproj (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior/3.3/AlgorithmBehaviorHelpers.cs

@@ -23 +23 @@
 using System.Linq;
 using System.Text;
-using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
@@ -46 +45 @@
     }
 
-    public static ItemArray<IntArray> ExtractSubtours(Permutation permutation) {
+    public static List<IntArray> ExtractSubtours(Permutation permutation) {
       var subtours = new List<IntArray>();
       for (int i = 2; i <= permutation.Count() / 2; i++) { // increase schema length from 2 to n/2
@@ -55 +54 @@
         }
       }
-      return new ItemArray<IntArray>(subtours);
+      return subtours;
     }
 

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior/3.3/Creators/SchemataCreator.cs

@@ -90 +90 @@
       var subtours = new Dictionary<Permutation, ItemArray<IntArray>>();
       foreach (var individual in generationZero) {
-        subtours[(Permutation)individual.Data] = AlgorithmBehaviorHelpers.ExtractSubtours((Permutation)individual.Data);
+        subtours[(Permutation)individual.Data] = new ItemArray<IntArray>(AlgorithmBehaviorHelpers.ExtractSubtours((Permutation)individual.Data));
       }
 

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

@@ -98 +98 @@
     <Compile Include="Analyzers\BrokenInheritanceWildcardAnalyzer.cs" />
     <Compile Include="Analyzers\BrokenInteritanceSchemaAnalyzer.cs" />
-    <Compile Include="Analyzers\BestIndividualSchemaAnalyzer.cs" />
+    <Compile Include="Creators\BestIndividualSchemataCreator.cs" />
+    <Compile Include="Analyzers\BestIndividualQualityAnalyzer.cs" />
     <Compile Include="Analyzers\SchemaOccurenceInGenerationsAnalyzer.cs" />
     <Compile Include="Analyzers\SchemaQualityAnalyzer.cs" />