Changeset 9704

Timestamp:

07/15/13 14:09:46 (11 years ago)

Author:

mkommend

Message:

#2081: Merged trunk changes into path datatypes branch.

Location:

branches/HeuristicLab.Data Path DataTypes

Files:

• HeuristicLab.Data (modified) (1 prop)
• HeuristicLab.Data.Views (modified) (1 prop)
• HeuristicLab.Data/3.3/StringArray.cs (modified) (2 diffs)
• HeuristicLab.Data/3.3/ValueTypeArray.cs (modified) (2 diffs)

branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3/StringArray.cs

@@ -51 +51 @@
         if (value == null || !value.Any())
           elementNames = new List<string>();
-        else if (value.Count() != Length)
-          throw new ArgumentException("An element name must be specified for each element.");
+        else if (value.Count() > Length)
+          throw new ArgumentException("The number of element names must not exceed the array length.");
         else
           elementNames = new List<string>(value);
@@ -67 +67 @@
           while (elementNames.Count > value)
             elementNames.RemoveAt(elementNames.Count - 1);
-          while (elementNames.Count < value)
-            elementNames.Add("Element " + elementNames.Count);
           OnElementNamesChanged();
           OnReset();

branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3/ValueTypeArray.cs

@@ -51 +51 @@
         if (value == null || !value.Any())
           elementNames = new List<string>();
-        else if (value.Count() != Length)
-          throw new ArgumentException("An element name must be specified for each element.");
+        else if (value.Count() > Length)
+          throw new ArgumentException("The number of element names must not exceed the array length.");
         else
           elementNames = new List<string>(value);
@@ -69 +69 @@
           while (elementNames.Count > value)
             elementNames.RemoveAt(elementNames.Count - 1);
-          while (elementNames.Count < value)
-            elementNames.Add("Element " + elementNames.Count);
           OnElementNamesChanged();
           OnReset();