Changeset 15834 for branches/2886_SymRegGrammarEnumeration/Test

Timestamp:

03/08/18 11:42:18 (6 years ago)

Author:

lkammere

Message:

#2886: Store production rules in grammar instead of nonterminal symbols.

Location:

branches/2886_SymRegGrammarEnumeration/Test

Files:

• GrammarEnumerationTest.cs (modified) (3 diffs)
• TreeHashingTest.cs (modified) (1 diff)

branches/2886_SymRegGrammarEnumeration/Test/GrammarEnumerationTest.cs

@@ -62 +62 @@
       alg.Start();
 
-      TerminalSymbol varSymbol = alg.Grammar.Var.VariableTerminalSymbols.First();
+      TerminalSymbol varSymbol = alg.Grammar.VarTerminals.First();
       TerminalSymbol mulSymbol = alg.Grammar.Multiplication;
       TerminalSymbol addSymbol = alg.Grammar.Addition;
@@ -117 +117 @@
       alg.Start();
 
-      TerminalSymbol varSymbol = alg.Grammar.Var.VariableTerminalSymbols.First();
+      TerminalSymbol varSymbol = alg.Grammar.VarTerminals.First();
       TerminalSymbol mulSymbol = alg.Grammar.Multiplication;
       TerminalSymbol addSymbol = alg.Grammar.Addition;
@@ -145 +145 @@
       alg.Start();
 
-      TerminalSymbol xSymbol = alg.Grammar.Var.VariableTerminalSymbols.First(v => v.StringRepresentation == "X");
-      TerminalSymbol ySymbol = alg.Grammar.Var.VariableTerminalSymbols.First(v => v.StringRepresentation == "Y");
+      TerminalSymbol xSymbol = alg.Grammar.VarTerminals.First(v => v.StringRepresentation == "X");
+      TerminalSymbol ySymbol = alg.Grammar.VarTerminals.First(v => v.StringRepresentation == "Y");
       TerminalSymbol mulSymbol = alg.Grammar.Multiplication;
       TerminalSymbol addSymbol = alg.Grammar.Addition;

branches/2886_SymRegGrammarEnumeration/Test/TreeHashingTest.cs

@@ -17 +17 @@
       grammar = new Grammar(new[] { "a", "b", "c" });
 
-      varA = grammar.Var.VariableTerminalSymbols.First(s => s.StringRepresentation == "a");
-      varB = grammar.Var.VariableTerminalSymbols.First(s => s.StringRepresentation == "b");
-      varC = grammar.Var.VariableTerminalSymbols.First(s => s.StringRepresentation == "c");
+      varA = grammar.VarTerminals.First(s => s.StringRepresentation == "a");
+      varB = grammar.VarTerminals.First(s => s.StringRepresentation == "b");
+      varC = grammar.VarTerminals.First(s => s.StringRepresentation == "c");
     }