Context Navigation

HeuristicLab.Functions

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:

-                      r523
+                      r642
       public int arity;
       public int symbol;
+      public IFunction function;
+    }
 …
             break;
+          }
+        case EvaluatorSymbolTable.UNKNOWN: {
+            instr.function = f.functionType;
+            break;
+          }
+      }
       return instr;
 …
       int i = 1;
       while(i > 0) {
         i+=codeArr[PC++].arity;
+        i += codeArr[PC++].arity;
         i--;
+      }
 …
             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();

r529	r642
42	42	private int maxArity = -1;
43	43
44		public virtual double Apply(~~Dataset dataset, int sampleIndex, double[] args~~) {
	44	public virtual double Apply() {
45	45	throw new NotImplementedException();
46	46	}

r525	r642
29	29	public interface IFunction : IOperator {
30	30	IFunctionTree GetTreeNode();
31		double Apply(~~Dataset dataset, int sampleIndex, double[] args~~);
	31	double Apply();
32	32	void Accept(IFunctionVisitor visitor);
33	33	IList<IFunction> AllowedSubFunctions(int index);

-                      r365
+                      r642
 namespace HeuristicLab.Functions {
   class EvaluatorSymbolTable : StorableBase{
+  class EvaluatorSymbolTable : StorableBase {
     public const int ADDITION = 1;
     public const int AND = 2;
 …
     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;
 …
     internal static int MapFunction(IFunction function) {
+      return staticTypes[function.GetType()];
+      if(staticTypes.ContainsKey(function.GetType())) return staticTypes[function.GetType()];
+      else return UNKNOWN;
+    }
+  }

Note: See TracChangeset for help on using the changeset viewer.