Changeset 9433

Timestamp:

05/03/13 11:37:56 (12 years ago)

Author:

mkommend

Message:

#2042: Updated ToString of StringConvertibleMatrix /-Array.

Location:

trunk/sources/HeuristicLab.Data/3.3

Files:

• StringArray.cs (modified) (3 diffs)
• StringMatrix.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Data/3.3/StringArray.cs

@@ -34 +34 @@
   [StorableClass]
   public class StringArray : Item, IEnumerable<string>, IStringConvertibleArray {
+    private const int maximumToStringLength = 100;
+
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
@@ -106 +108 @@
 
     public override string ToString() {
+      if (array.Length == 0) return "[]";
+
       StringBuilder sb = new StringBuilder();
       sb.Append("[");
-      if (array.Length > 0) {
-        sb.Append(array[0]);
-        for (int i = 1; i < array.Length; i++)
-          sb.Append(";").Append(array[i]);
+      sb.Append(array[0]);
+      for (int i = 1; i < array.Length; i++) {
+        sb.Append(";").Append(array[i]);
+        if (sb.Length > maximumToStringLength) {
+          sb.Append("...");
+          break;
+        }
       }
       sb.Append("]");
@@ -150 +157 @@
       if (ItemChanged != null)
         ItemChanged(this, new EventArgs<int>(index));
-      OnToStringChanged();
+      if (index < maximumToStringLength)
+        OnToStringChanged();
     }
     public event EventHandler Reset;

trunk/sources/HeuristicLab.Data/3.3/StringMatrix.cs

@@ -34 +34 @@
   [StorableClass]
   public class StringMatrix : Item, IEnumerable<string>, IStringConvertibleMatrix {
+    private const int maximumToStringLength = 100;
+
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
@@ -208 +210 @@
 
     public override string ToString() {
+      if (matrix.Length == 0) return "[]";
+
       StringBuilder sb = new StringBuilder();
       sb.Append("[");
-      if (matrix.Length > 0) {
-        for (int i = 0; i < Rows; i++) {
-          sb.Append("[").Append(matrix[i, 0]);
-          for (int j = 1; j < Columns; j++)
-            sb.Append(";").Append(matrix[i, j]);
-          sb.Append("]");
+      for (int i = 0; i < Rows; i++) {
+        sb.Append("[").Append(matrix[i, 0]);
+        for (int j = 1; j < Columns; j++)
+          sb.Append(";").Append(matrix[i, j]);
+        sb.Append("]");
+
+        if (sb.Length > maximumToStringLength) {
+          sb.Append("[...]");
+          break;
         }
       }
       sb.Append("]");
+
       return sb.ToString();
     }
@@ -286 +294 @@
       if (ItemChanged != null)
         ItemChanged(this, new EventArgs<int, int>(rowIndex, columnIndex));
-      OnToStringChanged();
+
+      //approximation to avoid firing of unnecessary ToStringChangedEvents
+      //columnIndex is not used, because always full rows are returned in the ToString method
+      if (rowIndex * Columns < maximumToStringLength)
+        OnToStringChanged();
     }
     public event EventHandler Reset;