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

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

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
   [Item("ReplaceBranchMove", "")]
   [StorableClass]
@@ -41 +42 @@
     public ISymbolicExpressionTreeNode NewBranch { get; set; }
 
+    [Storable]
+    public double[] OriginalOutput { get; private set; }
+
+    [Storable]
+    public double[] NewOutput { get; private set; }
+
+    [Storable]
+    public double Alpha { get; set; }
+
+    [Storable]
+    public double Beta { get; set; }
+
 
     [StorableConstructor]
@@ -50 +63 @@
       this.Parent = cloner.Clone(original.Parent);
       this.NewBranch = cloner.Clone(original.NewBranch);
+      this.OriginalOutput = original.OriginalOutput;
+      this.NewOutput = original.NewOutput;
+      this.Alpha = original.Alpha;
+      this.Beta = original.Beta;
     }
-    public ReplaceBranchMove(ISymbolicExpressionTree tree, ISymbolicExpressionTreeNode parent, int subtreeIndex, ISymbolicExpressionTreeNode newChild)
+    public ReplaceBranchMove(ISymbolicExpressionTree tree, ISymbolicExpressionTreeNode parent, int subtreeIndex, ISymbolicExpressionTreeNode newChild, double[] originalOutput, double[] newOutput)
       : base() {
       this.Tree = tree;
@@ -57 +74 @@
       this.Parent = parent;
       this.NewBranch = newChild;
+      this.OriginalOutput = originalOutput;
+      this.NewOutput = newOutput;
     }