Changeset 14328 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Exec/ExecExpandExpression.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/Exec/ExecExpandExpression.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Expressions/Exec/ExecExpandExpression.cs

@@ -1 @@
-using System.Linq;
-using HeuristicLab.Algorithms.PushGP.Stack;
+using System.Text;
+using HeuristicLab.Algorithms.PushGP.Interpreter;
 
-namespace HeuristicLab.Algorithms.PushGP.Expressions
+namespace HeuristicLab.Algorithms.PushGP.Expressions.Exec
 {
     public class ExecExpandExpression : Expression
     {
-        public ExecExpandExpression(Expression[] expressions) : base(OpCode.ExecExpand)
+        private const string prefix = "( ";
+        private const string postifx = " )";
+        private const string delimiter = " ";
+
+        private readonly Expression[] expressions;
+        public ExecExpandExpression(Expression[] expressions)
         {
-            this.Expressions = expressions;
+            this.expressions = expressions;
         }
 
-        public Expression[] Expressions { get; }
+        public override bool IsCodeOp { get { return false; } }
 
-        public override void Eval(IInterpreterService interpreterService)
+        public override void Eval(IInterpreter interpreter)
         {
-            foreach (var expression in this.Expressions)
-            {
-                interpreterService.ExecStack.Add(expression);
-            }
+            interpreter.ExecStack.Push(this.expressions);
         }
 
         public override string ToString()
         {
-            return $"( {string.Join(" ", this.Expressions.Reverse())} )";
+            if (this.expressions.Length == 0)
+            {
+                return string.Empty;
+            }
+
+            var sb = new StringBuilder();
+            sb.Append(prefix);
+
+            for (var i = this.expressions.Length - 1; i > 0; i--)
+            {
+                sb.Append(this.expressions[i] + delimiter);
+            }
+
+            sb.Append(this.expressions[0] + postifx);
+
+            return sb.ToString();
         }
     }