Index: /trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/Grammars.cs
===================================================================
--- /trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/Grammars.cs	(revision 9416)
+++ /trunk/sources/HeuristicLab.Tests/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4/Grammars.cs	(revision 9417)
@@ -20,197 +20,10 @@
 #endregion
 
-using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding_34.Tests {
   public static class Grammars {
-    [StorableClass]
-    private class Addition : Symbol {
-      private const int minimumArity = 1;
-      private const int maximumArity = byte.MaxValue;
-
-      public override int MinimumArity {
-        get { return minimumArity; }
-      }
-      public override int MaximumArity {
-        get { return maximumArity; }
-      }
-
-      [StorableConstructor]
-      protected Addition(bool deserializing) : base(deserializing) { }
-      protected Addition(Addition original, Cloner cloner) : base(original, cloner) { }
-      public Addition() : base("Addition", "") { }
-      public override IDeepCloneable Clone(Cloner cloner) {
-        return new Addition(this, cloner);
-      }
-    }
-
-    [StorableClass]
-    private class Subtraction : Symbol {
-      private const int minimumArity = 1;
-      private const int maximumArity = byte.MaxValue;
-
-      public override int MinimumArity {
-        get { return minimumArity; }
-      }
-      public override int MaximumArity {
-        get { return maximumArity; }
-      }
-
-      [StorableConstructor]
-      protected Subtraction(bool deserializing) : base(deserializing) { }
-      protected Subtraction(Subtraction original, Cloner cloner) : base(original, cloner) { }
-      public Subtraction() : base("Subtraction", "") { }
-      public override IDeepCloneable Clone(Cloner cloner) {
-        return new Subtraction(this, cloner);
-      }
-    }
-
-    [StorableClass]
-    private class Multiplication : Symbol {
-      private const int minimumArity = 1;
-      private const int maximumArity = byte.MaxValue;
-
-      public override int MinimumArity {
-        get { return minimumArity; }
-      }
-      public override int MaximumArity {
-        get { return maximumArity; }
-      }
-
-      [StorableConstructor]
-      protected Multiplication(bool deserializing) : base(deserializing) { }
-      protected Multiplication(Multiplication original, Cloner cloner) : base(original, cloner) { }
-      public Multiplication() : base("Multiplication", "") { }
-      public override IDeepCloneable Clone(Cloner cloner) {
-        return new Multiplication(this, cloner);
-      }
-    }
-
-    [StorableClass]
-    private class Division : Symbol {
-      private const int minimumArity = 1;
-      private const int maximumArity = byte.MaxValue;
-
-      public override int MinimumArity {
-        get { return minimumArity; }
-      }
-      public override int MaximumArity {
-        get { return maximumArity; }
-      }
-
-      [StorableConstructor]
-      protected Division(bool deserializing) : base(deserializing) { }
-      protected Division(Division original, Cloner cloner) : base(original, cloner) { }
-      public Division() : base("Division", "") { }
-      public override IDeepCloneable Clone(Cloner cloner) {
-        return new Division(this, cloner);
-      }
-    }
-
-    [StorableClass]
-    private class Terminal : Symbol {
-      private const int minimumArity = 0;
-      private const int maximumArity = 0;
-
-      public override int MinimumArity {
-        get { return minimumArity; }
-      }
-      public override int MaximumArity {
-        get { return maximumArity; }
-      }
-
-      [StorableConstructor]
-      protected Terminal(bool deserializing) : base(deserializing) { }
-      protected Terminal(Terminal original, Cloner cloner) : base(original, cloner) { }
-      public Terminal() : base("Terminal", "") { }
-      public override IDeepCloneable Clone(Cloner cloner) {
-        return new Terminal(this, cloner);
-      }
-
-      public override ISymbolicExpressionTreeNode CreateTreeNode() {
-        return new TerminalNode(this);
-      }
-    }
-
-    [StorableClass]
-    private class TerminalNode : SymbolicExpressionTreeTerminalNode {
-      public override bool HasLocalParameters { get { return true; } }
-      private double value;
-      protected TerminalNode(TerminalNode original, Cloner cloner)
-        : base(original, cloner) {
-        this.value = original.value;
-      }
-      [StorableConstructor]
-      protected TerminalNode(bool deserializing) : base(deserializing) { }
-      public TerminalNode(Terminal symbol) : base(symbol) { }
-
-      public override IDeepCloneable Clone(Cloner cloner) {
-        return new TerminalNode(this, cloner);
-      }
-      public override void ResetLocalParameters(Core.IRandom random) {
-        base.ResetLocalParameters(random);
-        value = random.NextDouble();
-      }
-      public override void ShakeLocalParameters(Core.IRandom random, double shakingFactor) {
-        base.ShakeLocalParameters(random, shakingFactor);
-        value = random.NextDouble();
-      }
-      public override string ToString() {
-        return value.ToString("E4");
-      }
-    }
-
-    [StorableClass]
-    private class SimpleArithmeticGrammar : SymbolicExpressionGrammar {
-      [StorableConstructor]
-      protected SimpleArithmeticGrammar(bool deserializing) : base(deserializing) { }
-      protected SimpleArithmeticGrammar(SimpleArithmeticGrammar original, Cloner cloner) : base(original, cloner) { }
-      public SimpleArithmeticGrammar()
-        : base("Grammar for unit tests", "") {
-        Initialize();
-      }
-
-      public override IDeepCloneable Clone(Cloner cloner) {
-        return new SimpleArithmeticGrammar(this, cloner);
-      }
-
-      private void Initialize() {
-        var add = new Addition();
-        var sub = new Subtraction();
-        var mul = new Multiplication();
-        var div = new Division();
-        div.InitialFrequency = 0.0; // disable division symbol
-        var terminal = new Terminal();
-
-        var allSymbols = new List<Symbol>() { add, sub, mul, div, terminal };
-        var functionSymbols = new List<Symbol>() { add, sub, mul, div };
-        foreach (var symb in allSymbols)
-          AddSymbol(symb);
-
-        foreach (var funSymb in functionSymbols) {
-          SetSubtreeCount(funSymb, 1, 3);
-        }
-        SetSubtreeCount(terminal, 0, 0);
-
-        // allow each symbol as child of the start symbol
-        foreach (var symb in allSymbols) {
-          AddAllowedChildSymbol(StartSymbol, symb);
-          AddAllowedChildSymbol(DefunSymbol, symb);
-        }
-
-        // allow each symbol as child of every other symbol (except for terminals that have maxSubtreeCount == 0)
-        foreach (var parent in functionSymbols) {
-          foreach (var child in allSymbols) {
-            AddAllowedChildSymbol(parent, child);
-          }
-        }
-      }
-    }
-
     public static ISymbolicExpressionGrammar CreateSimpleArithmeticGrammar() {
       var g = new TypeCoherentExpressionGrammar();
