Changeset 15734 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs

Timestamp:

02/07/18 17:30:02 (6 years ago)

Author:

gkronber

Message:

#2886 worked on grammar enumeration

Location:

branches/2886_SymRegGrammarEnumeration

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs (modified) (2 diffs)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs

@@ -158 +158 @@
     public int CalcHashCode(SymbolString sentence) {
       Debug.Assert(sentence.Any(), "Trying to evaluate empty sentence!");
-      Debug.Assert(sentence.All(s => s is TerminalSymbol), "Trying to evaluate symbol sequence with nonterminalsymbols!");
-
-      Stack<TerminalSymbol> parseStack = new Stack<TerminalSymbol>(sentence.OfType<TerminalSymbol>());
-
-      TerminalSymbol peek = parseStack.Peek();
+      // Debug.Assert(sentence.All(s => s is TerminalSymbol), "Trying to evaluate symbol sequence with nonterminalsymbols!");
+
+      Stack<Symbol> parseStack = new Stack<Symbol>(sentence);
+
+      Symbol peek = parseStack.Peek();
       int[] subtreeHashes = GetSubtreeHashes(parseStack);
       return AggregateHashes(peek, subtreeHashes);
     }
 
-    private int[] GetSubtreeHashes(Stack<TerminalSymbol> parseStack) {
-      TerminalSymbol currentSymbol = parseStack.Pop();
+    private int[] GetSubtreeHashes(Stack<Symbol> parseStack) {
+      Symbol currentSymbol = parseStack.Pop();
 
       // VARIABLE
-      if (Var.VariableTerminalSymbols.Contains(currentSymbol)) {
-        return currentSymbol.StringRepresentation.GetHashCode().ToEnumerable().ToArray();
-      }
+      // if (Var.VariableTerminalSymbols.Contains(currentSymbol)) {
+      //   return currentSymbol.StringRepresentation.GetHashCode().ToEnumerable().ToArray();
+      // }
 
       // MULTIPLICATION
@@ -220 +220 @@
         return result.ToArray();
       }
-      throw new ArgumentException("Trying to hash malformed sentence!");
-    }
-
-    private int AggregateHashes(TerminalSymbol rule, IEnumerable<int> hashes) {
+
+      // var
+      return currentSymbol.StringRepresentation.GetHashCode().ToEnumerable().ToArray();
+
+
+      // throw new ArgumentException("Trying to hash malformed sentence!");
+    }
+
+    private int AggregateHashes(Symbol operatorSym, IEnumerable<int> hashes) {
       // If multiple subtrees are "merged" (e.g. added, multiplied, etc.), consider the executed operation
       var hashesArray = hashes.ToArray();
-      int start = hashesArray.Length > 1 ? rule.StringRepresentation.GetHashCode() : 0;
+      int start = hashesArray.Length > 1 ? operatorSym.StringRepresentation.GetHashCode() : 0;
       return hashesArray.Aggregate(start, (result, ti) => ((result << 5) + result) ^ ti.GetHashCode());
     }