Changeset 8237 for branches

Timestamp:

07/05/12 16:21:23 (12 years ago)

Author:

ascheibe

Message:

#1886 added ranks list to nodes in graph

Location:

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

Files:

• AlgorithmBehaviorHelpers.cs (modified) (1 diff)
• Analyzers/BestIndividualQualityAnalyzer.cs (modified) (1 diff)
• Analyzers/BrokenInheritanceWildcardAnalyzer.cs (modified) (1 diff)
• Analyzers/BrokenInteritanceSchemaAnalyzer.cs (modified) (1 diff)
• Analyzers/GenealogyAnalyzer.cs (modified) (4 diffs)
• Analyzers/SchemaOccurenceInGenerationsAnalyzer.cs (modified) (1 diff)
• Analyzers/SchemaQualityAnalyzer.cs (modified) (2 diffs)
• Creators/SchemataCreator.cs (modified) (1 diff)
• GenealogyGraph.cs (modified) (3 diffs)

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

@@ -63 +63 @@
       if (filteredDescendants.Any()) {
         foreach (var descendant in filteredDescendants) {
-          generations.Add((int)descendant.Rank);
+          foreach (var rank in descendant.Rank) {
+            generations.Add((int)rank);
+          }
         }
       }

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

@@ -129 +129 @@
       SchemaEqualityComparer comparer = new SchemaEqualityComparer();
 
-      var lastGen = graph.Values.Where(x => x.Rank == GenerationsParameter.ActualValue.Value);
+      var lastGen = graph.Values.Where(x => x.Rank.Contains(GenerationsParameter.ActualValue.Value));
       var parents = lastGen.Where(x => comparer.Equals((IntArray)x.Data, parent));
       var ancestors = parents.First().Ancestors().Where(x => AlgorithmBehaviorHelpers.IsSubtour(schema, (Permutation)x.Data));
 
       StringBuilder sb = new StringBuilder();
+      double curGen = GenerationsParameter.ActualValue.Value;
       foreach (var a in ancestors) {
-        sb.Append(a.Rank + ", ");
+        if (a.Rank.Contains(curGen))
+          sb.Append(curGen + ", ");
+        else {
+          for (int i = 0; i < GenerationsParameter.ActualValue.Value; i++) {
+            if (a.Rank.Contains(curGen - i)) {
+              curGen = curGen - i;
+              break;
+            } else if (a.Rank.Contains(curGen - i + 0.5)) {
+              curGen = curGen - i + 0.5;
+              break;
+            }
+          }
+          sb.Append(curGen + ", ");
+        }
       }
       return sb.ToString();

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

@@ -77 +77 @@
       var graph = (GenealogyGraph<Permutation>)Results[PopulationGraphResultName].Value;
       var wildcards = (ItemArray<IntArray>)Results[WildcardsResultName].Value;
-      var generationZero = graph.Values.Where(x => x.Rank == 0);
+      var generationZero = graph.Values.Where(x => x.Rank.Contains(0));
 
       var buildingBlockMatrix = new StringMatrix(wildcards.Count(), generationZero.Count());

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

@@ -77 +77 @@
       var graph = (GenealogyGraph<Permutation>)Results[PopulationGraphResultName].Value;
       var schemata = (ItemArray<IntArray>)Results[SchemataResultName].Value;
-      var generationZero = graph.Values.Where(x => x.Rank == 0);
+      var generationZero = graph.Values.Where(x => x.Rank.Contains(0));
 
       var brokenInteritanceSchemaOccurrenceMatrix = new StringMatrix(schemata.Count(), generationZero.Count());

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

