Changeset 238 for trunk/sources/HeuristicLab.StructureIdentification/Recombination

Timestamp:

05/13/08 15:01:08 (16 years ago)

Author:

gkronber

Message:

used Debug.Assert to enable tree-validity checks only in debug builds

File:

• trunk/sources/HeuristicLab.StructureIdentification/Recombination/SizeFairCrossOver.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.StructureIdentification/Recombination/SizeFairCrossOver.cs

@@ -30 +30 @@
 using HeuristicLab.Constraints;
 using HeuristicLab.Functions;
+using System.Diagnostics;
 
 namespace HeuristicLab.StructureIdentification {
@@ -95 +96 @@
 
       // check if the new tree is valid and if the size of is still in the allowed bounds
-      if(!gardener.IsValidTree(newTree) ||
-        newTreeHeight > maxTreeHeight ||
-        newTreeSize > maxTreeSize) {
-        throw new InvalidProgramException();
-      }
+      Debug.Assert(gardener.IsValidTree(newTree) &&
+        newTreeHeight <= maxTreeHeight && newTreeSize <= maxTreeSize);
       return gardener.CreateInitializationOperation(newBranches, child);
     }
@@ -165 +163 @@
           //  - go down in tree1 => the tree that is inserted becomes smaller
           //  - however we have to get lucky to solve the 'allowed sub-trees' problem
-          if(tree1Height == 1 || (tree0Level>0 && random.Next(2) == 0)) {
+          if(tree1Height == 1 || (tree0Level > 0 && random.Next(2) == 0)) {
             // go up in tree0 
             tree0Level--;