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

Timestamp:

07/16/12 09:06:27 (12 years ago)

Author:

gkronber

Message:

#1847: worked on move operators. version of the final EMSS submission

File:

• branches/GP-MoveOperators/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/ReplaceBranchMoveMaker.cs (modified) (4 diffs)

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

@@ -48 +48 @@
       get { return (ILookupParameter<ISymbolicExpressionTree>)Parameters["SymbolicExpressionTree"]; }
     }
+    public ILookupParameter<ItemList<ISymbolicExpressionTree>> FragmentsParameter {
+      get { return (ILookupParameter<ItemList<ISymbolicExpressionTree>>)Parameters["Fragments"]; }
+    }
+    public ILookupParameter<ItemList<DoubleArray>> FragmentOutputsParameter {
+      get { return (ILookupParameter<ItemList<DoubleArray>>)Parameters["FragmentOutputs"]; }
+    }
 
     [StorableConstructor]
@@ -58 +64 @@
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<ISymbolicExpressionTree>("SymbolicExpressionTree", "The symbolic expression tree on which the move should be applied."));
+      Parameters.Add(new LookupParameter<ItemList<ISymbolicExpressionTree>>("Fragments"));
+      Parameters.Add(new LookupParameter<ItemList<DoubleArray>>("FragmentOutputs"));
     }
 
@@ -65 +73 @@
 
     public override IOperation Apply() {
+      var fragments = FragmentsParameter.ActualValue;
+      var fragmentOutputs = FragmentOutputsParameter.ActualValue;
+
       var move = ReplaceBranchMoveParameter.ActualValue;
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;
@@ -70 +81 @@
 
       var newNode = (ISymbolicExpressionTreeNode)move.NewBranch.Clone();
+      var oldBranch = move.Parent.GetSubtree(move.SubtreeIndex);
+
       move.Parent.RemoveSubtree(move.SubtreeIndex);
       move.Parent.InsertSubtree(move.SubtreeIndex, Scale(newNode, move.Alpha, move.Beta));
 
+      // move oldBranch into pool
+      var fragmentStart = fragments[move.FragmentIndex].Root.GetSubtree(0);
+      fragmentStart.RemoveSubtree(0);
+      fragmentStart.AddSubtree(oldBranch);
+      fragmentOutputs[move.FragmentIndex] = new DoubleArray(move.NewOutput);
       quality.Value = moveQuality.Value;
       // update solution