Changeset 6760 for branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators

Timestamp:

09/14/11 13:59:25 (13 years ago)

Author:

epitzer

Message:

#1530 integrate changes from trunk

Location:

branches/PersistenceSpeedUp

Files:

• . (modified) (2 props)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDuplicater.cs (modified) (2 diffs)

branches/PersistenceSpeedUp

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates

branches/PersistenceSpeedUp/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDuplicater.cs

@@ -83 +83 @@
           subtree.Grammar.SetSubtreeCount(invokeSymbol, duplicatedDefunBranch.NumberOfArguments, duplicatedDefunBranch.NumberOfArguments);
 
-          foreach (Symbol symbol in subtree.Grammar.Symbols) {
+          foreach (ISymbol symbol in subtree.Grammar.Symbols) {
             if (subtree.Grammar.IsAllowedChildSymbol(symbol, matchingInvokeSymbol))
               subtree.Grammar.AddAllowedChildSymbol(symbol, invokeSymbol);
@@ -93 +93 @@
           }
 
-          foreach (Symbol symbol in subtree.Grammar.GetAllowedChildSymbols(matchingInvokeSymbol))
+          foreach (ISymbol symbol in subtree.Grammar.GetAllowedChildSymbols(matchingInvokeSymbol))
             if (symbol != invokeSymbol) //avoid duplicate entry invokesymbol / invokesymbol
               subtree.Grammar.AddAllowedChildSymbol(invokeSymbol, symbol);
           for (int i = 0; i < subtree.Grammar.GetMaximumSubtreeCount(matchingInvokeSymbol); i++) {
-            foreach (Symbol symbol in subtree.Grammar.GetAllowedChildSymbols(matchingInvokeSymbol, i).Except(subtree.Grammar.GetAllowedChildSymbols(matchingInvokeSymbol)))
+            foreach (ISymbol symbol in subtree.Grammar.GetAllowedChildSymbols(matchingInvokeSymbol, i).Except(subtree.Grammar.GetAllowedChildSymbols(matchingInvokeSymbol)))
               subtree.Grammar.AddAllowedChildSymbol(invokeSymbol, symbol, i);
           }

@@ -12 +12 @@
 *.psess
 *.vsp
+*.docstates