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

Timestamp:

05/02/18 13:14:16 (6 years ago)

Author:

rhanghof

Message:

#2913:

• Added the support for importing different Matlab datatypes.
• Added some classes and changed the import dialog for importing double arrays.

File:

• branches/2913_MatlabScriptProblemInstanceProvider/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Matlab/Api/Types/MLTimeseries.cs (modified) (3 diffs)

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

@@ -3 +3 @@
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 
@@ -24 +25 @@
     /// </summary>
     /// <param name="timeseries"></param>
-    public MLTimeseries(IEnumerable<MLTimeseries> timeseries) : this() {
+    public MLTimeseries(IEnumerable<MLTimeseries> timeseries, CancellationToken token) : this() {
       var dataHeaders = new List<string>();
       var times = new SortedSet<double>(); // The time values have to be unique and sorted.
@@ -64 +65 @@
 
           foreach (var v in vs) {
+            if (token.IsCancellationRequested) {
+              return;
+            }
             values[idx++] = v;
           }