Changeset 14777 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Parser/PushParser.cs

Timestamp:

03/23/17 01:11:18 (7 years ago)

Author:

pkimmesw

Message:

#2665 simplifier, push solution results view, performance improvements, small bug fixes, ui fixes

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Parser/PushParser.cs (modified) (5 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Parser/PushParser.cs

@@ -16 +16 @@
     private static readonly char[] symbolTrim = { '\r', '\n' };
 
-    public static PushProgram Parse(string source, int startIndex = 0) {
+    public static Expression Parse(string source, int startIndex = 0) {
       var symbols = source.Split(delimiter);
 
@@ -23 +23 @@
     }
 
-    private static PushProgram Parse(string[] symbols, int startIndex, out int endIndex) {
+    public static PushProgram ParseProgram(string source, int startIndex = 0) {
+      var expression = Parse(source, startIndex);
+
+      return expression as PushProgram ?? new PushProgram(new[] { expression });
+    }
+
+    private static Expression Parse(string[] symbols, int startIndex, out int endIndex) {
       var expressions = new List<Expression>();
 
@@ -39 +45 @@
           case closeBrace:
             endIndex = i;
-            return new PushProgram(expressions.ToArray());
+            return new PushProgram(expressions);
         }
 
@@ -51 +57 @@
         // expression
         if (ExpressionTable.TryGetStatelessExpression(symbol, out expression)
-            || ExpressionTable.TryGetStatefullExpression(symbol, out expression)) {
+            || ExpressionTable.TryGetStatefulExpression(symbol, out expression)) {
           expressions.Insert(0, expression);
           continue;
@@ -62 +68 @@
       endIndex = symbols.Length - 1;
 
-      return new PushProgram(expressions.ToArray());
+      switch (expressions.Count) {
+        case 0:
+          return PushProgram.Empty;
+        case 1:
+          return expressions[0];
+        default:
+          return new PushProgram(expressions);
+      }
     }