Changeset 14701 for branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4

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/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear

Files:

• LinearDiscriminantAnalysis.cs (modified) (1 diff)
• LinearRegression.cs (modified) (1 diff)
• MultinomialLogitClassification.cs (modified) (1 diff)
• MultinomialLogitModel.cs (modified) (1 diff)

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

@@ -78 +78 @@
       double[,] factorMatrix = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows);
 
-      inputMatrix = factorMatrix.VertCat(inputMatrix);
+      inputMatrix = factorMatrix.HorzCat(inputMatrix);
 
       if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

@@ -79 +79 @@
       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<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

@@ -76 +76 @@
       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<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))

branches/symbreg-factors-2650/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitModel.cs

@@ -100 +100 @@
       double[,] factorData = AlglibUtil.PrepareInputMatrix(dataset, factorVariables, rows);
 
-      inputData = factorData.VertCat(inputData);
+      inputData = factorData.HorzCat(inputData);
 
       int n = inputData.GetLength(0);