Changeset 6387 for branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols

Timestamp:

06/08/11 10:42:57 (14 years ago)

Author:

mkommend

Message:

#1540: Added min and max arity to symbols and renamed SymbolicExpressionTreeNode.SubtreesCount to SymbolicExpressionTreeNode.SubtreeCount.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols

Files:

• IfFoodAhead.cs (modified) (1 diff)
• Left.cs (modified) (1 diff)
• Move.cs (modified) (1 diff)
• Prog2.cs (modified) (1 diff)
• Prog3.cs (modified) (1 diff)
• Right.cs (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/IfFoodAhead.cs

@@ -28 +28 @@
   [Item("IfFoodAhead", "Represents the if-food-ahead symbol in a artificial ant expression.")]
   public sealed class IfFoodAhead : Symbol {
+    private const int minimumArity = 2;
+    private const int maximumArity = 3;
+
+    public override int MinimumArity {
+      get { return minimumArity; }
+    }
+    public override int MaximumArity {
+      get { return maximumArity; }
+    }
+
     [StorableConstructor]
     private IfFoodAhead(bool deserializing) : base(deserializing) { }

branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Left.cs

@@ -28 +28 @@
   [Item("Left", "Represents the turn-left symbol in a artificial ant expression.")]
   public sealed class Left : 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]
     private Left(bool deserializing) : base(deserializing) { }

branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Move.cs

@@ -28 +28 @@
   [Item("Move", "Represents the move-forward symbol in a artificial ant expression.")]
   public sealed class Move : 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]
     private Move(bool deserializing) : base(deserializing) { }

branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Prog2.cs

@@ -29 +29 @@
   [Item("Prog2", "Represents the sequence symbol with 2 sub-trees in a artificial ant expression.")]
   public sealed class Prog2 : Symbol {
+    private const int minimumArity = 2;
+    private const int maximumArity = 2;
+
+    public override int MinimumArity {
+      get { return minimumArity; }
+    }
+    public override int MaximumArity {
+      get { return maximumArity; }
+    }
+
     [StorableConstructor]
     private Prog2(bool deserializing) : base(deserializing) { }

branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Prog3.cs

@@ -28 +28 @@
   [Item("Prog3", "Represents the sequence symbol with 3 sub-trees in a artificial ant expression.")]
   public sealed class Prog3 : Symbol {
+    private const int minimumArity = 3;
+    private const int maximumArity = 3;
+
+    public override int MinimumArity {
+      get { return minimumArity; }
+    }
+    public override int MaximumArity {
+      get { return maximumArity; }
+    }
+
     [StorableConstructor]
     private Prog3(bool deserializing) : base(deserializing) { }

branches/GP.Grammar.Editor/HeuristicLab.Problems.ArtificialAnt/3.4/Symbols/Right.cs

@@ -28 +28 @@
   [Item("Right", "Represents the turn-right symbol in a artificial ant expression.")]
   public sealed class Right : 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]
     private Right(bool deserializing) : base(deserializing) { }