Changeset 11494 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammar.cs

Timestamp:

10/24/14 16:45:06 (10 years ago)

Author:

mkommend

Message:

#2268: Moved all grammar classes into a new folder. Added new EmptySymbolicExpressionTreeGrammar which is immutable and forwards all calls to the default grammar object.

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars

Files:

• . (added)
• SymbolicExpressionGrammar.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs) (4 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammar.cs

@@ -110 +110 @@
       set { defunSymbol = (Defun)value; }
     }
+
+    private readonly ISymbolicExpressionTreeGrammar emptyGrammar;
     #endregion
 
@@ -117 +119 @@
         RegisterSymbolEvents(symbol);
     }
+
     [StorableConstructor]
-    protected SymbolicExpressionGrammar(bool deserializing) : base(deserializing) { }
+    protected SymbolicExpressionGrammar(bool deserializing)
+      : base(deserializing) {
+      emptyGrammar = new EmptySymbolicExpressionTreeGrammar(this);
+    }
     protected SymbolicExpressionGrammar(SymbolicExpressionGrammar original, Cloner cloner)
       : base(original, cloner) {
+      emptyGrammar = new EmptySymbolicExpressionTreeGrammar(this);
+
       foreach (ISymbol symbol in symbols.Values)
         RegisterSymbolEvents(symbol);
@@ -134 +142 @@
     }
 
-    public SymbolicExpressionGrammar(string name, string description)
+    protected SymbolicExpressionGrammar(string name, string description)
       : base(name, description) {
+      emptyGrammar = new EmptySymbolicExpressionTreeGrammar(this);
+
       programRootSymbol = new ProgramRootSymbol();
       AddSymbol(programRootSymbol);
@@ -160 +170 @@
         AddAllowedChildSymbol(programRootSymbol, defunSymbol, argumentIndex);
       }
+    }
+
+    public ISymbolicExpressionTreeGrammar CreateExpressionTreeGrammar() {
+      if (MaximumFunctionDefinitions == 0) return emptyGrammar;
+      else return new SymbolicExpressionTreeGrammar(this);
     }