Changeset 15131 for stable/HeuristicLab.Common

Timestamp:

07/06/17 10:19:37 (7 years ago)

Author:

gkronber

Message:

#2650: merged r14826 from trunk to stable. The only remaining conflict is DataTableControl and ScatterPlotControl which have been renamed within r14982 (-> tree conflict).

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Common/3.3/MatrixExtensions.cs (modified) (2 diffs)

stable/HeuristicLab.Common/3.3/MatrixExtensions.cs

@@ -20 +20 @@
 #endregion
 
+using System.Diagnostics.Contracts;
+
 namespace HeuristicLab.Common {
   public static class MatrixExtensions {
@@ -35 +37 @@
       return result;
     }
+
+    /// <summary>
+    /// Concatenates matrices vertically.
+    /// A      B
+    /// 1 2    9 8
+    /// 3 4    7 6
+    /// 
+    /// VertCat(A, B)
+    /// 1 2 
+    /// 3 4
+    /// 9 8
+    /// 7 6
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="a"></param>
+    /// <param name="b"></param>
+    /// <returns>A new matrix with the number of rows = a.GetLength(0) + b.GetLength(0)</returns>
+    public static T[,] VertCat<T>(this T[,] a, T[,] b) {
+      Contract.Assert(a.GetLength(1) == b.GetLength(1));
+      var aLen = a.GetLength(0);
+      var bLen = b.GetLength(0);
+      var result = new T[aLen + bLen, a.GetLength(1)];
+      for (int i = 0; i < aLen; i++)
+        for (int j = 0; j < a.GetLength(1); j++)
+          result[i, j] = a[i, j];
+      for (int i = 0; i < bLen; i++)
+        for (int j = 0; j < b.GetLength(1); j++)
+          result[i + aLen, j] = b[i, j];
+
+      return result;
+    }
+
+    /// <summary>
+    /// Concatenates matrices horizontally.
+    /// A      B
+    /// 1 2    9 8
+    /// 3 4    7 6
+    /// 
+    /// HorzCat(A, B)
+    /// 1 2 9 8
+    /// 3 4 7 6
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="a"></param>
+    /// <param name="b"></param>
+    /// <returns>A new matrix with the number of columns = a.GetLength(1) + b.GetLength(1)</returns>
+    public static T[,] HorzCat<T>(this T[,] a, T[,] b) {
+      Contract.Assert(a.GetLength(0) == b.GetLength(0));
+      var aLen = a.GetLength(1);
+      var bLen = b.GetLength(1);
+      var result = new T[a.GetLength(0), aLen + bLen];
+      for (int i = 0; i < a.GetLength(0); i++)
+        for (int j = 0; j < aLen; j++)
+          result[i, j] = a[i, j];
+      for (int i = 0; i < a.GetLength(0); i++)
+        for (int j = 0; j < bLen; j++)
+          result[i, j + aLen] = b[i, j];
+      return result;
+    }
   }
 }