@@ -32 +32 @@
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior {
+  using System.Collections.Generic;
   using CloneMapType = HeuristicLab.Core.ItemDictionary<HeuristicLab.Core.IItem, HeuristicLab.Core.IItem>;
   using TraceMapType = HeuristicLab.Core.ItemDictionary<HeuristicLab.Core.IItem, HeuristicLab.Core.IItemList<HeuristicLab.Core.IItem>>;
@@ -182 +183 @@
           for (int i = 0; i < population.Count; i++) {
             var solutionEntry = population.ElementAt(i);
-            var node = new GenealogyGraphNode(solutionEntry.Key) { Quality = solutionEntry.Value, Label = label, Rank = generation, IsElite = i < Elites.Value };
+            var rank = new List<double>();
+            rank.Add(generation);
+            var node = new GenealogyGraphNode(solutionEntry.Key) { Quality = solutionEntry.Value, Label = label, Rank = rank, IsElite = i < Elites.Value };
             graph.AddNode(node);
           }
@@ -192 +195 @@
           var solutionEntry = population.ElementAt(i);
           if (!graph.HasNode(solutionEntry.Key)) {
-            var node = new GenealogyGraphNode(solutionEntry.Key) { Quality = solutionEntry.Value, Label = label, Rank = generation, IsElite = i < Elites.Value };
+            var rank = new List<double>();
+            rank.Add(generation);
+            var node = new GenealogyGraphNode(solutionEntry.Key) { Quality = solutionEntry.Value, Label = label, Rank = rank, IsElite = i < Elites.Value };
             graph.AddNode(node);
           }
@@ -204 +209 @@
               // handle mutation
               double quality = Evaluate(parent);
-              var node = new GenealogyGraphNode(parent) { Quality = quality, Label = label, Rank = generation - 0.5 };
+              var rank = new List<double>();
+              rank.Add(generation - 0.5);
+              var node = new GenealogyGraphNode(parent) { Quality = quality, Label = label, Rank = rank };
               graph.AddNode(node);
               var parentParents = GlobalTraceMap[parent].Cast<Permutation>().ToArray();

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

@@ -126 +126 @@
       foreach (var individual in graph.Values) {
         if (AlgorithmBehaviorHelpers.IsSubtour(schema, (Permutation)individual.Data)) {
-          occurences[(int)individual.Rank]++;
+          foreach (var rank in individual.Rank) {
+            occurences[(int)rank]++;
+          }
         }
       }

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

@@ -136 +136 @@
       foreach (var individual in graph.Values) {
         if (AlgorithmBehaviorHelpers.IsSubtour(schema, (Permutation)individual.Data)) {
-          occurences[(int)individual.Rank]++;
+          foreach (var rank in individual.Rank) {
+            occurences[(int)rank]++;
+          }
         }
       }
@@ -166 +168 @@
           double pQuality = TSPDistanceMatrixEvaluator.Apply(DistanceMatrix, p);
 
-          if (Qualities.Rows["CurrentAverageQuality"].Values[(int)individual.Rank] > pQuality) {
+          //TODO: fix that
+          /*if (Qualities.Rows["CurrentAverageQuality"].Values[(int)individual.Rank] > pQuality) {
             qualityPoint += 1;
           } else {
             worstQualityPoint += 1;
-          }
+          } */
         }
       }

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

@@ -85 +85 @@
     public override IOperation Apply() {
       var graph = (GenealogyGraph<Permutation>)Results[PopulationGraphResultParameterName].Value;
-      var generationZero = graph.Values.Where(x => x.Rank == 0);
+      var generationZero = graph.Values.Where(x => x.Rank.Contains(0));
 
       // extract all subtours for each individual in generation zero

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

@@ -73 +73 @@
     public void AddNode(T t) {
       if (HasNode(t)) return;
-      _nodes[t] = new GenealogyGraphNode(t) { Quality = 0.0, Label = "", IsElite = false, Rank = 0.0 };
+      _nodes[t] = new GenealogyGraphNode(t) { Quality = 0.0, Label = "", IsElite = false, Rank = new List<double>() };
     }
 
@@ -166 +166 @@
     public bool IsElite { get; set; }
     public double Quality { get; set; }
-    public double Rank { get; set; }
+    public List<double> Rank { get; set; }
     public List<GenealogyGraphArc> InEdges { get; set; }
     public List<GenealogyGraphArc> OutEdges { get; set; }
@@ -193 +193 @@
     public GenealogyGraphNode(GenealogyGraphNode node) {
       Id = Guid.NewGuid().ToString();
-      Rank = node.Rank;
+      Rank = new List<double>(node.Rank);
       Quality = node.Quality;
       IsElite = node.IsElite;