Changeset 14952 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Parser

Timestamp:

05/10/17 11:23:05 (8 years ago)

Author:

pkimmesw

Message:

#2665 Added IsNoop to Expression, Made Expressions storable, Fixed Debugger, Fixed and improved problem data and result visualisation, Added custom ErcOption view, Added problem difficulty to problem data name

File:

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

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

@@ -2 +2 @@
   using System.Collections.Generic;
   using System.Globalization;
-
+  using System.Linq;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
 
@@ -57 +57 @@
         // expression
         if (ExpressionTable.TryGetStatelessExpression(symbol, out expression)
-            || ExpressionTable.TryGetStatefulExpression(symbol, out expression)) {
+         || ExpressionTable.TryGetStatefulExpression(symbol, out expression)) {
           expressions.Insert(0, expression);
           continue;
@@ -79 +79 @@
 
     private static bool TryParseLiteral(string word, out Expression expression) {
+      if (word.StartsWith("'") && word.EndsWith("'") && word.Length == 3) {
+        expression = new CharPushExpression(word[1]);
+        return true;
+      }
+
+      if (word.StartsWith("\"") && word.EndsWith("\"")) {
+        expression = new StringPushExpression(word);
+        return true;
+      }
+
+      // "[]" has no values and can therefer not parsed correctly as vector of a specific type
+      if (word.StartsWith("[") && word.EndsWith("]") && word.Length > 3) {
+        var vectorEntries = word
+          .Substring(1, word.Length - 2)
+          .Split(',')
+          .Select(x => {
+            Expression e;
+            var success = TryParseLiteral(x.Trim(), out e);
+
+            return new { success, e, type = e.GetType() };
+          })
+          .ToArray();
+
+        if (vectorEntries.Length == 0) {
+          expression = null;
+          return false;
+        }
+
+        var vectorEntryType = vectorEntries.First().type;
+        if (vectorEntries.Any(x => !x.success || x.type != vectorEntryType)) {
+          expression = null;
+          return false;
+        }
+
+        var result = vectorEntries
+          .Select(x => x.e)
+          .ToArray();
+
+        // TODO
+        //switch(vectorEntryType.GetHashCode())
+        //{
+        //  case typeof(IntegerPushExpression).GetHashCode(): return new IntegerVectorPushExpression(result)
+        //}
+
+        //expression = new StringPushExpression(word);
+        //return true;
+      }
+
       long longValue;
       if (long.TryParse(word, out longValue)) {