Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs

Timestamp:

07/26/17 19:34:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed analyzer, fixed Plush encoding + operators, adpated print evaluation according to McPhee

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/Extensions.cs

@@ -5 +5 @@
   using System;
   using System.Collections;
+  using System.Globalization;
   using System.Reflection;
 
@@ -26 +27 @@
     }
 
-    public static Type GetStackEntryType(this StackTypes stackType) {
-      if (StackProperties.ContainsKey(stackType) &&
-          StackProperties[stackType].PropertyType.IsGenericType) {
-        var genericTypeDef = StackProperties[stackType].PropertyType.GetGenericTypeDefinition();
-        if (genericTypeDef == typeof(IPushStack<>))
-          return genericTypeDef.GetGenericArguments()[0];
+    public static string StringifyResult(this IPushInterpreter interpreter, ExampleArgumentType type, int offset) {
+      var emptyString = string.Empty;
+
+      switch (type) {
+        case ExampleArgumentType.Integer:
+          return GetEntryAsString(offset, interpreter.IntegerStack);
+
+        case ExampleArgumentType.IntegerVector:
+          return GetVectorEntryAsString(offset, interpreter.IntegerVectorStack);
+
+        case ExampleArgumentType.Float:
+          return interpreter.FloatStack.Count > offset
+            ? interpreter.FloatStack[offset].ToString(CultureInfo.CurrentUICulture)
+            : emptyString;
+
+        case ExampleArgumentType.FloatVector:
+          return GetVectorEntryAsString(offset, interpreter.FloatVectorStack);
+
+        case ExampleArgumentType.Boolean:
+          return GetEntryAsString(offset, interpreter.BooleanStack);
+
+        case ExampleArgumentType.Char:
+          return GetEntryAsString(offset, interpreter.CharStack);
+
+        case ExampleArgumentType.Print:
+          return interpreter.PrintStack.ToString();
+
+        case ExampleArgumentType.String:
+          return GetEntryAsString(offset, interpreter.StringStack);
+
+        case ExampleArgumentType.StringVector:
+          return GetVectorEntryAsString(offset, interpreter.StringVectorStack);
+
+        default: return string.Empty;
       }
+    }
 
-      return StackProperties.ContainsKey(stackType)
-        ? StackProperties[stackType]
-            .PropertyType
-            .GetInterfaces()
-            .First(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPushStack<>))
-            .GetGenericArguments()
-            .First()
-        : null;
+    private static string GetEntryAsString<T>(int offset, IPushStack<T> stack) {
+      return stack.Count > offset
+       ? stack[offset].ToString()
+       : string.Empty;
+    }
+
+    private static string GetVectorEntryAsString<T>(int offset, IPushStack<IReadOnlyList<T>> vectorStack) {
+      return vectorStack.Count > offset
+       ? "[" + string.Join(",", vectorStack[offset]) + "]"
+       : string.Empty;
     }