Changeset 3535 for trunk

Timestamp:

04/26/10 16:16:49 (15 years ago)

Author:

gkronber

Message:

Fixed bugs in manipulation operators. #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• ArchitectureAlteringOperators/SubroutineDeleter.cs (modified) (1 diff)
• Manipulators/OnePointShaker.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureAlteringOperators/SubroutineDeleter.cs

@@ -102 +102 @@
         int maxHeight = Math.Max(minPossibleHeight, invocationCutPoint.ReplacedChild.GetHeight());
         replacementTree = selectedSymbol.CreateTreeNode();
+        if (replacementTree.HasLocalParameters)
+          replacementTree.ResetLocalParameters(random);
         invocationCutPoint.Parent.RemoveSubTree(invocationCutPoint.ReplacedChildIndex);
         invocationCutPoint.Parent.InsertSubTree(invocationCutPoint.ReplacedChildIndex, replacementTree);

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Manipulators/OnePointShaker.cs

@@ -37 +37 @@
 
     protected override void Manipulate(IRandom random, SymbolicExpressionTree symbolicExpressionTree, ISymbolicExpressionGrammar grammar, IntValue maxTreeSize, IntValue maxTreeHeight, out bool success) {
+      var parametricNodes = from node in symbolicExpressionTree.IterateNodesPrefix()
+                            where node.HasLocalParameters
+                            select node;
+      if (parametricNodes.Count() > 0) {
+        SymbolicExpressionTreeNode selectedPoint = parametricNodes.SelectRandom(random);
 
-      SymbolicExpressionTreeNode selectedPoint = (from node in symbolicExpressionTree.IterateNodesPrefix()
-                                                  where node.HasLocalParameters
-                                                  select node).SelectRandom(random);
-
-      selectedPoint.ShakeLocalParameters(random, 1.0);
-      success = true;
+        selectedPoint.ShakeLocalParameters(random, 1.0);
+        success = true;
+      } else {
+        success = false;
+      }
     }
   }