Changeset 3360 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs

Timestamp:

04/15/10 19:58:42 (14 years ago)

Author:

gkronber

Message:

Fixed bugs in ADF operators and added test classes for ADF operators. #290 (Implement ADFs)

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs

@@ -128 +128 @@
       yield return this;
     }
-    //public int GetMinExpressionLength() {
-    //  return Grammar.GetMinExpressionLength(Symbol);
-    //}
-    //public int GetMaxExpressionLength() {
-    //  return Grammar.GetMaxExpressionLength(Symbol);
-    //}
-    //public int GetMinExpressionDepth() {
-    //  return Grammar.GetMinExpressionDepth(Symbol);
-    //}
     public IEnumerable<Symbol> GetAllowedSymbols(int argumentIndex) {
       return Grammar.Symbols.Where(s => Grammar.IsAllowedChild(Symbol, s, argumentIndex));
@@ -146 +137 @@
       return Grammar.GetMaxSubtreeCount(Symbol);
     }
-    //public int GetMaxExpressionLength(Symbol s) {
-    //  return Grammar.GetMaxExpressionLength(s);
-    //}
-    //public int GetMinExpressionLength(Symbol s) {
-    //  return Grammar.GetMinExpressionLength(s);
-    //}
-    //public int GetMinExpressionDepth(Symbol s) {
-    //  return Grammar.GetMinExpressionDepth(s);
-    //}
 
     #region ICloneable Members
@@ -165 +147 @@
 
 
-    public bool IsValidTree() {
-      var matchingSymbol = (from symb in Grammar.Symbols
-                            where symb.Name == Symbol.Name
-                            select symb).SingleOrDefault();
 
-      if (SubTrees.Count < Grammar.GetMinSubtreeCount(matchingSymbol)) return false;
-      else if (SubTrees.Count > Grammar.GetMaxSubtreeCount(matchingSymbol)) return false;
-      else for (int i = 0; i < SubTrees.Count; i++) {
-          if (!GetAllowedSymbols(i).Select(x => x.Name).Contains(SubTrees[i].Symbol.Name)) return false;
-          if (!SubTrees[i].IsValidTree()) return false;
-        }
-      return true;
-    }
   }
 }