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

Timestamp:

01/16/16 15:39:03 (8 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.

File:

• branches/HeuristicLab.EvolutionTracking/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.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;