Changeset 2490 for trunk

Timestamp:

11/13/09 12:09:04 (15 years ago)

Author:

gkronber

Message:

Fixed #801.

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols

Files:

• Addition.cs (modified) (1 diff)
• Division.cs (modified) (2 diffs)
• Multiplication.cs (modified) (1 diff)
• Subtraction.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Addition.cs

@@ -35 +35 @@
       : base() {
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
-      MinSubTrees = 2;
+      MinSubTrees = 1;
       MaxSubTrees = 3;
     }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Division.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Division : BinaryFunction {
+  public sealed class Division : FunctionBase {
     public override string Description {
       get {
@@ -36 +36 @@
     }
 
-    public Division() : base() { }
+    public Division()
+      : base() {
+      MinSubTrees = 1;
+      MaxSubTrees = 3;
+    }
 
     public override HeuristicLab.GP.Interfaces.IFunctionTree GetTreeNode() {

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Multiplication.cs

@@ -35 +35 @@
       : base() {
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
-      MinSubTrees = 2; MaxSubTrees = 3;
+      MinSubTrees = 1; MaxSubTrees = 3;
     }
 

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Symbols/Subtraction.cs

@@ -22 +22 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public sealed class Subtraction : BinaryFunction {
+  public sealed class Subtraction : FunctionBase {
     public override string Description {
       get {
@@ -34 +34 @@
     public Subtraction()
       : base() {
+      MinSubTrees = 1;
+      MaxSubTrees = 3;
     }