Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack

Files:

• IPushStack.cs (modified) (2 diffs)
• InterpreterStackStringifier.cs (modified) (2 diffs)
• PushStack.cs (modified) (3 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/IPushStack.cs

@@ -4 +4 @@
 
   public interface IPushStack<T> : ICollection<T>, IPushStack {
-    T Top { get; }
+    T Top { get; set; }
     T TopOrDefault { get; }
     T Bottom { get; }
@@ -23 +23 @@
     void Insert(int index, T item);
     T ReverseElementAt(int offset);
-    void SetTop(T value);
     T Pop();
     T[] Pop(int count);

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/InterpreterStackStringifier.cs

@@ -3 +3 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Stack {
+  using System.Globalization;
+
   using HeuristicLab.Problems.ProgramSynthesis.Push.Constants;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Extensions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
 
-  public class InterpreterStackStringifier {
+  public static class InterpreterStackStringifier {
 
-    public static IEnumerable<string> StringifyStack(IPushInterpreter interpreter, StackTypes type) {
+    public static IEnumerable<string> StringifyStack(this IPushInterpreter interpreter, StackTypes type) {
       switch (type) {
         case StackTypes.Boolean: return StringifyLiteralStack(interpreter.BooleanStack);
         case StackTypes.Integer: return StringifyLiteralStack(interpreter.IntegerStack);
-        case StackTypes.Float: return StringifyLiteralStack(interpreter.FloatStack);
-        case StackTypes.Char: return StringifyLiteralStack(interpreter.CharStack);
-        case StackTypes.String: return StringifyLiteralStack(interpreter.StringStack, "\"", "\"");
+        case StackTypes.Float: return StringifyFloatStack(interpreter.FloatStack, interpreter.Configuration.FloatStringFormat);
+        case StackTypes.Char: return StringifyCharStack(interpreter.CharStack);
+        case StackTypes.String: return StringifyLiteralStack(interpreter.StringStack, PushEnvironment.StringSymbolStr, PushEnvironment.StringSymbolStr);
         case StackTypes.Name: return StringifyLiteralStack(interpreter.NameStack);
         case StackTypes.Code: return StringifyLiteralStack(interpreter.CodeStack);
         case StackTypes.Exec: return StringifyLiteralStack(interpreter.ExecStack);
-        case StackTypes.Print: return StringifyLiteralStack(interpreter.PrintStack);
+        case StackTypes.Print: return StringifyLiteralStack(interpreter.PrintStack, PushEnvironment.StringSymbolStr, PushEnvironment.StringSymbolStr, false);
 
         case StackTypes.BooleanVector: return StringifyVectorStack(interpreter.BooleanVectorStack);
         case StackTypes.IntegerVector: return StringifyVectorStack(interpreter.IntegerVectorStack);
-        case StackTypes.FloatVector: return StringifyVectorStack(interpreter.FloatVectorStack);
-        case StackTypes.StringVector: return StringifyVectorStack(interpreter.StringVectorStack, "\"", "\"");
+        case StackTypes.FloatVector: return StringifyFloatVectorStack(interpreter.FloatVectorStack, interpreter.Configuration.FloatStringFormat);
+        case StackTypes.StringVector: return StringifyVectorStack(interpreter.StringVectorStack, PushEnvironment.StringSymbolStr, PushEnvironment.StringSymbolStr);
 
         default: return Enumerable.Empty<string>();
@@ -29 +32 @@
     }
 
-    private static IEnumerable<string> StringifyLiteralStack<T>(IPushStack<T> stack, string prefix = "", string postfix = "") {
-      return stack.Reverse().Select(x => prefix + x.ToString().Replace(PushEnvironment.NewLine, "\\n") + postfix);
+    private static IEnumerable<string> StringifyCharStack(IPushStack<char> stack) {
+      var result = stack.AsEnumerable();
+
+      return result.Select(x => PushEnvironment.CharSymbol + x.Printify() + PushEnvironment.CharSymbol);
     }
 
-    private static IEnumerable<string> StringifyVectorStack<T>(IPushStack<List<T>> stack, string prefix = "", string postfix = "") {
+    private static IEnumerable<string> StringifyFloatStack(IPushStack<double> stack, string format) {
+      var result = stack.AsEnumerable();
+
+      return result.Select(x => x.ToString(format, CultureInfo.InvariantCulture));
+    }
+
+    private static IEnumerable<string> StringifyLiteralStack<T>(IPushStack<T> stack, string prefix = "", string postfix = "", bool reverse = true) {
+      var result = stack.AsEnumerable();
+
+      if (reverse)
+        result = result.Reverse();
+
+      return result.Select(x => prefix + x.ToString() + postfix);
+    }
+
+    private static IEnumerable<string> StringifyFloatVectorStack(IPushStack<IReadOnlyList<double>> stack, string format) {
+      var separator = PushEnvironment.VectorSeparatorSymbol.ToString();
+      return stack
+        .Reverse()
+        .Select(x => PushEnvironment.VectorStartSymbol + string.Join(separator, x.Select(_ => _.ToString(format, CultureInfo.InvariantCulture))) + PushEnvironment.VectorEndSymbol);
+    }
+
+    private static IEnumerable<string> StringifyVectorStack<T>(IPushStack<IReadOnlyList<T>> stack, string prefix = "", string postfix = "") {
       var separator = PushEnvironment.VectorSeparatorSymbol.ToString();
       return stack

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/PushStack.cs

@@ -43 +43 @@
         return data[Count - 1];
       }
+
+      set
+      {
+        data[Count - 1] = value;
+      }
     }
 
@@ -119 +124 @@
     public T ReverseElementAt(int offset) {
       return data[offset];
-    }
-
-    public void SetTop(T value) {
-      data[Count - 1] = value;
     }
 
@@ -276 +277 @@
 
     public override string ToString() {
-      var data = this.data as IEnumerable<T>;
-      return string.Join(Delimiter, data.Reverse());
+      return string.Join(Delimiter, data.Select(x => x.ToString()).Reverse());
     }