Changeset 15430

Timestamp:

10/24/17 13:28:33 (7 years ago)

Author:

bwerth

Message:

#2847 first implementation of M5'-regression

Location:

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• FixedDataAnalysisAlgorithm.cs (modified) (1 diff)
• GaussianProcess/GaussianProcessClassification.cs (modified) (1 diff)
• GaussianProcess/GaussianProcessRegression.cs (modified) (4 diffs)
• GaussianProcess/MeanFunctions/MeanConst.cs (modified) (1 diff)
• GradientBoostedTrees/LossFunctions/SquaredErrorLoss.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (3 diffs)
• Interfaces/INearestNeighbourClassificationSolution.cs (modified) (1 diff)
• Interfaces/INearestNeighbourModel.cs (modified) (1 diff)
• Interfaces/INearestNeighbourRegressionSolution.cs (modified) (1 diff)
• Interfaces/INeuralNetworkClassificationSolution.cs (modified) (1 diff)
• Interfaces/INeuralNetworkEnsembleClassificationSolution.cs (modified) (1 diff)
• Interfaces/INeuralNetworkEnsembleModel.cs (modified) (1 diff)
• Interfaces/INeuralNetworkEnsembleRegressionSolution.cs (modified) (1 diff)
• Interfaces/INeuralNetworkModel.cs (modified) (1 diff)
• Interfaces/INeuralNetworkRegressionSolution.cs (modified) (1 diff)
• Interfaces/IRandomForestClassificationSolution.cs (modified) (1 diff)
• Interfaces/IRandomForestRegressionSolution.cs (modified) (1 diff)
• Interfaces/ISupportVectorMachineSolution.cs (modified) (1 diff)
• KernelRidgeRegression/KernelRidgeRegression.cs (modified) (1 diff)
• M5Regression (added)
• M5Regression/Interfaces (added)
• M5Regression/Interfaces/IImpurityCalculator.cs (added)
• M5Regression/Interfaces/IImpurityType.cs (added)
• M5Regression/Interfaces/ILeafType.cs (added)
• M5Regression/Interfaces/IM5MetaModel.cs (added)
• M5Regression/Interfaces/IPruningType.cs (added)
• M5Regression/LeafTypes (added)
• M5Regression/LeafTypes/ComplexLeaf.cs (added)
• M5Regression/LeafTypes/ComponentReductionLinearLeaf.cs (added)
• M5Regression/LeafTypes/ConstantLeaf.cs (added)
• M5Regression/LeafTypes/GaussianProcessLeaf.cs (added)
• M5Regression/LeafTypes/LinearLeaf.cs (added)
• M5Regression/LeafTypes/LogisticLeaf.cs (added)
• M5Regression/M5Regression.cs (added)
• M5Regression/M5Utilities (added)
• M5Regression/M5Utilities/M5Analyzer.cs (added)
• M5Regression/M5Utilities/M5CreationParameters.cs (added)
• M5Regression/M5Utilities/M5StaticUtilities.cs (added)
• M5Regression/M5Utilities/M5UpdateParameters.cs (added)
• M5Regression/M5Utilities/SplitInfo.cs (added)
• M5Regression/MetaModels (added)
• M5Regression/MetaModels/ComponentReducedLinearModel.cs (added)
• M5Regression/MetaModels/DampenedLinearModel.cs (added)
• M5Regression/MetaModels/M5NodeModel.cs (added)
• M5Regression/MetaModels/M5RuleModel.cs (added)
• M5Regression/MetaModels/M5RuleSetModel.cs (added)
• M5Regression/MetaModels/M5TreeModel.cs (added)
• M5Regression/MetaModels/PreconstructedLinearModel.cs (added)
• M5Regression/Pruning (added)
• M5Regression/Pruning/HoldoutLeafPruning.cs (added)
• M5Regression/Pruning/HoldoutLinearPruning.cs (added)
• M5Regression/Pruning/M5LeafPruning.cs (added)
• M5Regression/Pruning/M5LinearPruning.cs (added)
• M5Regression/Pruning/NoPruning.cs (added)
• M5Regression/Pruning/PruningBase.cs (added)
• M5Regression/Spliting (added)
• M5Regression/Spliting/OrderImpurityCalculator.cs (added)
• M5Regression/Spliting/OrderImpurityType.cs (added)
• Nca/ModelCreation/INcaModelCreator.cs (modified) (1 diff)
• PCA (added)
• PCA/PrincipleComponentAnalysis.cs (added)
• PCA/PrincipleComponentAnalysisStatic.cs (added)
• RandomForest/RandomForestRegressionSolution.cs (modified) (1 diff)
• TimeSeries/AutoregressiveModeling.cs (modified) (1 diff)
• kMeans/KMeansClusteringSolution.cs (modified) (1 diff)

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/FixedDataAnalysisAlgorithm.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Optimization;

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessClassification.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/GaussianProcessRegression.cs

