Changeset 14328 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Expression.cs

Timestamp:

10/08/16 12:04:25 (8 years ago)

Author:

pkimmesw

Message:

#2665 Set .NET version to 4.5, C# version to 5.0, Added expression templates and factory

File:

• branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Expression.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Expression.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using HeuristicLab.Algorithms.PushGP.Interpreter;
 using HeuristicLab.Algorithms.PushGP.Stack;
 
@@ -7 +8 @@
     public abstract class Expression
     {
-        public Expression(OpCode opCode)
-        {
-            this.OpCode = opCode;
-        }
+        public abstract bool IsCodeOp { get; }
+        public abstract void Eval(IInterpreter interpreter);
 
-        public OpCode OpCode { get; }
-
-        public abstract void Eval(IInterpreterService interpreterService);
-
-        public override string ToString()
-        {
-            return SymbolTable.GetSymbol(this.OpCode);
-        }
-
-        protected static void PushResult<T>(IStack<T> stack, int count, Func<T[], T> templateFunc)
+        public void PushResult<T>(IStack<T> stack, int count, Func<T[], T> templateFunc)
         {
             PushResult(stack, stack, count, templateFunc);
         }
 
-        protected static void PushResult<T, R>(IStack<T> sourceStack, IStack<R> targetStack, int count, Func<T[], R> templateFunc)
+        public void PushResult<T, R>(IStack<T> sourceStack, IStack<R> targetStack, int count, Func<T[], R> templateFunc)
         {
             // not enough arguments on stack
@@ -38 +28 @@
         }
 
-        protected static void Duplicate<T>(IStack<T> stack)
+        public void Duplicate<T>(IStack<T> stack)
         {
             // not enough arguments on stack