Changeset 14392 for branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Parser/Parser.cs

Timestamp:

11/15/16 21:10:17 (8 years ago)

Author:

pkimmesw

Message:

#2665 Full Push 3.0 instruction set and tests; Added first benchmark test (count odds) for random walk tests;

File:

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

branches/PushGP/HeuristicLab.Algorithms.PushGP/HeuristicLab.Algorithms.PushGP/Parser/Parser.cs

@@ -2 +2 @@
 using System.Globalization;
 using HeuristicLab.Algorithms.PushGP.Expressions;
-using HeuristicLab.Algorithms.PushGP.Expressions.Boolean;
-using HeuristicLab.Algorithms.PushGP.Expressions.Code;
-using HeuristicLab.Algorithms.PushGP.Expressions.Exec;
-using HeuristicLab.Algorithms.PushGP.Expressions.Float;
-using HeuristicLab.Algorithms.PushGP.Expressions.Integer;
-using HeuristicLab.Algorithms.PushGP.Expressions.Name;
 
 namespace HeuristicLab.Algorithms.PushGP
@@ -51 +45 @@
                 {
                     endIndex = i;
-                    return expressions.Count != 0
-                        ? new ExecExpandExpression(expressions.ToArray())
-                        : new CodeNoopExpression() as Expression;
+                    return new ExecExpandExpression(expressions.ToArray());
                 }
 
@@ -65 +57 @@
 
                 // expression
-                OpCode opCode;
-                if (SymbolTable.TryGetOpCode(symbol, out opCode))
+                if (ExpressionTable.TryGetStatelessExpression(symbol, out expression) ||
+                    ExpressionTable.TryGetStatefullExpression(symbol, out expression))
                 {
-                    expression = ExpressionFactory.Create(opCode);
                     expressions.Insert(0, expression);
                     continue;