Changeset 4262

Timestamp:

08/19/10 11:23:19 (14 years ago)

Author:

mkommend

Message:

Made DefaultGrammar abstract and sealed GlobalGrammar (ticket #1028).

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• DefaultSymbolicExpressionGrammar.cs (modified) (2 diffs)
• GlobalSymbolicExpressionGrammar.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/DefaultSymbolicExpressionGrammar.cs

@@ -37 +37 @@
   [StorableClass]
   [Item("DefaultSymbolicExpressionGrammar", "Represents a grammar that defines the syntax of symbolic expression trees.")]
-  public class DefaultSymbolicExpressionGrammar : Item, ISymbolicExpressionGrammar {
+  public abstract class DefaultSymbolicExpressionGrammar : Item, ISymbolicExpressionGrammar {
 
     #region properties for separation between implementation and persistence
@@ -88 +88 @@
     private Symbol startSymbol;
 
-    public DefaultSymbolicExpressionGrammar()
+    protected DefaultSymbolicExpressionGrammar()
       : base() {
       this.minSubTreeCount = new Dictionary<string, int>();

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/GlobalSymbolicExpressionGrammar.cs

@@ -30 +30 @@
   [StorableClass]
   [Item("GlobalSymbolicExpressionGrammar", "Represents a grammar that defines the syntax of symbolic expression trees.")]
-  public class GlobalSymbolicExpressionGrammar : DefaultSymbolicExpressionGrammar {
+  public sealed class GlobalSymbolicExpressionGrammar : DefaultSymbolicExpressionGrammar {
     [Storable]
     private int minFunctionDefinitions;
@@ -103 +103 @@
 
     //ctor for cloning
-    protected GlobalSymbolicExpressionGrammar() : base() { }
+    private GlobalSymbolicExpressionGrammar() : base() { }
     [StorableConstructor]
-    protected GlobalSymbolicExpressionGrammar(bool deserializing)
+    private GlobalSymbolicExpressionGrammar(bool deserializing)
       : base(deserializing) {
     }