Changeset 142 for branches/FunctionsAndStructIdRefactoring/HeuristicLab.Functions/Division.cs

Timestamp:

04/21/08 00:17:54 (17 years ago)

Author:

gkronber

Message:

Created a branch for refactoring functions and structId. Largest change: splitting IFunction/FunctionBase into two classes, one for the function and one for the treenode+local variables. _work in progress_

Location:

branches/FunctionsAndStructIdRefactoring

Files:

• . (copied) (copied from trunk/sources)
• HeuristicLab.Functions/Division.cs (modified) (3 diffs)

branches/FunctionsAndStructIdRefactoring/HeuristicLab.Functions/Division.cs

@@ -36 +36 @@
       get {
         return @"Protected division
-Divides the result of the first sub-operator by the results of the following sub-operators.
+Divides the result of the first sub-tree by the results of the following sub-tree.
 In case one of the divisors is 0 returns 0.
     (/ 3) => 1/3
@@ -48 +48 @@
     public Division()
       : base() {
-
       // 2 - 3 seems like an reasonable defaut (used for +,-,*,/) (discussion with swinkler and maffenze)
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
     }
 
-    public Division(Division source, IDictionary<Guid, object> clonedObjects)
-      : base(source, clonedObjects) {
-    }
-
-    public override double Evaluate(Dataset dataset, int sampleIndex) {
+    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
       // (/ 3) => 1/3
       // (/ 2 3) => 2/3
       // (/ 3 4 5) => 3/20
 
-      if(SubFunctions.Count == 1) {
-        double divisor = SubFunctions[0].Evaluate(dataset, sampleIndex);
+      if(args.Length == 1) {
+        double divisor = args[0];
         if(Math.Abs(divisor) < EPSILON) return 0;
         else return 1.0 / divisor;
       } else {
-        double result = SubFunctions[0].Evaluate(dataset, sampleIndex);
-        for(int i = 1; i < SubFunctions.Count; i++) {
-          double divisor = SubFunctions[i].Evaluate(dataset, sampleIndex);
+        double result = args[0];
+        for(int i = 1; i < args.Length; i++) {
+          double divisor = args[i];
           if(Math.Abs(divisor) < EPSILON) return 0.0;
           result /= divisor;
@@ -77 +72 @@
     }
 
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Division clone = new Division(this, clonedObjects);
-      clonedObjects.Add(clone.Guid, clone);
-      return clone;
-    }
-
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);