Changeset 13527

Timestamp:

01/16/16 15:39:03 (9 years ago)

Author:

bburlacu

Message:

#1772: Fixed the way operator improvement is calculated so it also works when a diversification strategy is applied (introducing multiple intermediate vertices between parent and child). Minor code refactoring in the diversification operators. Fixed very small typo in the BeforeManipulatorOperator.

Location:

branches/HeuristicLab.EvolutionTracking

Files:

• HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGeneticOperatorImprovementAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/DiversificationStatisticsOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaCreator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/UpdateQualityOperator.cs (moved) (moved from branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/UpdateEstimatedValuesOperator.cs) (4 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs

@@ -52 +52 @@
 
     public override IOperation Apply() {
-      // since mutation always takes place after crossover, the vertex for the current child is already in the tree
+      // since mutation always takes place after crossover, the vertex for the current child is already in the graph
       var vChild = GenealogyGraph.GetByContent(ChildParameter.ActualValue);
       var vClone = (IGenealogyGraphNode<T>)vChild.Clone();

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisGeneticOperatorImprovementAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Analysis;
@@ -103 +104 @@
       var populationSize = population.Length;
 
-      var vertices = population.Select(graph.GetByContent).ToList();
+      //      var vertices = population.Select(graph.GetByContent).ToList();
+      var crossoverChildren = new List<IGenealogyGraphNode<ISymbolicExpressionTree>>();
+      var mutationChildren = new List<IGenealogyGraphNode<ISymbolicExpressionTree>>();
+      var vertices = graph.Vertices.Where(x => x.Rank > generation - 1);
+      foreach (var v in vertices) {
+        if (v.InDegree == 2) {
+          crossoverChildren.Add(v);
+        } else {
+          var parent = v.Parents.First();
+          // mutation is always preceded by mutation
+          // so the parent vertex should have an intermediate rank
+          // otherwise, it is the previos generation elite
+          if (parent.Rank.IsAlmost(generation - 1) && parent.IsElite)
+            continue;
+          mutationChildren.Add(v);
+        }
+      }
       DataTable table;
       #region crossover improvement
@@ -118 +135 @@
         table = (DataTable)Results["Crossover improvement"].Value;
       }
-      var crossoverChildren = vertices.Where(x => x.InDegree == 2).ToList();
-      if (CountIntermediateChildren)
-        crossoverChildren.AddRange(vertices.Where(x => x.InDegree == 1).Select(v => v.Parents.First()).Where(p => p.Rank.IsAlmost(generation - 0.5))); // add intermediate children
 
       var avgCrossoverParentQuality = crossoverChildren.SelectMany(x => x.Parents).Average(x => x.Quality);
@@ -148 +162 @@
       }
 
-      var mutationChildren = vertices.Where(x => x.InDegree == 1).ToList();
-
       var avgMutationParentQuality = mutationChildren.SelectMany(x => x.Parents).Average(x => x.Quality);
       var avgMutationChildQuality = mutationChildren.Average(x => x.Quality);

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -322 +322 @@
     <Compile Include="Tracking\SchemaDiversification\SchemaEvaluator.cs" />
     <Compile Include="Tracking\SchemaDiversification\SchemaCreator.cs" />
-    <Compile Include="Tracking\SchemaDiversification\UpdateEstimatedValuesOperator.cs" />
+    <Compile Include="Tracking\SchemaDiversification\UpdateQualityOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterCrossoverOperator.cs" />
     <Compile Include="Tracking\SymbolicDataAnalysisExpressionAfterManipulatorOperator.cs" />

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/DiversificationStatisticsOperator.cs

@@ -67 +67 @@
     }
 
+    public override void InitializeState() {
+      base.InitializeState();
+      evaluatedSolutionsTracker = 0;
+    }
+
     public override void ClearState() {
+      base.ClearState();
       evaluatedSolutionsTracker = 0;
-      base.ClearState();
     }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaCreator.cs

@@ -111 +111 @@
     #endregion
 
-    private UpdateEstimatedValuesOperator updateEstimatedValuesOperator;
+    private UpdateQualityOperator updateQualityOperator;
     private DiversificationStatisticsOperator diversificationStatisticsOperator;
 
@@ -182 +182 @@
 
       var updateEstimatedValues = new OperationCollection { Parallel = true };
