Changeset 451 for trunk

Timestamp:

08/05/08 16:38:38 (16 years ago)

Author:

gkronber

Message:

added checking of sub-operator type constraints to IsValidTree (ticket #225)

File:

• trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs (modified) (1 diff)

trunk/sources/HeuristicLab.StructureIdentification/TreeGardener.cs

@@ -282 +282 @@
 
     internal bool IsValidTree(IFunctionTree tree) {
+      SubOperatorsConstraintAnalyser analyzer = new SubOperatorsConstraintAnalyser();
+      analyzer.AllPossibleOperators = AllFunctions.Cast<IOperator>().ToArray<IOperator>();
+      for(int i = 0; i < tree.SubTrees.Count; i++) {
+        if(!analyzer.GetAllowedOperators(tree.Function, i).Contains(tree.SubTrees[i].Function)) return false;
+      }
+
       foreach(IConstraint constraint in tree.Function.Constraints) {
         if(constraint is NumberOfSubOperatorsConstraint) {