Changeset 12319

Timestamp:

04/16/15 11:05:23 (9 years ago)

Author:

mkommend

Message:

#2320: Added simple symbol and grammar for symbolic expression encoding.

Location:

branches/SymbolicExpressionTreeEncoding/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Grammars/SimpleSymbolicExpressionGrammar.cs (added)
• Grammars/SymbolicExpressionGrammarBase.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj (modified) (2 diffs)
• SymbolicExpressionTreeEncoding.cs (modified) (5 diffs)
• Symbols/SimpleSymbol.cs (added)

branches/SymbolicExpressionTreeEncoding/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Grammars/SymbolicExpressionGrammarBase.cs

@@ -308 +308 @@
     }
     public virtual IEnumerable<ISymbol> AllowedSymbols {
-      get { foreach (var s in Symbols) if (s.Enabled) yield return s; }
+      get { return Symbols.Where(s => s.Enabled); }
     }
     public virtual bool ContainsSymbol(ISymbol symbol) {
@@ -510 +510 @@
       if (suppressEvents) return;
       var handler = Changed;
-      if (handler != null) Changed(this, EventArgs.Empty);
+      if (handler != null) handler(this, EventArgs.Empty);
     }
   }

branches/SymbolicExpressionTreeEncoding/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj

@@ -187 +187 @@
     <Compile Include="Formatters\SymbolicExpressionTreeHierarchicalFormatter.cs" />
     <Compile Include="Grammars\EmptySymbolicExpressionTreeGrammar.cs" />
+    <Compile Include="Grammars\SimpleSymbolicExpressionGrammar.cs" />
     <Compile Include="Interfaces\IReadOnlySymbol.cs" />
     <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />
@@ -236 +237 @@
     <Compile Include="Symbols\ArgumentTreeNode.cs" />
     <Compile Include="Symbols\GroupSymbol.cs" />
+    <Compile Include="Symbols\SimpleSymbol.cs" />
     <Compile Include="Symbols\StartSymbol.cs" />
     <Compile Include="Symbols\InvokeFunction.cs" />

branches/SymbolicExpressionTreeEncoding/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeEncoding.cs

@@ -36 +36 @@
   [Item("SymbolicExpressionTreeEncoding", "Describes a symbolic expression tree encoding.")]
   [StorableClass]
