Changeset 229 for trunk/sources/HeuristicLab.Functions/And.cs

Timestamp:

05/11/08 08:55:19 (16 years ago)

Author:

gkronber

Message:

merged changes (r201 r203 r206 r208 r220 r223 r224 r225 r226 r227) from branch ExperimentalFunctionsBaking into the trunk. (ticket #139)

File:

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

trunk/sources/HeuristicLab.Functions/And.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Functions {
-  public class And : FunctionBase {
+  public sealed class And : FunctionBase {
     public override string Description {
       get {
@@ -42 +42 @@
     }
 
-    public override IFunctionTree GetTreeNode() {
-      return new AndFunctionTree(this);
-    }
-
-    // special form
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
-      throw new NotImplementedException();
-    }
-
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);
     }
   }
-
-  class AndFunctionTree : FunctionTree {
-    public AndFunctionTree() : base() { }
-    public AndFunctionTree(And and) : base(and) { }
-
-    public override double Evaluate(Dataset dataset, int sampleIndex) {
-      foreach(IFunctionTree subTree in SubTrees) {
-        double result = Math.Round(subTree.Evaluate(dataset, sampleIndex));
-        if(result == 0.0) return 0.0; // one sub-tree is 0.0 (false) => return false
-        else if(result != 1.0) return double.NaN;
-      }
-      // all sub-trees evaluated to 1.0 (true) => return 1.0 (true)
-      return 1.0;
-    }
-
-    public override object Clone(IDictionary<Guid, object> clonedObjects) {
-      AndFunctionTree clone = new AndFunctionTree();
-      clonedObjects.Add(clone.Guid, clone);
-      FillClone(clone, clonedObjects);
-      return clone;
-    }
-  }
 }