Changeset 155 for trunk/sources/HeuristicLab.Functions/Average.cs

Timestamp:

04/22/08 18:05:14 (16 years ago)

Author:

gkronber

Message:

merged FunctionsAndStructIdRefactoring-branch (r142, r143, r144, r145, r146, r147, r148, r149, r152, r153) back into the trunk (ticket #112)

File:

• trunk/sources/HeuristicLab.Functions/Average.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Functions/Average.cs

@@ -31 +31 @@
     public override string Description {
       get {
-        return @"Returns the average (arithmetic mean) of all sub-operator results.";
+        return @"Returns the average (arithmetic mean) of all sub-tree results.";
       }
     }
@@ -40 +40 @@
     }
 
-    public Average(Average 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) {
       double sum = 0.0;
-      for(int i = 0; i < SubFunctions.Count; i++) {
-        sum += SubFunctions[i].Evaluate(dataset, sampleIndex);
+      for(int i = 0; i < args.Length; i++) {
+        sum += args[i];
       }
-      return sum / SubFunctions.Count;
-    }
-
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      Average clone = new Average(this, clonedObjects);
-      clonedObjects.Add(clone.Guid, clone);
-      return clone;
+      return sum / args.Length;
     }