Changeset 15958 for branches/2913_MatlabScriptProblemInstanceProvider/HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

06/13/18 15:28:39 (7 years ago)

Author:

rhanghof

Message:

#2913:

• Enhancements on the RegressionMatlabImportDialog
• Added a new text formater SymbolicDataAnalysisExpressionMATLABFunctionFormatter

Location:

branches/2913_MatlabScriptProblemInstanceProvider/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Matlab

Files:

• Api/Types/MLDoubleArray.cs (modified) (1 diff)
• Api/Types/MLTimeseries.cs (modified) (1 diff)
• RegressionMatlabInstanceProvider.cs (modified) (2 diffs)

branches/2913_MatlabScriptProblemInstanceProvider/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Matlab/Api/Types/MLDoubleArray.cs

@@ -20 +20 @@
       _dataHeaders = new string[Data.GetLength(1)];
       for (int i = 0; i < _dataHeaders.Length; i++) {
-        _dataHeaders[i] = string.Format("{0}:{1}", name, i);
+        _dataHeaders[i] = string.Format("{0}_{1}", name, i);
       }
     }

branches/2913_MatlabScriptProblemInstanceProvider/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Matlab/Api/Types/MLTimeseries.cs

@@ -97 +97 @@
 
       for (int i = 0; i < valueColumns; i++) {
-        _dataHeaders[i] = string.Format("{0}:{1}", Name, i);
+        _dataHeaders[i] = string.Format("{0}_{1}", Name, i);
       }
 

branches/2913_MatlabScriptProblemInstanceProvider/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Matlab/RegressionMatlabInstanceProvider.cs

@@ -28 +28 @@
 using HeuristicLab.Common;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.Instances.DataAnalysis.Regression.Matlab.Api;
 using HeuristicLab.Problems.Instances.DataAnalysis.Regression.Matlab.Api.Types;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis.Regression.Matlab {
@@ -67 +67 @@
 
 
+    private Dataset GetValues(RegressionMatlabImportType type) {
+      if (type.Shuffle) {
+        type.Values = type.Values.Shuffle(new MersenneTwister());
+      }
+      return type.Values;
+    }
+
     public IRegressionProblemData ImportData(string path, RegressionMatlabImportType type, IEnumerable<MLVariableInfo> variableNames) {
-      var dataset = type.Values;
+      var dataset = GetValues(type);
       var targetVar = type.TargetVariable;