Changeset 642 for trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

Timestamp:

10/11/08 18:35:45 (16 years ago)

Author:

gkronber

Message:

fixed #169 (Possibility to extend the set of available functions for GP via plugins)

File:

• trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Functions/BakedTreeEvaluator.cs

@@ -40 +40 @@
       public int arity;
       public int symbol;
+      public IFunction function;
     }
 
@@ -79 +80 @@
             break;
           }
+        case EvaluatorSymbolTable.UNKNOWN: {
+            instr.function = f.functionType;
+            break;
+          }
       }
       return instr;
@@ -93 +98 @@
       int i = 1;
       while(i > 0) {
-        i+=codeArr[PC++].arity;
+        i += codeArr[PC++].arity;
         i--;
       }
@@ -247 +252 @@
             return Math.Abs(x - y);
           }
-        case EvaluatorSymbolTable.UNKNOWN:
+        case EvaluatorSymbolTable.UNKNOWN: { // evaluate functions which are not statically defined directly
+            return currInstr.function.Apply();
+          }
         default: {
             throw new NotImplementedException();