Changeset 15803 for branches

Timestamp:

02/22/18 13:11:40 (7 years ago)

Author:

lkammere

Message:

#2886: Deactivate generation of dot file for visualizing search tree.

Location:

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

Files:

• Grammar.cs (modified) (6 diffs)
• GrammarEnumerationAlgorithm.cs (modified) (9 diffs)

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

@@ -11 +11 @@
   public class Grammar {
 
-    public Symbol StartSymbol;
+    public Symbol StartSymbol { get; }
 
     #region Symbols
-
     public VariableSymbol Var;
 
@@ -43 +42 @@
     #endregion
 
-
     #region HL Symbols for Parsing ExpressionTrees
-
     private TypeCoherentExpressionGrammar symbolicExpressionGrammar;
 
@@ -60 +57 @@
     private ISymbol rootSy;
     private ISymbol startSy;
-
     #endregion
 
@@ -90 +86 @@
       ClosingBracket = new TerminalSymbol(")");
       #endregion
-
 
       #region Production rules
@@ -179 +174 @@
         }
 
-        var result = uniqueChildHashes.ToList();
-        result.Sort();
-        return result.ToArray();
+        var result = uniqueChildHashes.ToArray();
+        Array.Sort(result);
+        return result;
       }
 
@@ -266 +261 @@
       return hashesArray.Aggregate(start, (result, ti) => ((result << 5) + result) ^ ti.GetHashCode());
     }
-
-    /*
-    private void CancelOutCompoundInverse(Stack<Symbol> parseStack) {
-      // Resolve compound divisions
-      int compoundFractionsCount = 0;
-
-      while (ReferenceEquals(parseStack.Peek(), Inv)) {
-        compoundFractionsCount++;
-        parseStack.Pop();
-      }
-
-      if (compoundFractionsCount % 2 != 0) {
-        // Compound division are reduced to a single division.
-        parseStack.Push(Inv);
-      } // else: compound divisions fully cancel out each other.
-    } */
     #endregion
 

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

@@ -25 +25 @@
     private readonly string BestTrainingQualityName = "Best R² (Training)";
     private readonly string BestTrainingSolutionName = "Best solution (Training)";
+    private readonly string SearchStructureSizeName = "Search Structure Size";
+    private readonly string GeneratedPhrasesName = "Generated/Archived Phrases";
     private readonly string GeneratedSentencesName = "Generated Sentences";
     private readonly string DistinctSentencesName = "Distinct Sentences";
@@ -115 +117 @@
 
       using (TextWriterTraceListener dotFileTrace = new TextWriterTraceListener(new FileStream(dotFileName, FileMode.Create))) {
-        dotFileTrace.Write("digraph searchgraph {"); 
+        LogSearchGraph(dotFileTrace, "digraph searchgraph {");
 
         OpenPhrases.Store(phrase0Hash, phrase0);
@@ -124 +126 @@
           SymbolString currPhrase = fetchedPhrase.SymbolString;
 
-          dotFileTrace.Write(
-            $"{fetchedPhrase.Hash} [label=\"{Grammar.PostfixToInfixParser(fetchedPhrase.SymbolString)}\"];");
+          LogSearchGraph(dotFileTrace, $"{fetchedPhrase.Hash} [label=\"{Grammar.PostfixToInfixParser(fetchedPhrase.SymbolString)}\"];");
 
           ArchivedPhrases.Add(fetchedPhrase.Hash, currPhrase);
@@ -142 +143 @@
               var phraseHash = Grammar.CalcHashCode(newPhrase);
 
-              dotFileTrace.Write(
-                $"{fetchedPhrase.Hash} -> {phraseHash} [label=\"{expandedSymbol.StringRepresentation} + → {productionAlternative}\"];");
+              LogSearchGraph(dotFileTrace, $"{fetchedPhrase.Hash} -> {phraseHash} [label=\"{expandedSymbol.StringRepresentation} + → {productionAlternative}\"];");
 
               if (newPhrase.IsSentence()) {
@@ -155 +155 @@
                   EvaluateSentence(newPhrase);
 
-                  dotFileTrace.Write(
-                    $"{phraseHash} [label=\"{Grammar.PostfixToInfixParser(newPhrase)}\", style=\"filled\"];");
+                  LogSearchGraph(dotFileTrace, $"{phraseHash} [label=\"{Grammar.PostfixToInfixParser(newPhrase)}\", style=\"filled\"];");
                 }
                 UpdateView(AllSentences, DistinctSentences);
@@ -168 +167 @@
 
         // Overwrite formatting of start search node and best found solution.
-        dotFileTrace.Write(
-          $"{Grammar.CalcHashCode(BestTrainingSentence)} [label=\"{Grammar.PostfixToInfixParser(BestTrainingSentence)}\", shape=Mcircle, style=\"filled,bold\"];");
-        dotFileTrace.Write($"{phrase0Hash} [label=\"{Grammar.PostfixToInfixParser(phrase0)}\", shape=doublecircle];}}");
+        LogSearchGraph(dotFileTrace, $"{Grammar.CalcHashCode(BestTrainingSentence)} [label=\"{Grammar.PostfixToInfixParser(BestTrainingSentence)}\", shape=Mcircle, style=\"filled,bold\"];");
+        LogSearchGraph(dotFileTrace, $"{phrase0Hash} [label=\"{Grammar.PostfixToInfixParser(phrase0)}\", shape=doublecircle];}}");
         dotFileTrace.Flush();
       }
@@ -219 +217 @@
       Results.Add(new Result(BestTrainingQualityName, new DoubleValue(-1.0)));
 
+      Results.Add(new Result(GeneratedPhrasesName, new IntValue(0)));
+      Results.Add(new Result(SearchStructureSizeName, new IntValue(0)));
       Results.Add(new Result(GeneratedSentencesName, new IntValue(0)));
       Results.Add(new Result(DistinctSentencesName, new IntValue(0)));
@@ -234 +234 @@
       if (force || updates % GuiUpdateInterval == 0) {
         var allGeneratedEnum = allGenerated.Values.SelectMany(x => x).ToArray();
+        ((IntValue)Results[GeneratedPhrasesName].Value).Value = ArchivedPhrases.Count;
+        ((IntValue)Results[SearchStructureSizeName].Value).Value = OpenPhrases.Count;
         ((IntValue)Results[GeneratedSentencesName].Value).Value = allGeneratedEnum.Length;
         ((IntValue)Results[DistinctSentencesName].Value).Value = distinctGenerated.Count;
@@ -277 +279 @@
       Results.Add(new Result("Distinct generated sentences", new StringMatrix(distinctSentencesMatrix)));
     }
+   
+    private void LogSearchGraph(TraceListener listener, String msg) {
+#if false
+      listener.Write(msg);
+#endif
+    }
     #endregion