Free cookie consent management tool by TermsFeed Policy Generator

# Changeset 14701

Ignore:
Timestamp:
02/24/17 13:16:09 (7 years ago)
Message:

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

Location:
branches/symbreg-factors-2650
Files:
5 edited

Unmodified
Removed
• ## branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

 r14542 double[,] factorMatrix = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows); inputMatrix = factorMatrix.VertCat(inputMatrix); inputMatrix = factorMatrix.HorzCat(inputMatrix); if (inputMatrix.Cast().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
• ## branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

 r14542 double[,] binaryMatrix = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows); double[,] doubleVarMatrix = AlglibUtil.PrepareInputMatrix(dataset, doubleVariables.Concat(new string[] { targetVariable }), rows); var inputMatrix = binaryMatrix.VertCat(doubleVarMatrix); var inputMatrix = binaryMatrix.HorzCat(doubleVarMatrix); if (inputMatrix.Cast().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
• ## branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

 r14542 var factorVariableValues = AlglibUtil.GetFactorVariableValues(dataset, factorVariableNames, rows); var factorMatrix = AlglibUtil.PrepareInputMatrix(dataset, factorVariableValues, rows); inputMatrix = factorMatrix.VertCat(inputMatrix); inputMatrix = factorMatrix.HorzCat(inputMatrix); if (inputMatrix.Cast().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
• ## branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitModel.cs

 r14240 double[,] factorData = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows); inputData = factorData.VertCat(inputData); inputData = factorData.HorzCat(inputData); int n = inputData.GetLength(0);
• ## branches/symbreg-factors-2650/HeuristicLab.Common/3.3/MatrixExtensions.cs

 r14237 /// /// 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 /// /// A new matrix with the number of rows = a.GetLength(0) + b.GetLength(0) public static T[,] HorzCat(this T[,] a, T[,] b) { public static T[,] VertCat(this T[,] a, T[,] b) { Contract.Assert(a.GetLength(1) == b.GetLength(1)); var aLen = a.GetLength(0); return result; } /// /// 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 /// /// A new matrix with the number of columns = a.GetLength(1) + b.GetLength(1) public static T[,] VertCat(this T[,] a, T[,] b) { public static T[,] HorzCat(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.