Changeset 15334 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Stack/PrintStack.cs

Timestamp:

08/21/17 11:33:53 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Testet error functions, Small fixes, Created HL files

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Stack/PrintStack.cs (modified) (12 diffs)

branches/PushGP/HeuristicLab.PushGP

@@ -1 +1 @@
 *.user
+packages
+TestResults

@@ -1 +1 @@
 *.user
+packages
+TestResults

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

@@ -14 +14 @@
   public class PrintStack : IPrintStack {
     private int lineCount = 0;
+    private int length = 0;
+    private IReadOnlyList<string> lines;
     private readonly StringBuilder stringBuilder = new StringBuilder();
 
+    public PrintStack() {
+      IsCurrentLineEmpty = true;
+    }
+
+    public bool IsCurrentLineEmpty { get; private set; }
+
     IEnumerator IEnumerable.GetEnumerator() {
-      var lines = AsStrings();
-      return lines.GetEnumerator();
+      return Lines.GetEnumerator();
     }
 
@@ -25 +32 @@
     }
 
+    public IReadOnlyList<string> Lines
+    {
+      get
+      {
+        if (stringBuilder.Length == length) return lines;
+        length = stringBuilder.Length;
+        lines = stringBuilder.ToString().Split(PushEnvironment.NewLine);
+
+        return lines;
+      }
+    }
+
     void IPushStack.Clear() {
+      lineCount = 0;
+      length = 0;
+      lines = null;
+      IsCurrentLineEmpty = true;
       stringBuilder.Clear();
     }
@@ -31 +54 @@
     public void NewLine() {
       stringBuilder.Append(PushEnvironment.NewLine);
+      IsCurrentLineEmpty = true;
       lineCount++;
     }
@@ -36 +60 @@
     public void Push<T>(T item) {
       if (IsEmpty) lineCount = 1;
-      stringBuilder.Append(item);
+      var str = item.ToString();
+      stringBuilder.Append(str);
+      IsCurrentLineEmpty = IsCurrentLineEmpty && string.IsNullOrEmpty(str);
     }
 
@@ -42 +68 @@
       if (IsEmpty) lineCount = 1;
       stringBuilder.Concat(item);
+      IsCurrentLineEmpty = false;
     }
 
@@ -47 +74 @@
       if (IsEmpty) lineCount = 1;
       stringBuilder.Concat(item);
+      IsCurrentLineEmpty = false;
     }
 
@@ -52 +80 @@
       if (IsEmpty) lineCount = 1;
       stringBuilder.Concat(item);
+      IsCurrentLineEmpty = false;
     }
 
@@ -57 +86 @@
       if (IsEmpty) lineCount = 1;
       stringBuilder.Concat(item);
+      IsCurrentLineEmpty = false;
     }
 
@@ -62 +92 @@
       if (IsEmpty) lineCount = 1;
       stringBuilder.Append(item);
+      IsCurrentLineEmpty = false;
     }
 
@@ -67 +98 @@
       if (IsEmpty) lineCount = 1;
       stringBuilder.Append(item);
+      IsCurrentLineEmpty = false;
     }
-
 
     public void Push(string item) {
       if (IsEmpty) lineCount = 1;
       stringBuilder.Append(item);
+      IsCurrentLineEmpty = IsCurrentLineEmpty && string.IsNullOrEmpty(item);
     }
 
@@ -78 +110 @@
       for (var i = startIndex; i < items.Count; i++)
         stringBuilder.Append(items[i]);
+
+      IsCurrentLineEmpty = false;
     }
 
@@ -87 +121 @@
       foreach (var item in items)
         stringBuilder.Append(item);
+
+      IsCurrentLineEmpty = false;
     }
 
     public IEnumerable<string> AsStrings() {
-      var lines = stringBuilder.ToString().Split(PushEnvironment.NewLine);
-      return lines;
+      return Lines;
     }
 
     public IEnumerable<object> AsObjects() {
-      return AsStrings();
+      return Lines;
     }
 

@@ -1 +1 @@
 *.user
+packages
+TestResults