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

Timestamp:

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

Author:

lkammere

Message:

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

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs (modified) (3 diffs)

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

@@ -14 +14 @@
 
     #region Symbols
-    public VariableSymbol Var;
+
+    public IReadOnlyDictionary<Symbol, IReadOnlyList<Production>> Productions { get; }
+
+    public NonterminalSymbol Var;
+    public IReadOnlyList<VariableTerminalSymbol> VarTerminals;
 
     public NonterminalSymbol Expr;
@@ -65 +69 @@
     public Grammar(string[] variables) {
       #region Define Symbols
-      Var = new VariableSymbol("var", variables);
+      Var = new NonterminalSymbol("Var");
 
       Expr = new NonterminalSymbol("Expr");
@@ -96 +100 @@
       StartSymbol = Expr;
 
-      Expr.AddProduction(Term, Expr, Addition);
-      Expr.AddProduction(Term);
-
-      Term.AddProduction(Factor, Term, Multiplication);
-      Term.AddProduction(Factor);
-      Term.AddProduction(InvExpr, Inv);
-
-      Factor.AddProduction(Var);
-      Factor.AddProduction(LogFactor);
-      Factor.AddProduction(ExpFactor);
-      Factor.AddProduction(SinFactor);
-      Factor.AddProduction(CosFactor);
-
-      LogFactor.AddProduction(SimpleExpr, Log);
-      ExpFactor.AddProduction(SimpleTerm, Exp);
-      SinFactor.AddProduction(SimpleExpr, Sin);
-      CosFactor.AddProduction(SimpleExpr, Cos);
-
-      SimpleExpr.AddProduction(SimpleTerm, SimpleExpr, Addition);
-      SimpleExpr.AddProduction(SimpleTerm);
-
-      SimpleTerm.AddProduction(Var, SimpleTerm, Multiplication);
-      SimpleTerm.AddProduction(Var);
-
-      InvExpr.AddProduction(InvTerm, InvExpr, Addition);
-      InvExpr.AddProduction(InvTerm);
-
-      InvTerm.AddProduction(Factor, InvTerm, Multiplication);
-      InvTerm.AddProduction(Factor);
+      Dictionary<Symbol, IReadOnlyList<Production>> productions = new Dictionary<Symbol, IReadOnlyList<Production>>();
+
+      // Map each variable to a separate production rule of the "Var" nonterminal symbol.
+      VarTerminals = variables.Select(v => new VariableTerminalSymbol(v)).ToArray();
+      productions[Var] = VarTerminals.Select(v => new Production(v)).ToArray();
+
+      productions[Expr] = new[] {
+        new Production(Term, Expr, Addition),
+        new Production(Term)
+      };
+
+      productions[Term] = new[] {
+        new Production(Factor, Term, Multiplication),
+        new Production(Factor),
+        new Production(InvExpr, Inv)
+      };
+
+      productions[Factor] = new[] {
+        new Production(Var),
+        new Production(LogFactor),
+        new Production(ExpFactor),
+        new Production(SinFactor),
+        new Production(CosFactor),
+      };
+
+      productions[LogFactor] = new[] { new Production(SimpleExpr, Log) };
+      productions[ExpFactor] = new[] { new Production(SimpleTerm, Exp) };
+      productions[SinFactor] = new[] { new Production(SimpleExpr, Sin) };
+      productions[CosFactor] = new[] { new Production(SimpleExpr, Cos) };
+
+      productions[SimpleExpr] = new[] {
+        new Production(SimpleTerm, SimpleExpr, Addition),
+        new Production(SimpleTerm)
+      };
+
+      productions[SimpleTerm] = new[] {
+        new Production(Var, SimpleTerm, Multiplication),
+        new Production(Var)
+      };
+
+      productions[InvExpr] = new[] {
+        new Production(InvTerm, InvExpr, Addition),
+        new Production(InvTerm)
+      };
+
+      productions[InvTerm] = new[] {
+        new Production(Factor, InvTerm, Multiplication),
+        new Production(Factor)
+      };
+
+      Productions = productions;
       #endregion