Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4056


Ignore:
Timestamp:
07/20/10 21:46:03 (14 years ago)
Author:
gkronber
Message:

Added new plugins for multi-variate regression. #1089

Location:
trunk/sources
Files:
44 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r4012 r4056  
    5959    {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B} = {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}
    6060    {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
     61    {6024D74F-E29C-4E6B-843E-8851831B8E14} = {6024D74F-E29C-4E6B-843E-8851831B8E14}
    6162    {3EAF1454-086D-44A2-8509-B1BA24DB1865} = {3EAF1454-086D-44A2-8509-B1BA24DB1865}
    6263    {2C429157-9C34-4DD3-9D5F-B444B751E39A} = {2C429157-9C34-4DD3-9D5F-B444B751E39A}
    … …  
    9798    {66D249C3-A01D-42A8-82A2-919BC8EC3D83} = {66D249C3-A01D-42A8-82A2-919BC8EC3D83}
    9899    {236459CE-80CF-4991-972F-DE74C826BCCC} = {236459CE-80CF-4991-972F-DE74C826BCCC}
     100    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515} = {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}
    99101    {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B} = {102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}
    100102    {13CA37D6-4111-4E7B-BE2E-AF3DE462D384} = {13CA37D6-4111-4E7B-BE2E-AF3DE462D384}
    … …  
    312314EndProject
    313315Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.NSGA2-3.3", "HeuristicLab.Algorithms.NSGA2\3.3\HeuristicLab.Algorithms.NSGA2-3.3.csproj", "{15452B9F-A436-4139-8EE7-DA72FB8D3664}"
     316EndProject
     317Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.MultiVariate-3.3", "HeuristicLab.Problems.DataAnalysis.MultiVariate\3.3\HeuristicLab.Problems.DataAnalysis.MultiVariate-3.3.csproj", "{2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}"
     318EndProject
     319Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression-3.3", "HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression\3.3\HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression-3.3.csproj", "{6024D74F-E29C-4E6B-843E-8851831B8E14}"
    314320EndProject
    315321Global
    … …  
    20952101    {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Silverlight2|x64.ActiveCfg = Release|Any CPU
    20962102    {15452B9F-A436-4139-8EE7-DA72FB8D3664}.Silverlight2|x86.ActiveCfg = Release|Any CPU
     2103    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2104    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2105    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|x64.ActiveCfg = Debug|x64
     2106    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|x64.Build.0 = Debug|x64
     2107    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|x86.ActiveCfg = Debug|x86
     2108    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Debug|x86.Build.0 = Debug|x86
     2109    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2110    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Release|Any CPU.Build.0 = Release|Any CPU
     2111    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Release|x64.ActiveCfg = Release|x64
     2112    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Release|x64.Build.0 = Release|x64
     2113    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Release|x86.ActiveCfg = Release|x86
     2114    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Release|x86.Build.0 = Release|x86
     2115    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Services|Any CPU.ActiveCfg = Release|x86
     2116    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Services|x64.ActiveCfg = Release|x86
     2117    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Services|x86.ActiveCfg = Release|x86
     2118    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Services|x86.Build.0 = Release|x86
     2119    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Silverlight2|Any CPU.ActiveCfg = Release|x86
     2120    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Silverlight2|x64.ActiveCfg = Release|x86
     2121    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Silverlight2|x86.ActiveCfg = Release|x86
     2122    {2B88DCD0-EE28-4DCA-90A8-2F4ECACFC515}.Silverlight2|x86.Build.0 = Release|x86
     2123    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2124    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2125    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Debug|x64.ActiveCfg = Debug|x64
     2126    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Debug|x64.Build.0 = Debug|x64
     2127    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Debug|x86.ActiveCfg = Debug|x86
     2128    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Debug|x86.Build.0 = Debug|x86
     2129    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2130    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Release|Any CPU.Build.0 = Release|Any CPU
     2131    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Release|x64.ActiveCfg = Release|x64
     2132    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Release|x64.Build.0 = Release|x64
     2133    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Release|x86.ActiveCfg = Release|x86
     2134    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Release|x86.Build.0 = Release|x86
     2135    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Services|Any CPU.ActiveCfg = Release|x86
     2136    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Services|x64.ActiveCfg = Release|x86
     2137    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Services|x86.ActiveCfg = Release|x86
     2138    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Services|x86.Build.0 = Release|x86
     2139    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Silverlight2|Any CPU.ActiveCfg = Release|x86
     2140    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Silverlight2|x64.ActiveCfg = Release|x86
     2141    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Silverlight2|x86.ActiveCfg = Release|x86
     2142    {6024D74F-E29C-4E6B-843E-8851831B8E14}.Silverlight2|x86.Build.0 = Release|x86
    20972143  EndGlobalSection
    20982144  GlobalSection(SolutionProperties) = preSolution

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

    r4044 r4056  
    9090    <Compile Include="LinearRegression\LinearRegressionSolutionCreator.cs" />
    9191    <Compile Include="LinearRegression\LinearRegressionUtil.cs" />
     92    <Compile Include="RandomEnumerable.cs" />
    9293    <Compile Include="Properties\AssemblyInfo.cs" />
    9394    <Compile Include="SupportVectorRegression\BestSupportVectorRegressionSolutionAnalyzer.cs" />

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionEvaluator.cs

    r4038 r4056  
    141141
    142142
    143     //algorithm taken from progamming pearls page 127
    144     //IMPORTANT because IEnumerables with yield are used the seed must best be specified to return always
    145     //the same sequence of numbers without caching the values.
    146143    private static IEnumerable<int> GenerateRowsToEvaluate(uint seed, double relativeAmount, int start, int end) {
    147144      if (end < start) throw new ArgumentException("Start value is larger than end value.");
    148145      int count = (int)((end - start) * relativeAmount);
    149146      if (count == 0) count = 1;
    150 
    151       int remaining = end - start;
    152       MersenneTwister random = new MersenneTwister(seed);
    153       for (int i = start; i < end && count > 0; i++) {
    154         double probabilty = random.NextDouble();
    155         if (probabilty < ((double)count) / remaining) {
    156           count--;
    157           yield return i;
    158         }
    159         remaining--;
    160       }
     147      return RandomEnumerable.SampleRandomNumbers(seed, start, end, count);
    161148    }
    162149

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

    r4012 r4056  
    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.MultiVariate\3.3:HeuristicLab.Problems.DataAnalysis.MultiVariate-3.3.dll
     50HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression\3.3:HeuristicLab.Problems.DataAnalysis.MultiVariate.Regression-3.3.dll
    4951HeuristicLab.Problems.DataAnalysis.Regression\3.3:HeuristicLab.Problems.DataAnalysis.Regression-3.3.dll
    5052HeuristicLab.Problems.DataAnalysis.Views\3.3:HeuristicLab.Problems.DataAnalysis.Views-3.3.dll
Note: See TracChangeset for help on using the changeset viewer.