Changeset 10833 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Timestamp:

05/11/14 00:03:36 (10 years ago)

Author:

bburlacu

Message:

#1772: Fixed another minor display bug concerning elite individuals. Fixed bug when saving fragments from mutation. Displayed quality as well in the SymbolicExpressionTreeTile.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4

Files:

• Analyzers/GenealogyAnalyzer.cs (modified) (3 diffs)
• DirectedGraph/DirectedGraph.cs (modified) (1 diff)
• DirectedGraph/Interfaces/IDirectedGraph.cs (modified) (1 diff)
• GenealogyGraph/GenealogyGraph.cs (modified) (1 diff)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Analyzers/GenealogyAnalyzer.cs

@@ -205 +205 @@
         if (EnableCrossoverTracking.Value) {
           if (BeforeCrossoverOperator != null) {
-            //            BeforeCrossoverOperator.ParentsParameter.ActualName = CrossoverParentsParameterName;
-            //            BeforeCrossoverOperator.ChildParameter.ActualName = CrossoverChildParameterName;
             instrumentedCrossover.BeforeExecutionOperators.Add(BeforeCrossoverOperator);
           }
           if (AfterCrossoverOperator != null) {
-            //            AfterCrossoverOperator.ParentsParameter.ActualName = CrossoverParentsParameterName;
-            //            AfterCrossoverOperator.ChildParameter.ActualName = CrossoverChildParameterName;
             instrumentedCrossover.AfterExecutionOperators.Add(AfterCrossoverOperator);
           }
@@ -224 +220 @@
         if (EnableManipulatorTracking.Value) {
           if (BeforeManipulatorOperator != null) {
-            //            BeforeManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
             instrumentedManipulator.BeforeExecutionOperators.Add(BeforeManipulatorOperator);
           }
           if (AfterManipulatorOperator != null) {
-            //            AfterManipulatorOperator.ChildParameter.ActualName = ManipulatorChildParameterName;
             instrumentedManipulator.AfterExecutionOperators.Add(AfterManipulatorOperator);
           }
@@ -257 +251 @@
             IsElite = true
           };
+          // add new vertex to the graph
+          GenealogyGraph.AddVertex(vertex);
+          // swap content between current vertex and previous vertex
           var previousVertex = (IGenealogyGraphNode<T>)GenealogyGraph[elite];
-          GenealogyGraph.AddVertex(vertex);
+          var tmp = vertex.Content;
+          vertex.Content = previousVertex.Content;
+          previousVertex.Content = tmp;
+          // adjust graph content map
+          GenealogyGraph[vertex.Content] = vertex;
+          GenealogyGraph[previousVertex.Content] = previousVertex;
+          // connect current elite with previous elite
           previousVertex.AddForwardArc(vertex);
           vertex.AddReverseArc(previousVertex);

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/DirectedGraph.cs

@@ -68 +68 @@
         return result;
       }
+      set {
+        contentMap[key] = value;
+      }
     }
     public virtual bool Any(Func<IVertex, bool> predicate) {

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/DirectedGraph/Interfaces/IDirectedGraph.cs

@@ -32 +32 @@
     void RemoveVertex(IVertex vertex);
     List<IVertex> Nodes { get; }
-    IVertex this[object content] { get; }
+    IVertex this[object content] { get; set; }
     bool Contains(object content);
   }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/GenealogyGraph/GenealogyGraph.cs

@@ -76 +76 @@
         return result == null ? null : (IGenealogyGraphNode)result;
       }
+      set { base[content] = value; }
     }