Changeset 9308 for branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/IntArray.cs

Timestamp:

03/12/13 12:20:25 (12 years ago)

Author:

sforsten

Message:

#2018:

• added column names to the ValueTypeArray and StringArray
• added batch update methods to IStringConvertibleArray similar to methods in IStringConvertibleMatrix

File:

• branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/IntArray.cs (modified) (5 diffs)

branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data/3.3/IntArray.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using HeuristicLab.Common;
@@ -28 +31 @@
   [Item("IntArray", "Represents an array of integer values.")]
   [StorableClass]
-  public class IntArray : ValueTypeArray<int>, IStringConvertibleArray {
+  public class IntArray : ValueTypeArray<int> {
     [StorableConstructor]
     protected IntArray(bool deserializing) : base(deserializing) { }
@@ -42 +45 @@
     }
 
-    protected virtual bool Validate(string value, out string errorMessage) {
+    protected override bool Validate(string value, out string errorMessage) {
       int val;
       bool valid = int.TryParse(value, out val);
@@ -55 +58 @@
       return valid;
     }
-    protected virtual string GetValue(int index) {
+    protected override string GetValue(int index) {
       return this[index].ToString();
     }
-    protected virtual bool SetValue(string value, int index) {
+    protected override bool SetValue(string value, int index) {
+      if (ReadOnly) throw new NotSupportedException("Item cannot be set. ValueTypeArray is read-only.");
       int val;
       if (int.TryParse(value, out val)) {
@@ -67 +71 @@
       }
     }
-
-    #region IStringConvertibleArray Members
-    int IStringConvertibleArray.Length {
-      get { return Length; }
-      set { Length = value; }
+    protected override bool SetValues(IEnumerable<ArrayValue<string>> arrayValues) {
+      if (ReadOnly) throw new NotSupportedException("Item cannot be set. ValueTypeArray is read-only.");
+      int parsed;
+      if (!arrayValues.All(v => int.TryParse(v.Value, out parsed))) return false;
+      List<int> positions = new List<int>();
+      foreach (var v in arrayValues) {
+        parsed = int.Parse(v.Value);
+        if (array[v.Index] != parsed) {
+          array[v.Index] = parsed;
+          positions.Add(v.Index);
+        }
+      }
+      OnItemsChanged(positions);
+      return true;
     }
-    bool IStringConvertibleArray.Validate(string value, out string errorMessage) {
-      return Validate(value, out errorMessage);
-    }
-    string IStringConvertibleArray.GetValue(int index) {
-      return GetValue(index);
-    }
-    bool IStringConvertibleArray.SetValue(string value, int index) {
-      return SetValue(value, index);
-    }
-    #endregion
   }
 }