Changeset 5686 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces

Timestamp:

03/15/11 13:34:38 (13 years ago)

Author:

mkommend

Message:

#1418: Finally added results from the grammar refactoring.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces

Files:

• ISymbolicExpressionGrammar.cs (added)
• ISymbolicExpressionGrammarBase.cs (added)
• ISymbolicExpressionTreeGrammar.cs (modified) (1 diff)
• ISymbolicExpressionTreeNode.cs (modified) (2 diffs)
• Operators/ISymbolicExpressionTreeGrammarBasedOperator.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeGrammar.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
-using HeuristicLab.Core;
+namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
+  public interface ISymbolicExpressionTreeGrammar : ISymbolicExpressionGrammarBase {
 
-namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
-  public interface ISymbolicExpressionTreeGrammar : IItem {
-    IEnumerable<ISymbol> Symbols { get; }
-    ISymbol StartSymbol { get; }
+    IEnumerable<ISymbol> ModifyableSymbols { get; }
+    bool IsModifyableSymbol(ISymbol symbol);
     void AddSymbol(ISymbol symbol);
     void RemoveSymbol(ISymbol symbol);
 
-    bool ContainsSymbol(ISymbol symbol);
-    void SetAllowedChild(ISymbol parent, ISymbol child, int argumentIndex);
-    bool IsAllowedChild(ISymbol parent, ISymbol child, int argumentIndex);
+    void AddAllowedChildSymbol(ISymbol parent, ISymbol child);
+    void AddAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex);
+    void RemoveAllowedChildSymbol(ISymbol parent, ISymbol child);
+    void RemoveAllowedChildSymbol(ISymbol parent, ISymbol child, int argumentIndex);
 
-    IEnumerable<ISymbol> GetAllowedSymbols(ISymbol parent, int argumentIndex);
-
-    int GetMinExpressionLength(ISymbol start);
-    int GetMaxExpressionLength(ISymbol start);
-    int GetMinExpressionDepth(ISymbol start);
-
-    int GetMinSubtreeCount(ISymbol symbol);
-    void SetMinSubtreeCount(ISymbol symbol, int value);
-    int GetMaxSubtreeCount(ISymbol symbol);
-    void SetMaxSubtreeCount(ISymbol symbol, int value);
+    void SetSubtreeCount(ISymbol symbol, int minimumSubtreeCount, int maximumSubtreeCount);
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNode.cs

@@ -19 +19 @@
  */
 #endregion
+using System;
 using System.Collections.Generic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
-using System;
-using HeuristicLab.Common;
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
   public interface ISymbolicExpressionTreeNode : IDeepCloneable {
@@ -39 +39 @@
 
     IEnumerable<ISymbolicExpressionTreeNode> SubTrees { get; }
+    int SubtreesCount { get; }
     ISymbolicExpressionTreeNode GetSubTree(int index);
     int IndexOfSubTree(ISymbolicExpressionTreeNode tree);

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/Operators/ISymbolicExpressionTreeGrammarBasedOperator.cs

@@ -27 +27 @@
   /// </summary>
   public interface ISymbolicExpressionTreeGrammarBasedOperator : ISymbolicExpressionTreeOperator {
-    IValueLookupParameter<ISymbolicExpressionTreeGrammar> SymbolicExpressionTreeGrammarParameter { get; }
+    IValueLookupParameter<ISymbolicExpressionGrammar> SymbolicExpressionTreeGrammarParameter { get; }
   }
 }