Changeset 642 for trunk/sources

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)

Location:

trunk/sources/HeuristicLab.Functions

Files:

• BakedTreeEvaluator.cs (modified) (4 diffs)
• FunctionBase.cs (modified) (1 diff)
• IFunction.cs (modified) (1 diff)
• SymbolTable.cs (modified) (3 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();

trunk/sources/HeuristicLab.Functions/FunctionBase.cs

@@ -42 +42 @@
     private int maxArity = -1;
 
-    public virtual double Apply(Dataset dataset, int sampleIndex, double[] args) {
+    public virtual double Apply() {
       throw new NotImplementedException();
     }

trunk/sources/HeuristicLab.Functions/IFunction.cs

@@ -29 +29 @@
   public interface IFunction : IOperator {
     IFunctionTree GetTreeNode();
-    double Apply(Dataset dataset, int sampleIndex, double[] args);
+    double Apply();
     void Accept(IFunctionVisitor visitor);
     IList<IFunction> AllowedSubFunctions(int index);

trunk/sources/HeuristicLab.Functions/SymbolTable.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Functions {
-  class EvaluatorSymbolTable : StorableBase{
+  class EvaluatorSymbolTable : StorableBase {
     public const int ADDITION = 1;
     public const int AND = 2;
@@ -55 +55 @@
     public const int UNKNOWN = 24;
 
-    private static Dictionary<Type, int> staticTypes = new Dictionary<Type,int>();
+    private static Dictionary<Type, int> staticTypes = new Dictionary<Type, int>();
 
     // needs to be public for persistence mechanism (Activator.CreateInstance needs empty constructor)
-    static EvaluatorSymbolTable () {
+    static EvaluatorSymbolTable() {
       staticTypes = new Dictionary<Type, int>();
       staticTypes[typeof(Addition)] = ADDITION;
@@ -87 +87 @@
 
     internal static int MapFunction(IFunction function) {
-      return staticTypes[function.GetType()];
+      if(staticTypes.ContainsKey(function.GetType())) return staticTypes[function.GetType()];
+      else return UNKNOWN;
     }
   }