-      if (updateEstimatedValuesOperator == null)
-        updateEstimatedValuesOperator = new UpdateEstimatedValuesOperator();
+      if (updateQualityOperator == null)
+        updateQualityOperator = new UpdateQualityOperator();
 
       foreach (var s in ExecutionContext.Scope.SubScopes.Where(s => !s.Variables.ContainsKey("EstimatedValues"))) {
-        updateEstimatedValues.Add(ExecutionContext.CreateChildOperation(updateEstimatedValuesOperator, s));
+        updateEstimatedValues.Add(ExecutionContext.CreateChildOperation(updateQualityOperator, s));
       }
 

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/SchemaEvaluator.cs

@@ -143 +143 @@
     };
 
+    [Storable]
     public ISymbolicExpressionTree Schema { get; set; }
 
     [Storable]
-    private readonly UpdateEstimatedValuesOperator updateEstimatedValuesOperator;
+    private readonly UpdateQualityOperator updateQualityOperator;
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -156 +157 @@
     public SchemaEvaluator() {
       qm = new QueryMatch(comp) { MatchParents = true };
-      this.updateEstimatedValuesOperator = new UpdateEstimatedValuesOperator();
+      this.updateQualityOperator = new UpdateQualityOperator();
       #region add parameters
       Parameters.Add(new LookupParameter<ISymbolicExpressionTree>(SchemaParameterName, "The current schema to be evaluated"));
@@ -185 +186 @@
 
     protected SchemaEvaluator(SchemaEvaluator original, Cloner cloner) : base(original, cloner) {
-      this.comp = original.comp == null ? new SymbolicExpressionTreeNodeEqualityComparer {
-        MatchConstantValues = false,
-        MatchVariableWeights = false,
-        MatchVariableNames = true
-      } : (ISymbolicExpressionTreeNodeEqualityComparer)original.comp.Clone();
+      this.comp = new SymbolicExpressionTreeNodeEqualityComparer();
       this.qm = new QueryMatch(comp) { MatchParents = original.qm?.MatchParents ?? true };
-      this.updateEstimatedValuesOperator = new UpdateEstimatedValuesOperator();
+      this.updateQualityOperator = new UpdateQualityOperator();
+      Schema = original.Schema;
     }
 
@@ -295 +293 @@
       foreach (var ind in individualsToReplace) {
         var mutatorOp = ExecutionContext.CreateChildOperation(mutator, ind);
-        var updateOp = ExecutionContext.CreateChildOperation(updateEstimatedValuesOperator, ind);
+        var updateOp = ExecutionContext.CreateChildOperation(updateQualityOperator, ind);
         mutationOc.Add(mutatorOp);
         updateEstimatedValues.Add(updateOp);

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/UpdateQualityOperator.cs

@@ -31 +31 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
-  [Item("UpdateEstimatedValuesOperator", "Put the estimated values of the tree in the scope to be used by the phenotypic similarity calculator")]
+  [Item("UpdateQualityOperator", "Put the estimated values of the tree in the scope to be used by the phenotypic similarity calculator")]
   [StorableClass]
-  public class UpdateEstimatedValuesOperator : EvolutionTrackingOperator<ISymbolicExpressionTree> {
+  public class UpdateQualityOperator : EvolutionTrackingOperator<ISymbolicExpressionTree> {
     private const string ProblemDataParameterName = "ProblemData";
     private const string InterpreterParameterName = "SymbolicExpressionTreeInterpreter";
@@ -56 +56 @@
     }
 
-    public UpdateEstimatedValuesOperator() {
+    public UpdateQualityOperator() {
       Parameters.Add(new LookupParameter<IRegressionProblemData>(ProblemDataParameterName));
       Parameters.Add(new LookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>(InterpreterParameterName));
@@ -65 +65 @@
 
     [StorableConstructor]
-    protected UpdateEstimatedValuesOperator(bool deserializing) : base(deserializing) { }
+    protected UpdateQualityOperator(bool deserializing) : base(deserializing) { }
 
-    protected UpdateEstimatedValuesOperator(UpdateEstimatedValuesOperator original, Cloner cloner) : base(original, cloner) {
+    protected UpdateQualityOperator(UpdateQualityOperator original, Cloner cloner) : base(original, cloner) {
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new UpdateEstimatedValuesOperator(this, cloner);
+      return new UpdateQualityOperator(this, cloner);
     }
 
@@ -110 +110 @@
 
       ((DoubleValue)variables["Quality"].Value).Value = r2;
+      GenealogyGraph.GetByContent(tree).Quality = r2;
 
       var scaleEstimatedValues = ScaleEstimatedValuesParameter.ActualValue;