Changeset 9835 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Operators/SymbolicExpressionTreeGenealogyGraphBuilder.cs

Timestamp:

08/01/13 13:01:40 (11 years ago)

Author:

bburlacu

Message:

#1772: Merged remaining trunk changes into the EvolutionaryTracking branch.

Location:

branches/HeuristicLab.EvolutionaryTracking

Files:

• . (modified) (3 props)
• HeuristicLab.EvolutionaryTracking/3.4/Operators/SymbolicExpressionTreeGenealogyGraphBuilder.cs (modified) (6 diffs)

branches/HeuristicLab.EvolutionaryTracking

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking/3.4/Operators/SymbolicExpressionTreeGenealogyGraphBuilder.cs

@@ -207 +207 @@
       int generation = Generations.Value;
 
-      var pairs =
-        trees.Zip(qualities, (t, q) => new { Tree = t, Quality = q.Value }).OrderByDescending(x => x.Quality).ToList();
+      var pairs = trees.Zip(qualities, (t, q) => new { Tree = t, Quality = q.Value }).OrderByDescending(x => x.Quality).ToList();
 
       if (generation == 0) {
@@ -245 +244 @@
            Quality = Evaluate(p),
            Rank = generation - 0.5
-           // an intermediate parent that would normale be 'invisible' to the evolutionary process
+           // an intermediate parent that would normally be 'invisible' to the evolutionary process
          }
         ).ToList();
@@ -262 +261 @@
             // link elites from previous generation
             var last = nodes[nodes.Count - 2];
-            var arc = new Arc { Source = last, Target = node, Data = new Fragment(null) };
+            var arc = new Arc { Source = last, Target = node, Data = new Fragment { Root = null } };
             last.AddForwardArc(arc);
             node.AddReverseArc(arc);
@@ -268 +267 @@
           continue;
         }
+
         var parents = GlobalTraceMap[tree].Cast<ISymbolicExpressionTree>().ToList();
         var fragment = GlobalFragmentMap[tree];
@@ -286 +286 @@
         // so it does not actually pass a subtree to the child, therefore the fragment is null
         // so in case of crossover, we add a null fragment below
-        if (parents.Count > 1) node.InEdges[0].Data = new Fragment(null);
+        if (parents.Count > 1) node.InEdges[0].Data = new Fragment { Root = null };
       }
 
@@ -299 +299 @@
     /// </summary>
     /// <param name="tree">The symbolic expression tree to evaluate</param>
-    /// <returns>A double value representing the fitness</returns>
+    /// <returns>A double value representing the individual quality</returns>
     private double Evaluate(IItem tree) {
       var subScope = new Scope();

@@ -1 @@
-*.suo
-_ReSharper.HeuristicLab.Tracking
+_ReSharper.Sliding Window GP
 bin