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

Timestamp:

04/25/18 09:20:54 (6 years ago)

Author:

rhanghof

Message:

#2913: The import does now work with Matlab timeseries datatypes.

File:

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

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

@@ -7 +7 @@
 namespace HeuristicLab.Problems.Instances.DataAnalysis.Regression.Matlab.Api.Types {
   public class MLDoubleArray : IMLValueVariable<double[,]> {
+    private string[] _dataHeaders;
+
+    #region Constructors
 
     public MLDoubleArray(string name, object values) {
@@ -14 +17 @@
       }
       Data = values as double[,];
+
+      _dataHeaders = new string[Data.GetLength(1)];
+      for (int i = 0; i < _dataHeaders.Length; i++) {
+        _dataHeaders[i] = string.Format("{0}:{1}", name, i);
+      }
     }
 
+    private MLDoubleArray(MLDoubleArray a1, MLDoubleArray a2) {
+      Name = string.Format("{0};{1}", a1.Name, a2.Name);
+
+      if (!ConcatFeasible(a1, a2)) {
+        throw new ArgumentException(string.Format("Cannot concat {0} and {1}. Different number of rows.", a1.Name, a2.Name));
+      }
+
+      var numberOfColumns = a1.Columns + a2.Columns;
+      _dataHeaders = new string[numberOfColumns];
+      for (int i = 0; i < numberOfColumns; i++) {
+        if (i < a1.Columns) {
+          _dataHeaders[i] = a1.DataHeader[i];
+        } else {
+          _dataHeaders[i] = a2.DataHeader[i - a1.Columns];
+        }
+      }
+
+      Data = new double[a1.Rows, numberOfColumns];
+      for (int i = 0; i < a1.Rows; i++) {
+        for (int j = 0; j < numberOfColumns; j++) {
+          if (j < a1.Columns) {
+            Data[i, j] = a1.Data[i, j];
+          } else {
+            Data[i, j] = a1.Data[i, j - a1.Columns];
+          }
+        }
+      }
+    }
+    #endregion
+
+
+    /// <summary>
+    /// Concats two given MLDoubleArrays if their number of rows equals.
+    /// If they can't be concated, this method returns null.
+    /// </summary>
+    /// <param name="a1"></param>
+    /// <param name="a2"></param>
+    /// <returns></returns>
+    public static MLDoubleArray Concat(MLDoubleArray a1, MLDoubleArray a2) {
+      if (ConcatFeasible(a1, a2)) {
+        return null;
+      }
+      return new MLDoubleArray(a1, a2);
+    }
+
+    public static bool ConcatFeasible(MLDoubleArray a1, MLDoubleArray a2) {
+      return a1.Rows == a2.Rows;
+    }
+
+
+    #region Properties from the interface
+
     public string Name { get; set; }
+
     public double[,] Data { get; set; }
 
@@ -23 +84 @@
     }
 
-    public IMLTimeseries ToTimeseries() {
-      var times = new double[Data.GetLength(0), 1];
-      for (int i = 0; i < times.GetLength(0); i++) {
-        times[i, 1] = i;
+    public string[] DataHeader {
+      get { return _dataHeaders; }
+    }
+    #endregion
+
+    public int Rows { get {
+        return Data.GetLength(0);
       }
+    }
 
-      return new MLTimeseries(Name, times, Data);
+    public int Columns {
+      get {
+        return Data.GetLength(1);
+      }
     }
   }