Changeset 238 for trunk

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

Location:

trunk/sources/HeuristicLab.StructureIdentification

Files:

• Manipulation/ChangeNodeTypeManipulation.cs (modified) (3 diffs)
• Manipulation/CutOutNodeManipulation.cs (modified) (5 diffs)
• Manipulation/DeleteSubTreeManipulation.cs (modified) (4 diffs)
• Manipulation/SubstituteSubTreeManipulation.cs (modified) (3 diffs)
• Recombination/SizeFairCrossOver.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.StructureIdentification/Manipulation/ChangeNodeTypeManipulation.cs

@@ -30 +30 @@
 using HeuristicLab.Constraints;
 using HeuristicLab.Functions;
+using System.Diagnostics;
 
 namespace HeuristicLab.StructureIdentification {
@@ -85 +86 @@
           // updating the variable is not necessary because it stays the same
         }
-        if(!gardener.IsValidTree(root)) throw new InvalidProgramException();
+        Debug.Assert(gardener.IsValidTree(root));
         // size and height stays the same when changing a terminal so no need to update the variables
         // schedule an operation to initialize the new terminal
@@ -119 +120 @@
         treeHeight.Data = gardener.GetTreeHeight(root); // must recalculate height because we can't know wether the manipulated branch was the deepest branch
         // check if whole tree is ok
-        if(!gardener.IsValidTree(root))
-          throw new InvalidProgramException();
+        Debug.Assert(gardener.IsValidTree(root));
         // return a composite operation that initializes all created sub-trees
         return gardener.CreateInitializationOperation(uninitializedBranches, scope);

trunk/sources/HeuristicLab.StructureIdentification/Manipulation/CutOutNodeManipulation.cs

@@ -28 +28 @@
 using System;
 using HeuristicLab.Functions;
+using System.Diagnostics;
 
 namespace HeuristicLab.StructureIdentification {
@@ -77 +78 @@
           // update the variable
           scope.GetVariable(scope.TranslateName("FunctionTree")).Value = root;
-          if (!gardener.IsValidTree(root)) {
-            throw new InvalidProgramException();
-          }
+          Debug.Assert(gardener.IsValidTree(root));
           // we reused a sub-tree so we don't have to schedule initialization operations
           return null;
@@ -90 +89 @@
           // update the variable
           scope.GetVariable(scope.TranslateName("FunctionTree")).Value = newTree;
-          if (!gardener.IsValidTree(newTree)) {
-            throw new InvalidProgramException();
-          }
+          Debug.Assert(gardener.IsValidTree(newTree));
           // schedule an operation to initialize the whole tree
           return gardener.CreateInitializationOperation(gardener.GetAllSubTrees(newTree), scope);
@@ -108 +105 @@
         parent.RemoveSubTree(childIndex);
         parent.InsertSubTree(childIndex, selectedChild);
-        if (!gardener.IsValidTree(root)) {
-          throw new InvalidProgramException();
-        }
+        Debug.Assert(gardener.IsValidTree(root));
         // update the size and height of our tree
         GetVariableValue<IntData>("TreeSize", scope, true).Data = gardener.GetTreeSize(root);
@@ -129 +124 @@
         GetVariableValue<IntData>("TreeSize", scope, true).Data = gardener.GetTreeSize(root);
         GetVariableValue<IntData>("TreeHeight", scope, true).Data = gardener.GetTreeHeight(root);
-        if (!gardener.IsValidTree(root)) {
-          throw new InvalidProgramException();
-        }
+        Debug.Assert(gardener.IsValidTree(root));
         // schedule an initialization operation for the new function-tree
         return gardener.CreateInitializationOperation(gardener.GetAllSubTrees(newFunctionTree), scope);

trunk/sources/HeuristicLab.StructureIdentification/Manipulation/DeleteSubTreeManipulation.cs

@@ -27 +27 @@
 using HeuristicLab.Random;
 using HeuristicLab.Functions;
+using System.Diagnostics;
 
 namespace HeuristicLab.StructureIdentification {
@@ -61 +62 @@
         IFunctionTree newTree = gardener.CreateBalancedRandomTree(1, 1);
         // check if the tree is ok
-        if(!gardener.IsValidTree(newTree)) {
-          throw new InvalidOperationException();
-        }
+        Debug.Assert(gardener.IsValidTree(newTree));
         // update sizes to match the new tree
         GetVariableValue<IntData>("TreeSize", scope, true).Data = gardener.GetTreeSize(newTree);
@@ -86 +85 @@
         // and find the first one that doesn't fit. At this position we insert a new randomly initialized subtree of matching type (gkronber 25.12.07)
 
-        if(!gardener.IsValidTree(root)) {
-          throw new InvalidOperationException();
-        }
+        Debug.Assert(gardener.IsValidTree(root));
         GetVariableValue<IntData>("TreeSize", scope, true).Data = gardener.GetTreeSize(root);
         GetVariableValue<IntData>("TreeHeight", scope, true).Data = gardener.GetTreeHeight(root);
@@ -99 +96 @@
         IFunctionTree newFunctionTree = gardener.CreateRandomTree(allowedFunctions, 1, 1);
         parent.InsertSubTree(childIndex, newFunctionTree);
-        if(!gardener.IsValidTree(root)) {
-          throw new InvalidProgramException();
-        }
+        Debug.Assert(gardener.IsValidTree(root));
         GetVariableValue<IntData>("TreeSize", scope, true).Data = gardener.GetTreeSize(root);
         GetVariableValue<IntData>("TreeHeight", scope, true).Data = gardener.GetTreeHeight(root);

trunk/sources/HeuristicLab.StructureIdentification/Manipulation/SubstituteSubTreeManipulation.cs

@@ -28 +28 @@
 using HeuristicLab.Random;
 using HeuristicLab.Functions;
+using System.Diagnostics;
 
 namespace HeuristicLab.StructureIdentification {
@@ -61 +62 @@
         // => create a new random tree
         IFunctionTree newTree = gardener.CreateRandomTree(gardener.AllFunctions, maxTreeSize, maxTreeHeight);
-        if(!gardener.IsValidTree(newTree)) {
-          throw new InvalidProgramException();
-        }
+        Debug.Assert(gardener.IsValidTree(newTree));
 
         // update the variables in the scope with the new values
@@ -94 +93 @@
         parent.InsertSubTree(childIndex, newTree);
 
-        if(!gardener.IsValidTree(root)) {
-          throw new InvalidProgramException();
-        }
-
+        Debug.Assert(gardener.IsValidTree(root));
         // update the values of treeSize and treeHeight
         GetVariableValue<IntData>("TreeSize", scope, true).Data = gardener.GetTreeSize(root);

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--;