Changeset 3722

Timestamp:

05/08/10 18:06:55 (14 years ago)

Author:

gkronber

Message:

Fixed bug in subroutine duplicator. #937 (Data types and operators for symbolic expression tree encoding)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureManipulators/SubroutineDuplicater.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/ArchitectureManipulators/SubroutineDuplicater.cs

@@ -59 +59 @@
       int maxFunctionDefiningBranches, int maxFunctionArguments) {
       var functionDefiningBranches = symbolicExpressionTree.IterateNodesPrefix().OfType<DefunTreeNode>();
+      if (functionDefiningBranches.Count() == 0 || functionDefiningBranches.Count() == maxFunctionDefiningBranches)
+        // no function defining branches to duplicate or already reached the max number of ADFs
+        return false;
 
       string formatString = new StringBuilder().Append('0', (int)Math.Log10(maxFunctionDefiningBranches) + 1).ToString(); // >= 100 functions => ###
       var allowedFunctionNames = from index in Enumerable.Range(0, maxFunctionDefiningBranches)
                                  select "ADF" + index.ToString(formatString);
-      if (functionDefiningBranches.Count() == 0 || functionDefiningBranches.Count() == maxFunctionDefiningBranches)
-        // no function defining branches to duplicate or already reached the max number of ADFs
-        return false;
       var selectedBranch = functionDefiningBranches.SelectRandom(random);
       var duplicatedDefunBranch = (DefunTreeNode)selectedBranch.Clone();