Changeset 15159

Timestamp:

07/06/17 13:56:47 (7 years ago)

Author:

gkronber

Message:

#2723: merged r15013 and r15015 from trunk to stable

Location:

stable/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Dataset.cs (modified) (6 diffs)
• DatasetUtil.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

@@ -74 +74 @@
         throw new ArgumentException(message);
       }
-      DatasetUtil.ValidateInputData(variableValues); // the validation call checks if every values IList is actually a list of the supported type
       rows = variableValues.First().Count;
       this.variableNames = new List<string>(variableNames);
@@ -115 +114 @@
       foreach (var v in variableNames) {
         if (VariableHasType<double>(v)) {
-          values.Add(new List<double>((List<double>)variableValues[v]));
+          values.Add(new List<double>((IList<double>)variableValues[v]));
         } else if (VariableHasType<string>(v)) {
-          values.Add(new List<string>((List<string>)variableValues[v]));
+          values.Add(new List<string>((IList<string>)variableValues[v]));
         } else if (VariableHasType<DateTime>(v)) {
-          values.Add(new List<DateTime>((List<DateTime>)variableValues[v]));
+          values.Add(new List<DateTime>((IList<DateTime>)variableValues[v]));
         } else {
           throw new ArgumentException("Unknown variable type.");
@@ -175 +174 @@
     }
     public IEnumerable<string> DoubleVariables {
-      get { return variableValues.Where(p => p.Value is List<double>).Select(p => p.Key); }
+      get { return variableValues.Where(p => p.Value is IList<double>).Select(p => p.Key); }
     }
 
     public IEnumerable<string> StringVariables {
-      get { return variableValues.Where(p => p.Value is List<string>).Select(p => p.Key); }
+      get { return variableValues.Where(p => p.Value is IList<string>).Select(p => p.Key); }
     }
 
@@ -194 +193 @@
     public ReadOnlyCollection<double> GetReadOnlyDoubleValues(string variableName) {
       var values = GetValues<double>(variableName);
-      return values.AsReadOnly();
+      return new ReadOnlyCollection<double>(values);
     }
     public double GetDoubleValue(string variableName, int row) {
@@ -214 +213 @@
     public ReadOnlyCollection<string> GetReadOnlyStringValues(string variableName) {
       var values = GetValues<string>(variableName);
-      return values.AsReadOnly();
+      return new ReadOnlyCollection<string>(values);
     }
 
@@ -221 +220 @@
       return rows.Select(x => values[x]);
     }
-    private List<T> GetValues<T>(string variableName) {
+    private IList<T> GetValues<T>(string variableName) {
       IList list;
       if (!variableValues.TryGetValue(variableName, out list))
         throw new ArgumentException("The variable " + variableName + " does not exist in the dataset.");
-      List<T> values = list as List<T>;
+      IList<T> values = list as IList<T>;
       if (values == null) throw new ArgumentException("The variable " + variableName + " is not a " + typeof(T) + " variable.");
       return values;

stable/HeuristicLab.Problems.DataAnalysis/3.4/DatasetUtil.cs

@@ -38 +38 @@
     /// <returns>A new list containing shuffled copies of the original value lists.</returns>
     public static List<IList> ShuffleLists(this List<IList> values, IRandom random) {
-      ValidateInputData(values);
-
       int count = values.First().Count;
       int[] indices = Enumerable.Range(0, count).Shuffle(random).ToArray();
@@ -45 +43 @@
       for (int col = 0; col < values.Count; col++) {
 
-        if (values[col] is List<double>)
+        if (values[col] is IList<double>)
           shuffled.Add(new List<double>());
-        else if (values[col] is List<DateTime>)
+        else if (values[col] is IList<DateTime>)
           shuffled.Add(new List<DateTime>());
-        else if (values[col] is List<string>)
+        else if (values[col] is IList<string>)
           shuffled.Add(new List<string>());
         else
@@ -59 +57 @@
       }
       return shuffled;
-    }
 
-    /// <summary>
-    /// This method checks if the provided lists of values are actually of the type List<T>, where T is a double, string or DateTime
-    /// </summary>
-    /// <param name="values">The values lists</param>
-    internal static void ValidateInputData(IEnumerable<IList> values) {
-      if (!values.Any())
-        throw new InvalidEnumArgumentException("The provided list of values is empty.");
-
-      var errorIndices = new List<int>();
-      int col = 0;
-      foreach (var v in values) {
-        var doubleList = v as List<double>;
-        var stringList = v as List<string>;
-        var dateTimeList = v as List<DateTime>;
-
-        var typedCollections = new IList[] { doubleList, stringList, dateTimeList };
-
-        if (typedCollections.All(x => x == null)) {
-          errorIndices.Add(col); // the values are not a) a list and b) of any of the supported types
-        }
-        ++col;
-      }
-
-      if (errorIndices.Any()) {
-        var sb = new StringBuilder();
-        for (int i = 0; i < errorIndices.Count; ++i) {
-          sb.Append(i);
-          sb.Append(i < errorIndices.Count - 1 ? ", " : " ");
-        }
-        var error = string.Format("Invalid input values. The following columns are not lists of double, string or DateTime values: {0}", sb);
-        throw new ArgumentException(error);
-      }
     }
   }