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

Timestamp:

06/28/18 16:56:41 (6 years ago)

Author:

bburlacu

Message:

#2886: address additional serialization issues, make Production implement IList<T> instead of deriving from List<T>

File:

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

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

@@ -24 +24 @@
     public Symbol StartSymbol { get; private set; }
 
-    public Hasher<int> Hasher { get; }
+    public Hasher<int> Hasher { get; private set; }
 
     #region Symbols
@@ -77 +77 @@
     public Grammar(string[] variables) : this(variables, Enum.GetValues(typeof(GrammarRule)).Cast<GrammarRule>()) { }
 
+    [StorableConstructor]
+    protected Grammar(bool deserializing) {
+      InitTreeParser();
+    }
+
     protected Grammar(Grammar original, Cloner cloner) : base(original, cloner) {
       infixExpressionFormatter = cloner.Clone(original.infixExpressionFormatter);
@@ -83 +88 @@
       VarTerminals = original.VarTerminals.Select(cloner.Clone).ToList();
 
-      Var = cloner.Clone(original.Var);
-      Expr = cloner.Clone(original.Expr);
-      Term = cloner.Clone(original.Term);
-      Factor = cloner.Clone(original.Factor);
-      LogFactor = cloner.Clone(original.LogFactor);
-      ExpFactor = cloner.Clone(original.ExpFactor);
-      SinFactor = cloner.Clone(original.SinFactor);
-      SimpleExpr = cloner.Clone(original.SimpleExpr);
-      SimpleTerm = cloner.Clone(original.SimpleTerm);
-      InvExpr = cloner.Clone(original.InvExpr);
-      InvTerm = cloner.Clone(original.InvTerm);
-
-      Addition = cloner.Clone(original.Addition);
-      Multiplication = cloner.Clone(original.Multiplication);
-      Log = cloner.Clone(original.Log);
-      Exp = cloner.Clone(original.Exp);
-      Sin = cloner.Clone(original.Sin);
-      Inv = cloner.Clone(original.Inv);
-      Const = cloner.Clone(original.Const);
+      Var = (NonterminalSymbol)cloner.Clone(original.Var);
+      Expr = (NonterminalSymbol)cloner.Clone(original.Expr);
+      Term = (NonterminalSymbol)cloner.Clone(original.Term);
+      Factor = (NonterminalSymbol)cloner.Clone(original.Factor);
+      LogFactor = (NonterminalSymbol)cloner.Clone(original.LogFactor);
+      ExpFactor = (NonterminalSymbol)cloner.Clone(original.ExpFactor);
+      SinFactor = (NonterminalSymbol)cloner.Clone(original.SinFactor);
+      SimpleExpr = (NonterminalSymbol)cloner.Clone(original.SimpleExpr);
+      SimpleTerm = (NonterminalSymbol)cloner.Clone(original.SimpleTerm);
+      InvExpr = (NonterminalSymbol)cloner.Clone(original.InvExpr);
+      InvTerm = (NonterminalSymbol)cloner.Clone(original.InvTerm);
+
+      Addition = (TerminalSymbol)cloner.Clone(original.Addition);
+      Multiplication = (TerminalSymbol)cloner.Clone(original.Multiplication);
+      Log = (TerminalSymbol)cloner.Clone(original.Log);
+      Exp = (TerminalSymbol)cloner.Clone(original.Exp);
+      Sin = (TerminalSymbol)cloner.Clone(original.Sin);
+      Inv = (TerminalSymbol)cloner.Clone(original.Inv);
+      Const = (TerminalSymbol)cloner.Clone(original.Const);
 
       StartSymbol = Expr;
@@ -240 +245 @@
     public double EvaluatePhrase(SymbolString s, IRegressionProblemData problemData, bool optimizeConstants) {
       SymbolicExpressionTree tree = ParseSymbolicExpressionTree(s);
+
       return RSquaredEvaluator.Evaluate(problemData, tree, optimizeConstants);
     }