Changeset 15013 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

Timestamp:

05/31/17 16:15:08 (7 years ago)

Author:

bburlacu

Message:

#2723: Found a different solution to this issue, by using IList<T> as the return type for the GetValues<T> method.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (5 diffs)

trunk/sources/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);
@@ -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;