Changeset 203

Timestamp:

04/28/08 21:40:46 (16 years ago)

Author:

gkronber

Message:

prototype implementation for fast evaluation of basic functions

Location:

branches/ExperimentalFunctionsBaking

Files:

• Addition.cs (modified) (2 diffs)
• BakedFunctionTree.cs (added)
• Division.cs (modified) (2 diffs)
• FunctionBase.cs (modified) (1 diff)
• HeuristicLab.Functions.csproj (modified) (1 diff)
• Multiplication.cs (modified) (2 diffs)
• Substraction.cs (modified) (2 diffs)

branches/ExperimentalFunctionsBaking/Addition.cs

@@ -46 +46 @@
     }
 
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+    public static double Add(double[] args) {
       // (+ 3) => 3
       // (+ 2 3) => 5
@@ -57 +57 @@
     }
 
+    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+      return Addition.Add(args);
+    }
+
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);

branches/ExperimentalFunctionsBaking/Division.cs

@@ -52 +52 @@
     }
 
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+    public static double Divide(double[] args) {
       // (/ 3) => 1/3
       // (/ 2 3) => 2/3
       // (/ 3 4 5) => 3/20
-
       if(args.Length == 1) {
         double divisor = args[0];
@@ -72 +71 @@
     }
 
+    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+      return Division.Divide(args);
+    }
+
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);

branches/ExperimentalFunctionsBaking/FunctionBase.cs

@@ -42 +42 @@
 
     public virtual IFunctionTree GetTreeNode() {
-      return new FunctionTree(this);
+      return new BakedFunctionTree(this);
     }
 

branches/ExperimentalFunctionsBaking/HeuristicLab.Functions.csproj

@@ -51 +51 @@
     <Compile Include="And.cs" />
     <Compile Include="Average.cs" />
+    <Compile Include="BakedFunctionTree.cs" />
     <Compile Include="Constant.cs" />
-    <Compile Include="BakedFunctionTree.cs" />
     <Compile Include="GreaterThan.cs" />
     <Compile Include="FunctionTree.cs" />

branches/ExperimentalFunctionsBaking/Multiplication.cs

@@ -45 +45 @@
       AddConstraint(new NumberOfSubOperatorsConstraint(2, 3));
     }
-
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+    public static double Multipy(double[] args) {
       // (* 3) => 3
       // (* 2 3) => 6
@@ -56 +55 @@
       return result;
     }
+    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+      return Multiplication.Multipy(args);
+    }
 
     public override void Accept(IFunctionVisitor visitor) {

branches/ExperimentalFunctionsBaking/Substraction.cs

@@ -46 +46 @@
     }
 
-
-    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+    public static double Substract(double[] args) {
       if(args.Length == 1) {
         return -args[0];
@@ -59 +58 @@
     }
 
+    public override double Apply(Dataset dataset, int sampleIndex, double[] args) {
+      return Substraction.Substract(args);
+    }
+
     public override void Accept(IFunctionVisitor visitor) {
       visitor.Visit(this);