Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/02/12 18:25:00 (13 years ago)
Author:
gkronber
Message:

#1423 moved LM-BFGS implementation from data-analysis into the gradient descent algorithm plugin.

Location:
trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3
Files:
2 deleted
3 edited
7 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3

    • Property svn:ignore

      •  

        old new  
        22obj
        33Plugin.cs
         4*.user

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/HeuristicLab.Algorithms.GradientDescent.csproj

    r5520 r8401  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>bin\Debug\</OutputPath>
     20    <OutputPath>..\..\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    2626    <DebugType>pdbonly</DebugType>
    2727    <Optimize>true</Optimize>
    28     <OutputPath>bin\Release\</OutputPath>
     28    <OutputPath>..\..\bin\</OutputPath>
    2929    <DefineConstants>TRACE</DefineConstants>
    3030    <ErrorReport>prompt</ErrorReport>
    … …  
    3939  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4040    <DebugSymbols>true</DebugSymbols>
    41     <OutputPath>bin\x86\Debug\</OutputPath>
     41    <OutputPath>..\..\bin\</OutputPath>
    4242    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4343    <DebugType>full</DebugType>
    … …  
    5454  </PropertyGroup>
    5555  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    56     <OutputPath>bin\x86\Release\</OutputPath>
     56    <OutputPath>..\..\bin\</OutputPath>
    5757    <DefineConstants>TRACE</DefineConstants>
    5858    <Optimize>true</Optimize>
    … …  
    7070  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    7171    <DebugSymbols>true</DebugSymbols>
    72     <OutputPath>bin\x64\Debug\</OutputPath>
     72    <OutputPath>..\..\bin\</OutputPath>
    7373    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7474    <DebugType>full</DebugType>
    … …  
    8585  </PropertyGroup>
    8686  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    87     <OutputPath>bin\x64\Release\</OutputPath>
     87    <OutputPath>..\..\bin\</OutputPath>
    8888    <DefineConstants>TRACE</DefineConstants>
    8989    <Optimize>true</Optimize>
    … …  
    102102  </PropertyGroup>
    103103  <ItemGroup>
    104     <Reference Include="ALGLIB-3.1.0">
    105       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
    106     </Reference>
    107     <Reference Include="HeuristicLab.ALGLIB-3.1.0">
    108       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Analysis-3.3">
    111       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Collections-3.3">
    114       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Common-3.3">
    117       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Core-3.3">
    120       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    121     </Reference>
    122     <Reference Include="HeuristicLab.Data-3.3">
    123       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
    126       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    127     </Reference>
    128     <Reference Include="HeuristicLab.Operators-3.3">
    129       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
    130     </Reference>
    131     <Reference Include="HeuristicLab.Optimization-3.3">
    132       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    133     </Reference>
    134     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
    135       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    136     </Reference>
    137     <Reference Include="HeuristicLab.Parameters-3.3">
    138       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
    139     </Reference>
    140     <Reference Include="HeuristicLab.Persistence-3.3">
    141       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    142     </Reference>
    143     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    144       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    145     </Reference>
    146     <Reference Include="HeuristicLab.Problems.TestFunctions-3.3">
    147       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.TestFunctions-3.3.dll</HintPath>
    148     </Reference>
    149     <Reference Include="HeuristicLab.Random-3.3">
    150       <HintPath>..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
     104    <Reference Include="ALGLIB-3.5.0, Version=3.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     105      <Private>False</Private>
    151106    </Reference>
    152107    <Reference Include="System" />
    153108    <Reference Include="System.Core" />
    154     <Reference Include="System.Data" />
    155109  </ItemGroup>
    156110  <ItemGroup>
    157111    <None Include="Plugin.cs.frame" />
    158     <Compile Include="LevenbergMarquardt.cs" />
    159     <Compile Include="LevenbergMarquardtMove.cs" />
     112    <Compile Include="Lbfgs.cs" />
     113    <Compile Include="LbfgsAnalyzer.cs" />
     114    <Compile Include="LbfgsInitializer.cs" />
     115    <Compile Include="LbfgsMakeStep.cs" />
     116    <Compile Include="LbfgsState.cs" />
     117    <Compile Include="LbfgsUpdateResults.cs" />
    160118    <Compile Include="Plugin.cs" />
    161119    <Compile Include="Properties\AssemblyInfo.cs" />
    162     <None Include="Properties\AssemblyInfo.frame" />
     120    <None Include="Properties\AssemblyInfo.cs.frame" />
    163121  </ItemGroup>
    164122  <ItemGroup>
    165123    <None Include="HeuristicLab.snk" />
     124  </ItemGroup>
     125  <ItemGroup>
     126    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     127      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     128      <Name>HeuristicLab.Analysis-3.3</Name>
     129      <Private>False</Private>
     130    </ProjectReference>
     131    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     132      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     133      <Name>HeuristicLab.Collections-3.3</Name>
     134      <Private>False</Private>
     135    </ProjectReference>
     136    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     137      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     138      <Name>HeuristicLab.Common-3.3</Name>
     139      <Private>False</Private>
     140    </ProjectReference>
     141    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     142      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     143      <Name>HeuristicLab.Core-3.3</Name>
     144      <Private>False</Private>
     145    </ProjectReference>
     146    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     147      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     148      <Name>HeuristicLab.Data-3.3</Name>
     149      <Private>False</Private>
     150    </ProjectReference>
     151    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     152      <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
     153      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     154      <Private>False</Private>
     155    </ProjectReference>
     156    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     157      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     158      <Name>HeuristicLab.Operators-3.3</Name>
     159      <Private>False</Private>
     160    </ProjectReference>
     161    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     162      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     163      <Name>HeuristicLab.Optimization-3.3</Name>
     164      <Private>False</Private>
     165    </ProjectReference>
     166    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     167      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     168      <Name>HeuristicLab.Parameters-3.3</Name>
     169      <Private>False</Private>
     170    </ProjectReference>
     171    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     172      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     173      <Name>HeuristicLab.Persistence-3.3</Name>
     174      <Private>False</Private>
     175    </ProjectReference>
     176    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     177      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     178      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     179      <Private>False</Private>
     180    </ProjectReference>
     181    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj">
     182      <Project>{88B9B0E3-344E-4196-82A3-0F9732506FE8}</Project>
     183      <Name>HeuristicLab.Problems.TestFunctions-3.3</Name>
     184      <Private>False</Private>
     185    </ProjectReference>
     186    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     187      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     188      <Name>HeuristicLab.Random-3.3</Name>
     189      <Private>False</Private>
     190    </ProjectReference>
    166191  </ItemGroup>
    167192  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    173198
    174199call PreBuildEvent.cmd
    175 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Plugin.cs.frame" "%25ProjectDir%25\Plugin.cs"</PreBuildEvent>
     200</PreBuildEvent>
    176201  </PropertyGroup>
    177202  <PropertyGroup>

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/Lbfgs.cs

    r8398 r8401  
    2222
    2323using System;
    24 using System.Collections.Generic;
    25 using System.Linq;
    26 using HeuristicLab.Analysis;
    2724using HeuristicLab.Common;
    2825using HeuristicLab.Core;
    2926using HeuristicLab.Data;
    30 using HeuristicLab.Encodings.RealVectorEncoding;
    3127using HeuristicLab.Operators;
    3228using HeuristicLab.Optimization;
    3329using HeuristicLab.Parameters;
    3430using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    35 using HeuristicLab.PluginInfrastructure;
    36 using HeuristicLab.Problems.DataAnalysis;
    3731using HeuristicLab.Problems.TestFunctions;
    3832using HeuristicLab.Random;
    3933
    40 namespace HeuristicLab.Algorithms.DataAnalysis {
     34namespace HeuristicLab.Algorithms.GradientDescent {
    4135  /// <summary>
    4236  /// Limited-Memory BFGS optimization algorithm.

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsAnalyzer.cs

    r8398 r8401  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.RealVectorEncoding;
    28 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2928using HeuristicLab.Operators;
    3029using HeuristicLab.Optimization;
    3130using HeuristicLab.Parameters;
    3231using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    33 using HeuristicLab.Problems.DataAnalysis;
    3432
    35 namespace HeuristicLab.Algorithms.DataAnalysis {
     33namespace HeuristicLab.Algorithms.GradientDescent {
    3634  [StorableClass]
    3735  [Item(Name = "LBFGS Analyzer", Description = "Analyzer to collect results for the LM-BFGS algorithm.")]

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsInitializer.cs

    r8398 r8401  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.RealVectorEncoding;
    28 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2928using HeuristicLab.Operators;
    3029using HeuristicLab.Parameters;
    3130using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    32 using HeuristicLab.Problems.DataAnalysis;
    3331
    34 namespace HeuristicLab.Algorithms.DataAnalysis {
     32namespace HeuristicLab.Algorithms.GradientDescent {
    3533  [StorableClass]
    3634  [Item(Name = "LBFGS Initializer", Description = "Initializes the necessary data structures for the LM-BFGS algorithm.")]

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsMakeStep.cs

    r8398 r8401  
    2020#endregion
    2121
    22 using System.Linq;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Core;
    2524using HeuristicLab.Data;
    2625using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2826using HeuristicLab.Operators;
    2927using HeuristicLab.Parameters;
    3028using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    31 using HeuristicLab.Problems.DataAnalysis;
    3229
    33 namespace HeuristicLab.Algorithms.DataAnalysis {
     30namespace HeuristicLab.Algorithms.GradientDescent {
    3431  [StorableClass]
    3532  [Item(Name = "LBFGS MakeStep", Description = "Makes a step in the LM-BFGS optimization algorithm.")]

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsState.cs

    r8398 r8401  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Data;
    28 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    29 using HeuristicLab.Operators;
    30 using HeuristicLab.Parameters;
    3127using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    32 using HeuristicLab.Problems.DataAnalysis;
    33 
    34 namespace HeuristicLab.Algorithms.DataAnalysis {
     28
     29namespace HeuristicLab.Algorithms.GradientDescent {
    3530  [StorableClass]
    3631  [Item("LbfgsState", "Internal state for the limited-memory BFGS optimization algorithm.")]

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/LbfgsUpdateResults.cs

    r8398 r8401  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2827using HeuristicLab.Operators;
    2928using HeuristicLab.Parameters;
    3029using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    31 using HeuristicLab.Problems.DataAnalysis;
    3230
    33 namespace HeuristicLab.Algorithms.DataAnalysis {
     31namespace HeuristicLab.Algorithms.GradientDescent {
    3432  [StorableClass]
    3533  [Item(Name = "LBFGS UpdateResults", Description = "Sets the results (function value and gradients) for the next optimization step in the LM-BFGS algorithm.")]

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/Plugin.cs.frame

    r5516 r8401  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525  [Plugin("HeuristicLab.Algorithms.GradientDescent", "3.3.0.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Algorithms.GradientDescent-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.ALGLIB", "3.5.0")]
     28  [PluginDependency("HeuristicLab.Analysis", "3.3.0")]
     29  [PluginDependency("HeuristicLab.Collections", "3.3")]
     30  [PluginDependency("HeuristicLab.Common", "3.3")]
     31  [PluginDependency("HeuristicLab.Core", "3.3")]
     32  [PluginDependency("HeuristicLab.Data", "3.3")]
     33  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
     34  [PluginDependency("HeuristicLab.Operators", "3.3")]
     35  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     36  [PluginDependency("HeuristicLab.Parameters", "3.3")]
     37  [PluginDependency("HeuristicLab.Persistence", "3.3")]
     38  [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
     39  [PluginDependency("HeuristicLab.Random", "3.3")]
    2740  public class HeuristicLabAlgorithmsGradientDescentPlugin : PluginBase {
    2841  }

  • trunk/sources/HeuristicLab.Algorithms.GradientDescent/3.3/Properties/AssemblyInfo.cs.frame

    r8398 r8401  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828// associated with an assembly.
    2929[assembly: AssemblyTitle("HeuristicLab.Algorithms.GradientDescent")]
    30 [assembly: AssemblyDescription("")]
     30[assembly: AssemblyDescription("Provides gradient descent optimization algorithms for HeuristicLab")]
    3131[assembly: AssemblyConfiguration("")]
    3232[assembly: AssemblyCompany("HEAL")]
    3333[assembly: AssemblyProduct("HeuristicLab")]
    34 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     34[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3535[assembly: AssemblyTrademark("")]
    3636[assembly: AssemblyCulture("")]
    … …  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.3.0.0")]
    57 [assembly: AssemblyFileVersion("3.3.0.$WCREV$")]
     57[assembly: AssemblyFileVersion("3.3.3.$WCREV$")]
Note: See TracChangeset for help on using the changeset viewer.