Changeset 5688

Timestamp:

03/15/11 14:35:05 (14 years ago)

Author:

mkommend

Message:

#1418: Added names and descriptions to grammars and adapted their view.

Location:

branches/DataAnalysis Refactoring

Files:

• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.Designer.cs (moved) (moved from branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeGrammarView.Designer.cs) (3 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.cs (moved) (moved from branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeGrammarView.cs) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs (modified) (1 diff)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Grammars.cs (modified) (1 diff)
• HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntExpressionGrammar.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/ArithmeticExpressionGrammar.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj

@@ -109 +109 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SymbolicExpressionTreeGrammarView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SymbolicExpressionTreeGrammarView.Designer.cs">
-      <DependentUpon>SymbolicExpressionTreeGrammarView.cs</DependentUpon>
+    <Compile Include="SymbolicExpressionGrammarView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SymbolicExpressionGrammarView.Designer.cs">
+      <DependentUpon>SymbolicExpressionGrammarView.cs</DependentUpon>
     </Compile>
     <Compile Include="SymbolView.cs">

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
-  partial class SymbolicExpressionTreeGrammarView {
+  partial class SymbolicExpressionGrammarView {
     /// <summary> 
     /// Required designer variable.
@@ -50 +50 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.checkedItemListView.Location = new System.Drawing.Point(3, 3);
+      this.checkedItemListView.Location = new System.Drawing.Point(0, 52);
       this.checkedItemListView.Name = "itemListView";
-      this.checkedItemListView.Size = new System.Drawing.Size(274, 239);
+      this.checkedItemListView.Size = new System.Drawing.Size(351, 190);
       this.checkedItemListView.TabIndex = 0;
-      // 
+      //                                        
       // DefaultSymbolicExpressionGrammarView
       // 
@@ -61 +61 @@
       this.Controls.Add(this.checkedItemListView);
       this.Name = "DefaultSymbolicExpressionGrammarView";
-      this.Size = new System.Drawing.Size(280, 245);
+      this.Size = new System.Drawing.Size(351, 245);
       this.ResumeLayout(false);
 

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarView.cs

@@ -30 +30 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
   [View("Symbolic Expression Grammar View")]
-  [Content(typeof(ISymbolicExpressionTreeGrammar), true)]
-  public partial class SymbolicExpressionTreeGrammarView : ItemView {
+  [Content(typeof(ISymbolicExpressionGrammar), true)]
+  public partial class SymbolicExpressionGrammarView : NamedItemView {
     private CheckedItemList<ISymbol> symbols;
 
-    public new ISymbolicExpressionTreeGrammar Content {
-      get { return (ISymbolicExpressionTreeGrammar)base.Content; }
+    public new ISymbolicExpressionGrammar Content {
+      get { return (ISymbolicExpressionGrammar)base.Content; }
       set { base.Content = value; }
     }
 
-    public SymbolicExpressionTreeGrammarView() {
+    public SymbolicExpressionGrammarView() {
       InitializeComponent();
       symbols = new CheckedItemList<ISymbol>();

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammar.cs

@@ -100 +100 @@
     }
 
-    public SymbolicExpressionGrammar()
-      : base() {
+    public SymbolicExpressionGrammar(string name, string description)
+      : base(name, description) {
       programRootSymbol = new ProgramRootSymbol();
       AddSymbol(programRootSymbol);

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs

@@ -47 +47 @@
     protected Dictionary<Tuple<string, int>, List<string>> allowedChildSymbolsPerIndex;
 
+    public override bool CanChangeName {
+      get { return false; }
+    }
+    public override bool CanChangeDescription {
+      get { return false; }
+    }
+
     [StorableConstructor]
     protected SymbolicExpressionGrammarBase(bool deserializing)
@@ -72 +79 @@
     }
 
-    protected SymbolicExpressionGrammarBase()
-      : base() {
+    protected SymbolicExpressionGrammarBase(string name, string description)
+      : base(name, description) {
       cachedMinExpressionLength = new Dictionary<string, int>();
       cachedMaxExpressionLength = new Dictionary<string, int>();

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeGrammar.cs

@@ -41 +41 @@
     private ISymbolicExpressionGrammar grammar;
     public SymbolicExpressionTreeGrammar(ISymbolicExpressionGrammar grammar)
-      : base() {
+      : base("SymbolicExpressionTreeGrammar", "A grammar that is used held by symbolic expression trees and allows extensions to the wraped grammar.") {
       if (grammar == null) throw new ArgumentNullException();
       this.grammar = grammar;

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Tests/Grammars.cs

@@ -97 +97 @@
       protected SimpleArithmeticGrammar(SimpleArithmeticGrammar original, Cloner cloner) : base(original, cloner) { }
       public SimpleArithmeticGrammar()
-        : base() {
+        : base("Grammar for unit tests","") {
         Initialize();
       }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.ArtificialAnt/3.4/ArtificialAntExpressionGrammar.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -28 +29 @@
 namespace HeuristicLab.Problems.ArtificialAnt {
   [StorableClass]
+  [Item(Name = "ArtificialAntExpressionGrammar", Description = "The default grammar for an artificial ant problem.")]
   public class ArtificialAntExpressionGrammar : SymbolicExpressionGrammar {
 
     public ArtificialAntExpressionGrammar()
-      : base() {
+      : base(ItemAttribute.GetName(typeof(ArtificialAntExpressionGrammar)), ItemAttribute.GetDescription(typeof(ArtificialAntExpressionGrammar))) {
       Initialize();
     }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/ArithmeticExpressionGrammar.cs

@@ -35 +35 @@
     protected ArithmeticExpressionGrammar(ArithmeticExpressionGrammar original, Cloner cloner) : base(original, cloner) { }
     public ArithmeticExpressionGrammar()
-      : base() {
+      : base(ItemAttribute.GetName(typeof(ArithmeticExpressionGrammar)), ItemAttribute.GetDescription(typeof(ArithmeticExpressionGrammar))) {
       Initialize();
     }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/FullFunctionalExpressionGrammar.cs

@@ -35 +35 @@
     protected FullFunctionalExpressionGrammar(FullFunctionalExpressionGrammar original, Cloner cloner) : base(original, cloner) { }
     public FullFunctionalExpressionGrammar()
-      : base() {
+      : base(ItemAttribute.GetName(typeof(FullFunctionalExpressionGrammar)), ItemAttribute.GetDescription(typeof(FullFunctionalExpressionGrammar))) {
       Initialize();
     }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/TypeCoherentExpressionGrammar.cs

@@ -35 +35 @@
     protected TypeCoherentExpressionGrammar(TypeCoherentExpressionGrammar original, Cloner cloner) : base(original, cloner) { }
     public TypeCoherentExpressionGrammar()
-      : base() {
+      : base(ItemAttribute.GetName(typeof(TypeCoherentExpressionGrammar)), ItemAttribute.GetDescription(typeof(TypeCoherentExpressionGrammar))) {
       Initialize();
     }