Changeset 16159

Timestamp:

09/20/18 13:18:47 (6 years ago)

Author:

bburlacu

Message:

#2886: Refactor unit test using only C# 4.5 features.

File:

• branches/2886_SymRegGrammarEnumeration/Test/TreeHashingTest.cs (modified) (1 diff)

branches/2886_SymRegGrammarEnumeration/Test/TreeHashingTest.cs

@@ -153 +153 @@
       //const int nvars = 1;
       //var variables = Enumerable.Range(1, nvars).Select(x => $"x{x}").ToArray();
-      var variables = new[] { "b", "a" };
+      var variables = new[] { "x", "y", "z", "w" };
       var grammar = new Grammar(variables, Enum.GetValues(typeof(GrammarRule)).Cast<GrammarRule>());
 
-      int hash(SymbolList s) => grammar.Hasher.CalcHashCode(s);
+      Func<SymbolList, int> hash = s => grammar.Hasher.CalcHashCode(s);
 
       List<SymbolList> sentences = EnumerateGrammarBreadth(grammar, length: 20, hashPhrases: false).ToList();
-      Console.WriteLine($"Breadth: {sentences.Count};{sentences.Select(hash).Distinct().Count() }");
+      Console.WriteLine("Breadth: {0} generated, {1} distinct sentences", sentences.Count, sentences.GroupBy(hash).Count());
 
       sentences = EnumerateGrammarBreadth(grammar, length: 20, hashPhrases: true).ToList();
-      Console.WriteLine($"Breadth (hashed): {sentences.Count};{sentences.Select(hash).Distinct().Count() }");
+      Console.WriteLine("Breadth (hashed): {0} generated, {1} distinct sentences", sentences.Count, sentences.GroupBy(hash).Count());
 
       sentences = EnumerateGrammarDepth(grammar, length: 20, hashPhrases: false).ToList();
-      Console.WriteLine($"Depth: {sentences.Count};{sentences.Select(hash).Distinct().Count() }");
+      Console.WriteLine("Depth: {0} generated, {1} distinct sentences", sentences.Count, sentences.GroupBy(hash).Count());
 
       sentences = EnumerateGrammarDepth(grammar, length: 20, hashPhrases: true).ToList();
-      Console.WriteLine($"Depth (hashed): {sentences.Count};{sentences.Select(hash).Distinct().Count() }");
+      Console.WriteLine("Depth (hashed): {0} generated, {1} distinct sentences", sentences.Count, sentences.GroupBy(hash).Count());
     }