Changeset 11494 for trunk/sources

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

Files:

• Grammars (added)
• Grammars/EmptySymbolicExpressionTreeGrammar.cs (added)
• Grammars/SymbolicExpressionGrammar.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs) (4 diffs)
• Grammars/SymbolicExpressionGrammarBase.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs) (1 diff)
• Grammars/SymbolicExpressionTreeGrammar.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (2 diffs)
• Interfaces/ISymbolicExpressionGrammar.cs (modified) (1 diff)

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);
     }
 

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

@@ -64 +64 @@
 
     private bool suppressEvents;
-    protected Dictionary<string, ISymbol> symbols;
-    protected Dictionary<string, Tuple<int, int>> symbolSubtreeCount;
-    protected Dictionary<string, List<string>> allowedChildSymbols;
-    protected Dictionary<Tuple<string, int>, List<string>> allowedChildSymbolsPerIndex;
+    protected internal Dictionary<string, ISymbol> symbols;
+    protected internal Dictionary<string, Tuple<int, int>> symbolSubtreeCount;
+    protected internal Dictionary<string, List<string>> allowedChildSymbols;
+    protected internal Dictionary<Tuple<string, int>, List<string>> allowedChildSymbolsPerIndex;
 
     public override bool CanChangeName {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

@@ -136 +136 @@
     <Compile Include="Formatters\SymbolicExpressionTreeGraphvizFormatter.cs" />
     <Compile Include="Formatters\SymbolicExpressionTreeHierarchicalFormatter.cs" />
+    <Compile Include="Grammars\EmptySymbolicExpressionTreeGrammar.cs" />
     <Compile Include="Interfaces\IReadOnlySymbol.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />
@@ -166 +167 @@
     <Compile Include="Manipulators\SymbolicExpressionTreeManipulator.cs" />
     <Compile Include="Plugin.cs" />
-    <Compile Include="SymbolicExpressionGrammarBase.cs" />
-    <Compile Include="SymbolicExpressionGrammar.cs" />
-    <Compile Include="SymbolicExpressionTreeGrammar.cs" />
+    <Compile Include="Grammars\SymbolicExpressionGrammarBase.cs" />
+    <Compile Include="Grammars\SymbolicExpressionGrammar.cs" />
+    <Compile Include="Grammars\SymbolicExpressionTreeGrammar.cs" />
     <Compile Include="SymbolicExpressionTreeTopLevelNode.cs" />
     <Compile Include="Crossovers\SubtreeCrossover.cs">

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionGrammar.cs

@@ -48 +48 @@
     void StartGrammarManipulation();
     void FinishedGrammarManipulation();
+
+    ISymbolicExpressionTreeGrammar CreateExpressionTreeGrammar();
   }
 }