Changeset 434

Timestamp:

08/04/08 00:34:29 (16 years ago)

Author:

gkronber

Message:

added creation of empty SubOperatorTypeConstraints for each input of each function (#163)

Location:

trunk/sources/HeuristicLab.Functions

Files:

• Addition.cs (modified) (1 diff)
• And.cs (modified) (1 diff)
• Average.cs (modified) (1 diff)
• Cosinus.cs (modified) (1 diff)
• Division.cs (modified) (1 diff)
• Equal.cs (modified) (1 diff)
• Exponential.cs (modified) (1 diff)
• GreaterThan.cs (modified) (1 diff)
• IfThenElse.cs (modified) (1 diff)
• LessThan.cs (modified) (1 diff)
• Logarithm.cs (modified) (1 diff)
• Multiplication.cs (modified) (1 diff)
• Not.cs (modified) (1 diff)
• Or.cs (modified) (1 diff)
• Power.cs (modified) (1 diff)
• Signum.cs (modified) (1 diff)
• Sinus.cs (modified) (1 diff)
• Sqrt.cs (modified) (1 diff)
• Subtraction.cs (modified) (1 diff)
• Tangens.cs (modified) (1 diff)
• Xor.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Functions/Addition.cs

@@ -44 +44 @@
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/And.cs

@@ -40 +40 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/Average.cs

@@ -38 +38 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/Cosinus.cs

@@ -38 +38 @@
       // must have exactly one subfunction
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/Division.cs

@@ -50 +50 @@
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/Equal.cs

@@ -38 +38 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 2));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
     }
 

trunk/sources/HeuristicLab.Functions/Exponential.cs

@@ -38 +38 @@
       // must have exactly one sub-operator
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/GreaterThan.cs

@@ -38 +38 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 2));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
     }
     public override void Accept(IFunctionVisitor visitor) {

trunk/sources/HeuristicLab.Functions/IfThenElse.cs

@@ -39 +39 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(3, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/LessThan.cs

@@ -38 +38 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 2));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
     }
 

trunk/sources/HeuristicLab.Functions/Logarithm.cs

@@ -38 +38 @@
       // must have exactly 1 suboperator
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/Multiplication.cs

@@ -44 +44 @@
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/Not.cs

@@ -38 +38 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/Or.cs

@@ -39 +39 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/Power.cs

@@ -38 +38 @@
       // must have exactly 2 suboperators base ^ exponent
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 2));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
     }
 

trunk/sources/HeuristicLab.Functions/Signum.cs

@@ -38 +38 @@
       // must have exactly 1 suboperator
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/Sinus.cs

@@ -38 +38 @@
       // must have exactly 1 suboperator
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/Sqrt.cs

@@ -38 +38 @@
       // must have exactly 1 suboperator
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/Subtraction.cs

@@ -44 +44 @@
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
+      AddConstraint(new SubOperatorTypeConstraint(2));
     }
 

trunk/sources/HeuristicLab.Functions/Tangens.cs

@@ -38 +38 @@
       // must have exactly one suboperator
       AddConstraint(new NumberOfSubOperatorsConstraint(1, 1));
+      AddConstraint(new SubOperatorTypeConstraint(0));
     }
 

trunk/sources/HeuristicLab.Functions/Xor.cs

@@ -38 +38 @@
       : base() {
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 2));
+      AddConstraint(new SubOperatorTypeConstraint(0));
+      AddConstraint(new SubOperatorTypeConstraint(1));
     }