Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveEvaluator.cs

Timestamp:

07/03/12 16:46:35 (12 years ago)

Author:

gkronber

Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveEvaluator.cs (modified) (2 diffs)

branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveEvaluator.cs

@@ -80 +80 @@
       var move = (ReplaceBranchMove)MoveParameter.ActualValue.Clone();
 
+      // calculate linear scaling
+      OnlineCalculatorError errorState;
+      double alpha, beta;
+      OnlineLinearScalingParameterCalculator.Calculate(move.NewOutput, move.OriginalOutput, out alpha, out beta, out errorState);
+
+      move.Alpha = alpha;
+      move.Beta = beta;
+
       move.Parent.RemoveSubtree(move.SubtreeIndex);
-      move.Parent.InsertSubtree(move.SubtreeIndex, move.NewBranch);
+      move.Parent.InsertSubtree(move.SubtreeIndex, Scale(move.NewBranch, alpha, beta));
 
       var problemData = ProblemDataParameter.ActualValue;
@@ -94 +102 @@
     }
 
+    private Addition add = new Addition();
+    private Multiplication mul = new Multiplication();
+    private Constant constant = new Constant();
+
+    private ISymbolicExpressionTreeNode Scale(ISymbolicExpressionTreeNode node, double alpha, double beta) {
+      var constAlpha = (ConstantTreeNode)constant.CreateTreeNode();
+      var constBeta = (ConstantTreeNode)constant.CreateTreeNode();
+      constAlpha.Value = alpha;
+      constBeta.Value = beta;
+      var sum = add.CreateTreeNode();
+      var prod = mul.CreateTreeNode();
+      prod.AddSubtree(node); prod.AddSubtree(constBeta);
+      sum.AddSubtree(prod); sum.AddSubtree(constAlpha);
+      return sum;
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ReplaceBranchMoveEvaluator(this, cloner);