-  public class SymbolicExpressionTreeEncoding : Encoding<ISymbolicExpressionTreeCreator> {
+  public sealed class SymbolicExpressionTreeEncoding : Encoding<ISymbolicExpressionTreeCreator> {
     #region Encoding Parameters
     [Storable]
@@ -159 +159 @@
 
     [StorableConstructor]
-    public SymbolicExpressionTreeEncoding(bool deserializing) : base(deserializing) { }
-    public SymbolicExpressionTreeEncoding() : this("SymbolicExpressionTree") { }
-
-    public SymbolicExpressionTreeEncoding(string name)
+    private SymbolicExpressionTreeEncoding(bool deserializing) : base(deserializing) { }
+    public SymbolicExpressionTreeEncoding(ISymbolicExpressionGrammar grammar) : this("SymbolicExpressionTree", grammar, 50, 50) { }
+    public SymbolicExpressionTreeEncoding(ISymbolicExpressionGrammar grammar, int maximumLength, int maximumDepth) : this("SymbolicExpressionTree", grammar, maximumLength, maximumDepth) { }
+    public SymbolicExpressionTreeEncoding(string name, ISymbolicExpressionGrammar grammar, int maximumLength, int maximumDepth)
       : base(name) {
-      treeLengthParameter = new FixedValueParameter<IntValue>("Maximium Tree Length", "Maximal length of the symbolic expression.", new IntValue(50));
-      treeDepthParameter = new FixedValueParameter<IntValue>("Maximum Tree Depth", "Maximal depth of the symbolic expression. The minimum depth needed for the algorithm is 3 because two levels are reserved for the ProgramRoot and the Start symbol.", new IntValue(50));
-      grammarParameter = new ValueParameter<ISymbolicExpressionGrammar>("Grammar", "The grammar that should be used for symbolic expression tree.");
+      treeLengthParameter = new FixedValueParameter<IntValue>("Maximium Tree Length", "Maximal length of the symbolic expression.", new IntValue(maximumLength));
+      treeDepthParameter = new FixedValueParameter<IntValue>("Maximum Tree Depth", "Maximal depth of the symbolic expression. The minimum depth needed for the algorithm is 3 because two levels are reserved for the ProgramRoot and the Start symbol.", new IntValue(maximumDepth));
+      grammarParameter = new ValueParameter<ISymbolicExpressionGrammar>("Grammar", "The grammar that should be used for symbolic expression tree.", grammar);
       functionDefinitionsParameter = new FixedValueParameter<IntValue>("Function Definitions", "Maximal number of automatically defined functions", new IntValue(0));
       functionArgumentsParameter = new FixedValueParameter<IntValue>("Function Arguments", "Maximal number of arguments of automatically defined functions.", new IntValue(0));
-
-      //TODO set default grammar
 
       Parameters.Add(treeLengthParameter);
@@ -185 +183 @@
     private SymbolicExpressionTreeEncoding(SymbolicExpressionTreeEncoding original, Cloner cloner)
       : base(original, cloner) {
-      TreeLengthParameter = cloner.Clone(original.TreeLengthParameter);
-      TreeDepthParameter = cloner.Clone(original.TreeDepthParameter);
-      GrammarParameter = cloner.Clone(original.GrammarParameter);
-      FunctionDefinitionsParameter = cloner.Clone(original.FunctionDefinitionsParameter);
-      FunctionArgumentsParameter = cloner.Clone(original.FunctionArgumentsParameter);
+      treeLengthParameter = cloner.Clone(original.TreeLengthParameter);
+      treeDepthParameter = cloner.Clone(original.TreeDepthParameter);
+      grammarParameter = cloner.Clone(original.GrammarParameter);
+      functionDefinitionsParameter = cloner.Clone(original.FunctionDefinitionsParameter);
+      functionArgumentsParameter = cloner.Clone(original.FunctionArgumentsParameter);
       RegisterParameterEvents();
     }
@@ -208 +206 @@
     private void OnGrammarParameterChanged() {
       RegisterGrammarParameterEvents();
+      FunctionArguments = Grammar.MaximumFunctionArguments;
+      FunctionDefinitions = Grammar.MaximumFunctionDefinitions;
       ConfigureOperators(Operators);
     }
@@ -230 +230 @@
 
 
-    private void RegisterLengthParameterEvents() {
-      TreeLengthParameter.Value.ValueChanged += (o, s) => ConfigureOperators(Operators);
-    }
-
-    private void RegisterDepthParameterEvents() {
-      TreeDepthParameter.Value.ValueChanged += (o, s) => ConfigureOperators(Operators);
-    }
+    private void RegisterLengthParameterEvents() { }
+    private void RegisterDepthParameterEvents() { }
+
     private void RegisterGrammarParameterEvents() {
-      GrammarParameter.ValueChanged += (o, s) => ConfigureOperators(Operators);
-      GrammarParameter.Value.Changed += (o, s) => ConfigureOperators(Operators);
+      GrammarParameter.ValueChanged += (o, s) => {
+        FunctionArguments = Grammar.MaximumFunctionArguments;
+        FunctionDefinitions = Grammar.MaximumFunctionDefinitions;
+        ConfigureOperators(Operators);
+      };
+      GrammarParameter.Value.Changed += (o, s) => {
+        FunctionArguments = Grammar.MaximumFunctionArguments;
+        FunctionDefinitions = Grammar.MaximumFunctionDefinitions;
+        ConfigureOperators(Operators);
+      };
     }