Changeset 8206 for branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveMaker.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/ReplaceBranchMoveMaker.cs (moved) (moved from branches/GP-MoveOperators/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Moves/ReplaceBranchMoveMaker.cs) (5 diffs)

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

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
@@ -28 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [Item("ReplaceBranchMoveMaker", "")]
   [StorableClass]
@@ -65 +66 @@
     public override IOperation Apply() {
       var move = ReplaceBranchMoveParameter.ActualValue;
-      var tree = SymbolicExpressionTreeParameter.ActualValue;
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;
       DoubleValue quality = QualityParameter.ActualValue;
@@ -71 +71 @@
       var newNode = (ISymbolicExpressionTreeNode)move.NewBranch.Clone();
       move.Parent.RemoveSubtree(move.SubtreeIndex);
-      move.Parent.InsertSubtree(move.SubtreeIndex, newNode);
+      move.Parent.InsertSubtree(move.SubtreeIndex, Scale(newNode, move.Alpha, move.Beta));
 
       quality.Value = moveQuality.Value;
@@ -77 +77 @@
       return base.Apply();
     }
+
+
+    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;
+    }
   }
 }