Context Navigation

Changeset 14701 for branches

Timestamp:

02/24/17 13:16:09 (8 years ago)

Author:

mkommend

Message:

#2650: Switched definition of vertical and horizontal concatination of matrixes.

Location:

branches/symbreg-factors-2650

Files:

r14542	r14701
78	78	double[,] factorMatrix = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows);
79	79
80		inputMatrix = factorMatrix.~~Vert~~Cat(inputMatrix);
	80	inputMatrix = factorMatrix.HorzCat(inputMatrix);
81	81
82	82	if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) \|\| double.IsInfinity(x)))

r14542	r14701
79	79	double[,] binaryMatrix = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows);
80	80	double[,] doubleVarMatrix = AlglibUtil.PrepareInputMatrix(dataset, doubleVariables.Concat(new string[] { targetVariable }), rows);
81		var inputMatrix = binaryMatrix.~~Vert~~Cat(doubleVarMatrix);
	81	var inputMatrix = binaryMatrix.HorzCat(doubleVarMatrix);
82	82
83	83	if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) \|\| double.IsInfinity(x)))

r14542	r14701
76	76	var factorVariableValues = AlglibUtil.GetFactorVariableValues(dataset, factorVariableNames, rows);
77	77	var factorMatrix = AlglibUtil.PrepareInputMatrix(dataset, factorVariableValues, rows);
78		inputMatrix = factorMatrix.~~Vert~~Cat(inputMatrix);
	78	inputMatrix = factorMatrix.HorzCat(inputMatrix);
79	79
80	80	if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) \|\| double.IsInfinity(x)))

r14240	r14701
100	100	double[,] factorData = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows);
101	101
102		inputData = factorData.~~Vert~~Cat(inputData);
	102	inputData = factorData.HorzCat(inputData);
103	103
104	104	int n = inputData.GetLength(0);

-                      r14237
+                      r14701
     /// <summary>
     /// Concatenates matrices horizontally.
+    /// Concatenates matrices vertically.
     /// A      B
     /// 1 2    9 8
     /// 3 4    7 6
     ///
     /// HorzCat(A, B)
+    /// VertCat(A, B)
     /// 1 2
     /// 3 4
 …
     /// <param name="b"></param>
     /// <returns>A new matrix with the number of rows = a.GetLength(0) + b.GetLength(0)</returns>
     public static T[,] HorzCat<T>(this T[,] a, T[,] b) {
+    public static T[,] VertCat<T>(this T[,] a, T[,] b) {
       Contract.Assert(a.GetLength(1) == b.GetLength(1));
       var aLen = a.GetLength(0);
 …
       return result;
+    }
     /// <summary>
     /// Concatenates matrices vertically.
+    /// Concatenates matrices horizontally.
     /// A      B
     /// 1 2    9 8
     /// 3 4    7 6
     ///
     /// VertCat(A, B)
+    /// HorzCat(A, B)
     /// 1 2 9 8
     /// 3 4 7 6
 …
     /// <param name="b"></param>
     /// <returns>A new matrix with the number of columns = a.GetLength(1) + b.GetLength(1)</returns>
     public static T[,] VertCat<T>(this T[,] a, T[,] b) {
+    public static T[,] HorzCat<T>(this T[,] a, T[,] b) {
       Contract.Assert(a.GetLength(0) == b.GetLength(0));
       var aLen = a.GetLength(1);

Note: See TracChangeset for help on using the changeset viewer.