@@ -1 @@
-
 #region License Information
 /* HeuristicLab
@@ -26 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -42 +40 @@
     public string Filename { get; set; }
 
-    public override Type ProblemType { get { return typeof(IRegressionProblem); } }
+    public override Type ProblemType {
+      get { return typeof(IRegressionProblem); }
+    }
     public new IRegressionProblem Problem {
-      get { return (IRegressionProblem)base.Problem; }
+      get { return (IRegressionProblem) base.Problem; }
       set { base.Problem = value; }
     }
@@ -54 +54 @@
     #region parameter properties
     public IConstrainedValueParameter<IGaussianProcessRegressionModelCreator> GaussianProcessModelCreatorParameter {
-      get { return (IConstrainedValueParameter<IGaussianProcessRegressionModelCreator>)Parameters[ModelCreatorParameterName]; }
+      get { return (IConstrainedValueParameter<IGaussianProcessRegressionModelCreator>) Parameters[ModelCreatorParameterName]; }
     }
     public IFixedValueParameter<GaussianProcessRegressionSolutionCreator> GaussianProcessSolutionCreatorParameter {
-      get { return (IFixedValueParameter<GaussianProcessRegressionSolutionCreator>)Parameters[SolutionCreatorParameterName]; }
+      get { return (IFixedValueParameter<GaussianProcessRegressionSolutionCreator>) Parameters[SolutionCreatorParameterName]; }
     }
     public IFixedValueParameter<BoolValue> CreateSolutionParameter {
-      get { return (IFixedValueParameter<BoolValue>)Parameters[CreateSolutionParameterName]; }
+      get { return (IFixedValueParameter<BoolValue>) Parameters[CreateSolutionParameterName]; }
     }
     #endregion

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/GaussianProcess/MeanFunctions/MeanConst.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/LossFunctions/SquaredErrorLoss.cs

@@ -23 +23 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -49 +49 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>5</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -360 +361 @@
     <Compile Include="Linear\MultinomialLogitModel.cs" />
     <Compile Include="Linear\Scaling.cs" />
+    <Compile Include="M5Regression\Interfaces\IImpurityCalculator.cs" />
+    <Compile Include="M5Regression\Interfaces\IImpurityType.cs" />
+    <Compile Include="M5Regression\Interfaces\IM5MetaModel.cs" />
+    <Compile Include="M5Regression\Interfaces\ILeafType.cs" />
+    <Compile Include="M5Regression\Interfaces\IPruningType.cs" />
+    <Compile Include="M5Regression\LeafTypes\ComplexLeaf.cs" />
+    <Compile Include="M5Regression\LeafTypes\ComponentReductionLinearLeaf.cs" />
+    <Compile Include="M5Regression\LeafTypes\ConstantLeaf.cs" />
+    <Compile Include="M5Regression\LeafTypes\GaussianProcessLeaf.cs" />
+    <Compile Include="M5Regression\LeafTypes\LinearLeaf.cs" />
+    <Compile Include="M5Regression\LeafTypes\LogisticLeaf.cs" />
+    <Compile Include="M5Regression\M5Regression.cs" />
+    <Compile Include="M5Regression\M5Utilities\M5StaticUtilities.cs" />
+    <Compile Include="M5Regression\M5Utilities\M5Analyzer.cs" />
+    <Compile Include="M5Regression\M5Utilities\M5CreationParameters.cs" />
+    <Compile Include="M5Regression\M5Utilities\M5UpdateParameters.cs" />
+    <Compile Include="M5Regression\M5Utilities\SplitInfo.cs" />
+    <Compile Include="M5Regression\MetaModels\ComponentReducedLinearModel.cs" />
+    <Compile Include="M5Regression\MetaModels\M5NodeModel.cs" />
+    <Compile Include="M5Regression\MetaModels\M5RuleModel.cs" />
+    <Compile Include="M5Regression\MetaModels\M5RuleSetModel.cs" />
+    <Compile Include="M5Regression\MetaModels\M5TreeModel.cs" />
+    <Compile Include="M5Regression\MetaModels\DampenedLinearModel.cs" />
+    <Compile Include="M5Regression\MetaModels\PreconstructedLinearModel.cs" />
+    <Compile Include="M5Regression\Pruning\HoldoutLinearPruning.cs" />
+    <Compile Include="M5Regression\Pruning\HoldoutLeafPruning.cs" />
+    <Compile Include="M5Regression\Pruning\M5LinearPruning.cs" />
+    <Compile Include="M5Regression\Pruning\PruningBase.cs" />
+    <Compile Include="M5Regression\Pruning\NoPruning.cs" />
+    <Compile Include="M5Regression\Pruning\M5LeafPruning.cs" />
+    <Compile Include="M5Regression\Spliting\OrderImpurityCalculator.cs" />
+    <Compile Include="M5Regression\Spliting\OrderImpurityType.cs" />
     <Compile Include="Nca\Initialization\INcaInitializer.cs" />
     <Compile Include="Nca\Initialization\LdaInitializer.cs" />
@@ -390 +423 @@
     <Compile Include="NeuralNetwork\NeuralNetworkRegressionSolution.cs" />
     <Compile Include="NonlinearRegression\NonlinearRegression.cs" />
+    <Compile Include="PCA\PrincipleComponentAnalysis.cs" />
+    <Compile Include="PCA\PrincipleComponentAnalysisStatic.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INearestNeighbourClassificationSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INearestNeighbourModel.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INearestNeighbourRegressionSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INeuralNetworkClassificationSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INeuralNetworkEnsembleClassificationSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INeuralNetworkEnsembleModel.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INeuralNetworkEnsembleRegressionSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INeuralNetworkModel.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/INeuralNetworkRegressionSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IRandomForestClassificationSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/IRandomForestRegressionSolution.cs

@@ -21 +21 @@
 
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/ISupportVectorMachineSolution.cs

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/KernelRidgeRegression/KernelRidgeRegression.cs

@@ -36 +36 @@
   [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 100)]
   [StorableClass]
-  public sealed class KernelRidgeRegression : BasicAlgorithm {
+  public sealed class KernelRidgeRegression : BasicAlgorithm, IDataAnalysisAlgorithm<IRegressionProblem> {
     private const string SolutionResultName = "Kernel ridge regression solution";
 

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/Nca/ModelCreation/INcaModelCreator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using HeuristicLab.Core;
 

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/RandomForest/RandomForestRegressionSolution.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/TimeSeries/AutoregressiveModeling.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClusteringSolution.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;