Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/StringExpressions.cs

Timestamp:

04/18/17 01:15:25 (7 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/StringExpressions.cs (modified) (5 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/StringExpressions.cs

@@ -59 +59 @@
     public override bool Eval(IInternalPushInterpreter interpreter) {
       if (interpreter.StringStack.Count < 2 ||
-        interpreter.StringStack.Top.Length + interpreter.StringStack.ReverseElementAt(1).Length >= interpreter.Configuration.MaxStringLength)
+        interpreter.StringStack.Top.Length + interpreter.StringStack[1].Length >= interpreter.Configuration.MaxStringLength)
         return false;
 
@@ -117 +117 @@
 
       var str = interpreter.StringStack.Top;
-      var values = interpreter.IntegerStack.Pop(2);
-      var first = Math.Min(str.Length - 1, Math.Max(values[0], 0));
-      var second = Math.Min(str.Length - 1, Math.Max(values[1], first));
+      var firstValue = interpreter.IntegerStack[1];
+      var secondValue = interpreter.IntegerStack.Top;
+      interpreter.IntegerStack.Remove(2);
+
+      var first = Math.Min(str.Length - 1, Math.Max(firstValue, 0));
+      var second = Math.Min(str.Length - 1, Math.Max(secondValue, first));
       var length = second - first;
 
@@ -293 +296 @@
         return false;
 
-      var strings = interpreter.StringStack.Pop(2);
-      interpreter.BooleanStack.Push(strings[0].IndexOf(strings[1], StringComparison.Ordinal) >= 0);
+      var first = interpreter.StringStack[1];
+      var second = interpreter.StringStack.Top;
+      interpreter.StringStack.Remove(2);
+
+      interpreter.BooleanStack.Push(first.IndexOf(second, StringComparison.Ordinal) >= 0);
       return true;
     }
@@ -366 +372 @@
         return false;
 
-      var strings = interpreter.StringStack.Pop(2);
-
-      if (strings[0].Length == 0 || strings[1].Length == 0)
-        interpreter.StringStack.SetTop(strings[0]);
+      var first = interpreter.StringStack[1];
+      var second = interpreter.StringStack.Top;
+      interpreter.StringStack.Remove(2);
+
+      if (first.Length == 0 || second.Length == 0)
+        interpreter.StringStack.SetTop(first);
       else {
-        var result = strings[0].Replace(strings[1], interpreter.StringStack.Top);
+        var result = first.Replace(second, interpreter.StringStack.Top);
         interpreter.StringStack.SetTop(result);
       }
@@ -388 +396 @@
         return false;
 
-      var strings = interpreter.StringStack.Pop(2);
-
-      var pos = strings[0].IndexOf(strings[1], StringComparison.Ordinal);
+      var first = interpreter.StringStack[0];
+      var second = interpreter.StringStack[1];
+      var third = interpreter.StringStack[2];
+      interpreter.StringStack.Remove(2);
+
+      var result = ReplaceFirst(third, second, first);
+      interpreter.StringStack.SetTop(result);
+      return true;
+    }
+
+    private static string ReplaceFirst(string text, string search, string replace) {
+      int pos = text.IndexOf(search);
+      if (pos < 0) {
+        return text;
+      }
+      return text.Substring(0, pos) + replace + text.Substring(pos + search.Length);
+    }
+  }
+
+  /// <summary>
+  /// In top string on stack, replaces all occurences of second char with first char
+  /// </summary>
+  [PushExpression(StackTypes.String, "STRING.REPLACECHAR", StackTypes.Char)]
+  public class StringReplaceCharExpression : StatelessExpression {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      if (interpreter.StringStack.IsEmpty ||
+          interpreter.CharStack.Count < 2)
+        return false;
+
+      var first = interpreter.CharStack[1];
+      var second = interpreter.CharStack.Top;
+      interpreter.CharStack.Remove(2);
+
+      var result = interpreter.StringStack.Top.Replace(first, second);
+      interpreter.StringStack.SetTop(result);
+      return true;
+    }
+  }
+
+  /// <summary>
+  /// In top string on stack, replaces first occurence of second char with first char
+  /// </summary>
+  [PushExpression(StackTypes.String, "STRING.REPLACEFIRSTCHAR", StackTypes.Char)]
+  public class StringReplaceLastCharExpression : StatelessExpression {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      if (interpreter.StringStack.IsEmpty ||
+          interpreter.CharStack.Count < 2)
+        return false;
+
+      var str = interpreter.StringStack.Top;
+      var first = interpreter.CharStack[1];
+      var second = interpreter.CharStack.Top;
+      interpreter.CharStack.Remove(2);
+
+      var pos = str.IndexOf(first);
 
       if (pos < 0)
         return true;
 
-      var result = strings[0].Substring(0, pos) +
-                   interpreter.StringStack.Top +
-                   strings[0].Substring(pos + strings[1].Length);
-
-      interpreter.StringStack.SetTop(result);
-      return true;
-    }
-  }
-
-  /// <summary>
-  /// In top string on stack, replaces all occurences of second char with first char
-  /// </summary>
-  [PushExpression(StackTypes.String, "STRING.REPLACECHAR", StackTypes.Char)]
-  public class StringReplaceCharExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.StringStack.IsEmpty ||
-          interpreter.CharStack.Count < 2)
-        return false;
-
-      var chars = interpreter.CharStack.Pop(2);
-      var result = interpreter.StringStack.Top.Replace(chars[0], chars[1]);
-      interpreter.StringStack.SetTop(result);
-      return true;
-    }
-  }
-
-  /// <summary>
-  /// In top string on stack, replaces first occurence of second char with first char
-  /// </summary>
-  [PushExpression(StackTypes.String, "STRING.REPLACEFIRSTCHAR", StackTypes.Char)]
-  public class StringReplaceLastCharExpression : StatelessExpression {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      if (interpreter.StringStack.IsEmpty ||
-          interpreter.CharStack.Count < 2)
-        return false;
-
-      var str = interpreter.StringStack.Top;
-      var chars = interpreter.CharStack.Pop(2);
-      var pos = interpreter.StringStack.Top.IndexOf(chars[0]);
-
-      if (pos < 0)
-        return true;
-
       var result = str.Substring(0, pos) +
-                   chars[1] +
+                   second +
                    str.Substring(Math.Min(pos + 2, str.Length - 1));
+
       interpreter.StringStack.SetTop(result);
       return true;