Changeset 16158 for branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear

Timestamp:

09/20/18 13:12:17 (6 years ago)

Author:

pfleck

Message:

#2883 merged trunk

Location:

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.4 (modified) (2 props)
• 3.4/Linear/LinearDiscriminantAnalysis.cs (modified) (1 diff)
• 3.4/Linear/LinearRegression.cs (modified) (2 diffs)
• 3.4/Linear/MultinomialLogitClassification.cs (modified) (1 diff)

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4

@@ +1 @@
+*.user
+*.vs10x
+HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
+HeuristicLabAlgorithmsDataAnalysisPlugin.cs
+Plugin.cs
 bin
 obj
-HeuristicLabAlgorithmsDataAnalysisPlugin.cs
-HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
-*.vs10x
-Plugin.cs
-*.user

@@ +1 @@
+*.user
+*.vs10x
+HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
+HeuristicLabAlgorithmsDataAnalysisPlugin.cs
+Plugin.cs
 bin
 obj
-HeuristicLabAlgorithmsDataAnalysisPlugin.cs
-HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
-*.vs10x
-Plugin.cs
-*.user

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

@@ -80 +80 @@
       inputMatrix = factorMatrix.HorzCat(inputMatrix);
 
-      if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
+      if (inputMatrix.ContainsNanOrInfinity())
         throw new NotSupportedException("Linear discriminant analysis does not support NaN or infinity values in the input dataset.");
 

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

@@ -80 +80 @@
       var inputMatrix = binaryMatrix.HorzCat(doubleVarMatrix);
 
-      if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
+      if (inputMatrix.ContainsNanOrInfinity())
         throw new NotSupportedException("Linear regression does not support NaN or infinity values in the input dataset.");
 
@@ -100 +100 @@
       int nVarCoeff = doubleVariables.Count();
       var tree = LinearModelToTreeConverter.CreateTree(factorVariables, coefficients.Take(nFactorCoeff).ToArray(),
-        doubleVariables.ToArray(), coefficients.Skip(nFactorCoeff).Take(nVarCoeff).ToArray(), 
+        doubleVariables.ToArray(), coefficients.Skip(nFactorCoeff).Take(nVarCoeff).ToArray(),
         @const: coefficients[nFeatures]);
-      
+
       SymbolicRegressionSolution solution = new SymbolicRegressionSolution(new SymbolicRegressionModel(problemData.TargetVariable, tree, new SymbolicDataAnalysisExpressionTreeLinearInterpreter()), (IRegressionProblemData)problemData.Clone());
       solution.Model.Name = "Linear Regression Model";

branches/2883_GBTModelStorage/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

@@ -78 +78 @@
       inputMatrix = factorMatrix.HorzCat(inputMatrix);
 
-      if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
+      if (inputMatrix.ContainsNanOrInfinity())
         throw new NotSupportedException("Multinomial logit classification does not support NaN or infinity values in the input dataset.");
 

@@ +1 @@
+*.user
+*.vs10x
+HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
+HeuristicLabAlgorithmsDataAnalysisPlugin.cs
+Plugin.cs
 bin
 obj
-HeuristicLabAlgorithmsDataAnalysisPlugin.cs
-HeuristicLab.Algorithms.DataAnalysis-3.4.csproj.user
-*.vs10x
-Plugin.cs
-*.user