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

Timestamp:

02/23/18 18:10:30 (7 years ago)

Author:

lkammere

Message:

#2886: Performance Improvements - Only store hash of archived phrases and reduce number of enumerators.

Location:

branches/2886_SymRegGrammarEnumeration

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs (modified) (9 diffs)

branches/2886_SymRegGrammarEnumeration

@@ -1 +1 @@
 TestResults
+*.gitignore

@@ -1 +1 @@
 TestResults
+*.gitignore

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

@@ -143 +143 @@
     }
 
-    private int CalcHashCode<THashType>(SymbolString sentence, Func<Symbol, IEnumerable<THashType>, THashType> aggregateFunction) {
+    private int CalcHashCode<THashType>(SymbolString sentence, Func<Symbol, THashType[], THashType> aggregateFunction) {
       Debug.Assert(sentence.Any(), "Trying to evaluate empty sentence!");
 
@@ -152 +152 @@
     }
 
-    private THashType[] GetSubtreeHashes<THashType>(Stack<Symbol> parseStack, Func<Symbol, IEnumerable<THashType>, THashType> aggregateHashes) {
+    private THashType[] GetSubtreeHashes<THashType>(Stack<Symbol> parseStack, Func<Symbol, THashType[], THashType> aggregateHashes) {
       Symbol currentSymbol = parseStack.Pop();
 
@@ -207 +207 @@
 
           var currFactor = childHashes[i];
-          var invFactor = aggregateHashes(Inv, currFactor.ToEnumerable());
+          var invFactor = aggregateHashes(Inv, new[] { currFactor });
 
           int indexOfInv = childHashes.IndexOf(invFactor);
@@ -228 +228 @@
 
       // var or nonterminal symbol
-      return new[] { aggregateHashes(currentSymbol, Enumerable.Empty<THashType>()) };
-    }
-
-    private string AggregateStringHashes(Symbol operatorSym, IEnumerable<string> hashes) {
+      return new[] { aggregateHashes(currentSymbol, new THashType[0]) };
+    }
+
+    private string AggregateStringHashes(Symbol operatorSym, string[] hashes) {
       var hashesArray = hashes.ToArray();
 
@@ -237 +237 @@
         return hashesArray[0];
       }
-      if (operatorSym is NonterminalSymbol || Var.VariableTerminalSymbols.Contains(operatorSym)) {
+      if (operatorSym is NonterminalSymbol || ((TerminalSymbol)operatorSym).IsVariable) {
         return operatorSym.StringRepresentation;
       }
@@ -244 +244 @@
     }
 
-    private int AggregateIntHashes(Symbol operatorSym, IEnumerable<int> hashes) {
-      var hashesArray = hashes.ToArray();
-
+    private int AggregateIntHashes(Symbol operatorSym, int[] hashes) {
       int start;
       if ((ReferenceEquals(operatorSym, Addition) || ReferenceEquals(operatorSym, Multiplication)) &&
-          hashesArray.Count() <= 1) {
+          hashes.Length <= 1) {
         start = 0;
 
-      } else if (operatorSym is NonterminalSymbol || Var.VariableTerminalSymbols.Contains(operatorSym)) {
+      } else if (operatorSym is NonterminalSymbol || ((TerminalSymbol)operatorSym).IsVariable) {
         return operatorSym.StringRepresentation.GetHashCode();
 
@@ -259 +257 @@
       }
 
-      return hashesArray.Aggregate(start, (result, ti) => ((result << 5) + result) ^ ti.GetHashCode());
+      for (int i = 0; i < hashes.Length; i++) {
+        start = ((start << 5) + start) ^ hashes[i];
+      }
+      return start;
     }
     #endregion
@@ -314 +315 @@
         parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack));
 
-      } else if (Var.VariableTerminalSymbols.Contains(currentSymbol)) {
+      } else if (currentSymbol.IsVariable) {
         VariableTreeNode varNode = (VariableTreeNode)varSy.CreateTreeNode();
         varNode.Weight = 1.0;
@@ -337 +338 @@
       Symbol head = parseStack.Pop();
 
-      SymbolString result = new SymbolString();
+      SymbolString result = new SymbolString(parseStack.Count);
 
       if (ReferenceEquals(head, Addition) || ReferenceEquals(head, Multiplication)) {

@@ -1 +1 @@
 TestResults
+*.gitignore