Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4082


Ignore:
Timestamp:
07/22/10 15:59:57 (14 years ago)
Author:
gkronber
Message:

Added plugin for evolutionary feature selection. #1097

Location:
trunk/sources
Files:
12 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r4079 r4082  
    6464    {72104A0B-90E7-42F3-9ABE-9BBBADD4B943} = {72104A0B-90E7-42F3-9ABE-9BBBADD4B943}
    6565    {3081630C-9521-47D7-8075-1777C12F212C} = {3081630C-9521-47D7-8075-1777C12F212C}
     66    {7252890C-F207-4AD6-B3C9-764DF93F73CC} = {7252890C-F207-4AD6-B3C9-764DF93F73CC}
    6667    {25087811-F74C-4128-BC86-8324271DA13E} = {25087811-F74C-4128-BC86-8324271DA13E}
    6768    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2} = {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}
    … …  
    321322EndProject
    322323Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.MultiVariate.Views-3.3", "HeuristicLab.Problems.DataAnalysis.MultiVariate.Views\3.3\HeuristicLab.Problems.DataAnalysis.MultiVariate.Views-3.3.csproj", "{9B6EA19A-F894-4E00-B5A3-970514284772}"
     324EndProject
     325Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.FeatureSelection-3.3", "HeuristicLab.Problems.DataAnalysis.FeatureSelection\3.3\HeuristicLab.Problems.DataAnalysis.FeatureSelection-3.3.csproj", "{7252890C-F207-4AD6-B3C9-764DF93F73CC}"
    323326EndProject
    324327Global
    … …  
    21642167    {9B6EA19A-F894-4E00-B5A3-970514284772}.Silverlight2|x86.ActiveCfg = Release|x86
    21652168    {9B6EA19A-F894-4E00-B5A3-970514284772}.Silverlight2|x86.Build.0 = Release|x86
     2169    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2170    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2171    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Debug|x64.ActiveCfg = Debug|x64
     2172    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Debug|x64.Build.0 = Debug|x64
     2173    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Debug|x86.ActiveCfg = Debug|x86
     2174    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Debug|x86.Build.0 = Debug|x86
     2175    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2176    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Release|Any CPU.Build.0 = Release|Any CPU
     2177    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Release|x64.ActiveCfg = Release|x64
     2178    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Release|x64.Build.0 = Release|x64
     2179    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Release|x86.ActiveCfg = Release|x86
     2180    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Release|x86.Build.0 = Release|x86
     2181    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Services|Any CPU.ActiveCfg = Release|x86
     2182    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Services|x64.ActiveCfg = Release|x86
     2183    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Services|x86.ActiveCfg = Release|x86
     2184    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Services|x86.Build.0 = Release|x86
     2185    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Silverlight2|Any CPU.ActiveCfg = Release|x86
     2186    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Silverlight2|x64.ActiveCfg = Release|x86
     2187    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Silverlight2|x86.ActiveCfg = Release|x86
     2188    {7252890C-F207-4AD6-B3C9-764DF93F73CC}.Silverlight2|x86.Build.0 = Release|x86
    21662189  EndGlobalSection
    21672190  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame

    r3842 r4082  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Regression","3.3.0.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.ALGLIB", "2.5.0.0")]
    31   [PluginDependency("HeuristicLab.Analysis", "3.3.0.0")]
    32   [PluginDependency("HeuristicLab.Collections", "3.3.0.0")]
     30  [PluginDependency("HeuristicLab.ALGLIB", "2.5")]
     31  [PluginDependency("HeuristicLab.Analysis", "3.3")]
     32  [PluginDependency("HeuristicLab.Collections", "3.3")]
    3333  [PluginDependency("HeuristicLab.Common", "3.3")]
    34   [PluginDependency("HeuristicLab.Common.Resources", "3.3.0.0")]
    35   [PluginDependency("HeuristicLab.Core", "3.3.0.0")]
    36   [PluginDependency("HeuristicLab.Data", "3.3.0.0")]
    37   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","3.3.0.0")]
     34  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     35  [PluginDependency("HeuristicLab.Core", "3.3")]
     36  [PluginDependency("HeuristicLab.Data", "3.3")]
     37  [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding","3.3")]
    3838  [PluginDependency("HeuristicLab.LibSVM", "1.6.3.0")]
    39   [PluginDependency("HeuristicLab.Operators", "3.3.0.0")]
    40   [PluginDependency("HeuristicLab.Optimization", "3.3.0.0")]
    41   [PluginDependency("HeuristicLab.Optimization.Operators", "3.3.0.0")]
    42   [PluginDependency("HeuristicLab.Parameters", "3.3.0.0")]
    43   [PluginDependency("HeuristicLab.Persistence", "3.3.0.0")]
    44   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.3.0.0")]
    45   [PluginDependency("HeuristicLab.Random", "3.3.0.0")] 
     39  [PluginDependency("HeuristicLab.Operators", "3.3")]
     40  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     41  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
     42  [PluginDependency("HeuristicLab.Parameters", "3.3")]
     43  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     44  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.3")]
     45  [PluginDependency("HeuristicLab.Random", "3.3")] 
    4646  public class HeuristicLabProblemsDataAnalysisRegressionPlugin : PluginBase {
    4747  }

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/LinearRegression/LinearRegressionSolutionCreator.cs

    r4068 r4082  
    9292
    9393    public override IOperation Apply() {
    94       SymbolicExpressionTree = CreateSymbolicExpressionTree(DataAnalysisProblemData.Dataset, DataAnalysisProblemData.TargetVariable.Value, DataAnalysisProblemData.InputVariables.CheckedItems.Select(x => x.Value.Value), SamplesStart.Value, SamplesEnd.Value);
     94      double rmsError, cvRmsError;
     95      SymbolicExpressionTree = CreateSymbolicExpressionTree(DataAnalysisProblemData.Dataset, DataAnalysisProblemData.TargetVariable.Value, DataAnalysisProblemData.InputVariables.CheckedItems.Select(x => x.Value.Value), SamplesStart.Value, SamplesEnd.Value, out rmsError, out cvRmsError);
    9596      return base.Apply();
    9697    }
    9798
    98     public static SymbolicExpressionTree CreateSymbolicExpressionTree(Dataset dataset, string targetVariable, IEnumerable<string> allowedInputVariables, int start, int end) {
     99    public static SymbolicExpressionTree CreateSymbolicExpressionTree(Dataset dataset, string targetVariable, IEnumerable<string> allowedInputVariables, int start, int end, out double rmsError, out double cvRmsError) {
    99100      double[,] inputMatrix = LinearRegressionUtil.PrepareInputMatrix(dataset, targetVariable, allowedInputVariables, start, end);
    100101
    … …  
    108109      alglib.linreg.lrbuild(ref inputMatrix, nRows, nFeatures, ref retVal, ref lm, ref ar);
    109110      if (retVal != 1) throw new ArgumentException("Error in calculation of linear regression model");
     111      rmsError = ar.rmserror;
     112      cvRmsError = ar.cvrmserror;
    110113
    111114      for (int i = 0; i < nFeatures + 1; i++)

  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Tests/HeuristicLab.Problems.DataAnalysis.Tests-3.3.csproj

    r4065 r4082  
    5353    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5454  </PropertyGroup>
     55  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     56    <DebugSymbols>true</DebugSymbols>
     57    <OutputPath>bin\x64\Debug\</OutputPath>
     58    <DefineConstants>DEBUG;TRACE</DefineConstants>
     59    <DebugType>full</DebugType>
     60    <PlatformTarget>x64</PlatformTarget>
     61    <ErrorReport>prompt</ErrorReport>
     62  </PropertyGroup>
     63  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     64    <OutputPath>bin\x64\Release\</OutputPath>
     65    <DefineConstants>TRACE</DefineConstants>
     66    <Optimize>true</Optimize>
     67    <DebugType>pdbonly</DebugType>
     68    <PlatformTarget>x64</PlatformTarget>
     69    <ErrorReport>prompt</ErrorReport>
     70  </PropertyGroup>
    5571  <ItemGroup>
    5672    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    … …  
    6177  </ItemGroup>
    6278  <ItemGroup>
     79    <Compile Include="LinearScalingTest.cs" />
    6380    <Compile Include="Properties\AssemblyInfo.cs" />
    6481    <Compile Include="SimpleArithmeticExpressionInterpreterTest.cs" />
    … …  
    95112      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    96113      <Name>HeuristicLab.Optimization-3.3</Name>
     114    </ProjectReference>
     115    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
     116      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
     117      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
    97118    </ProjectReference>
    98119    <ProjectReference Include="..\..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">

  • trunk/sources/HeuristicLab/3.3/Files.txt

    r4079 r4082  
    4747HeuristicLab.Problems.ArtificialAnt.Views\3.3:HeuristicLab.Problems.ArtificialAnt.Views-3.3.dll
    4848HeuristicLab.Problems.DataAnalysis\3.3:HeuristicLab.Problems.DataAnalysis-3.3.dll
     49HeuristicLab.Problems.DataAnalysis.FeatureSelection\3.3:HeuristicLab.Problems.DataAnalysis.FeatureSelection-3.3.dll
    4950HeuristicLab.Problems.DataAnalysis.MultiVariate\3.3:HeuristicLab.Problems.DataAnalysis.MultiVariate-3.3.dll
    5051HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression\3.3:HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression-3.3.dll
Note: See TracChangeset for help on using the changeset viewer.