Changeset 14693 for branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

02/23/17 13:08:05 (8 years ago)

Author:

mkommend

Message:

#2650: Fixed ordering of variables in problem data.

File:

• branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs (modified) (1 diff)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

@@ -157 +157 @@
         throw new ArgumentException("All allowed input variables must be present in the dataset and of type double or string.");
 
-      var inputVariables = new CheckedItemList<StringValue>(dataset.DoubleVariables.Concat(dataset.StringVariables).Select(x => new StringValue(x)));
+      var variables = dataset.VariableNames.Where(variable => dataset.VariableHasType<double>(variable) || dataset.VariableHasType<string>(variable));
+      var inputVariables = new CheckedItemList<StringValue>(variables.Select(x => new StringValue(x)));
       foreach (StringValue x in inputVariables)
         inputVariables.SetItemCheckedState(x, allowedInputVariables.Contains(x.Value));