Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3103


Ignore:
Timestamp:
03/18/10 22:54:50 (14 years ago)
Author:
abeham
Message:

Renamed Algorithms.LS to Algorithms.LocalSearch #921

Location:
trunk/sources
Files:
4 deleted
3 edited
4 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r3100 r3103  
    203203Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Knapsack.Views-3.3", "HeuristicLab.Problems.Knapsack.Views\3.3\HeuristicLab.Problems.Knapsack.Views-3.3.csproj", "{A9EE65D9-405B-4C9C-B470-FC911AAC541B}"
    204204EndProject
    205 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.LS-3.3", "HeuristicLab.Algorithms.LS\3.3\HeuristicLab.Algorithms.LS-3.3.csproj", "{4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}"
    206 EndProject
    207205Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.SimulatedAnnealing-3.3", "HeuristicLab.Algorithms.SimulatedAnnealing\3.3\HeuristicLab.Algorithms.SimulatedAnnealing-3.3.csproj", "{96E5ED5B-187D-4012-9CDA-D85CDAD38342}"
    208206EndProject
    … …  
    214212EndProject
    215213Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.TabuSearch-3.3", "HeuristicLab.Algorithms.TabuSearch\3.3\HeuristicLab.Algorithms.TabuSearch-3.3.csproj", "{D58A232D-04BA-4186-B73E-0EC86FD31ABE}"
     214EndProject
     215Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.LocalSearch-3.3", "HeuristicLab.Algorithms.LocalSearch\3.3\HeuristicLab.Algorithms.LocalSearch-3.3.csproj", "{4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}"
    216216EndProject
    217217Global
    … …  
    11671167    {A9EE65D9-405B-4C9C-B470-FC911AAC541B}.Services|x64.ActiveCfg = Release|x64
    11681168    {A9EE65D9-405B-4C9C-B470-FC911AAC541B}.Services|x86.ActiveCfg = Release|x86
    1169     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1170     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1171     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x64.ActiveCfg = Debug|x64
    1172     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x64.Build.0 = Debug|x64
    1173     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x86.ActiveCfg = Debug|x86
    1174     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x86.Build.0 = Debug|x86
    1175     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1176     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|Any CPU.Build.0 = Release|Any CPU
    1177     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x64.ActiveCfg = Release|x64
    1178     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x64.Build.0 = Release|x64
    1179     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x86.ActiveCfg = Release|x86
    1180     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x86.Build.0 = Release|x86
    1181     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|Any CPU.ActiveCfg = Release|Any CPU
    1182     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|Any CPU.Build.0 = Release|Any CPU
    1183     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|x64.ActiveCfg = Release|x64
    1184     {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|x86.ActiveCfg = Release|x86
    11851169    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    11861170    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    12541238    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|x86.ActiveCfg = Release|x86
    12551239    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|x86.Build.0 = Release|x86
     1240    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1241    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1242    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x64.ActiveCfg = Debug|x64
     1243    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x64.Build.0 = Debug|x64
     1244    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x86.ActiveCfg = Debug|x86
     1245    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Debug|x86.Build.0 = Debug|x86
     1246    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1247    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|Any CPU.Build.0 = Release|Any CPU
     1248    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x64.ActiveCfg = Release|x64
     1249    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x64.Build.0 = Release|x64
     1250    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x86.ActiveCfg = Release|x86
     1251    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Release|x86.Build.0 = Release|x86
     1252    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|Any CPU.ActiveCfg = Release|x86
     1253    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|x64.ActiveCfg = Release|x86
     1254    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|x86.ActiveCfg = Release|x86
     1255    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|x86.Build.0 = Release|x86
    12561256  EndGlobalSection
    12571257  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab 3.3/Files.txt

    r3100 r3103  
    77HeuristicLab.Algorithms.SGA.Views\3.3:HeuristicLab.Algorithms.SGA.Views-3.3.dll
    88HeuristicLab.Algorithms.TabuSearch\3.3:HeuristicLab.Algorithms.TabuSearch-3.3.dll
    9 HeuristicLab.Algorithms.LS\3.3:HeuristicLab.Algorithms.LS-3.3.dll
     9HeuristicLab.Algorithms.LocalSearch\3.3:HeuristicLab.Algorithms.LocalSearch-3.3.dll
    1010HeuristicLab.Algorithms.SimulatedAnnealing\3.3:HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll
    1111HeuristicLab.Analysis\3.3:HeuristicLab.Analysis-3.3.dll

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

    • Property svn:ignore

      •  

        old new  
        22bin
        33obj
        4 HeuristicLabAlgorithmsLSPlugin.cs
         4HeuristicLabAlgorithmsLocalSearchPlugin.cs

  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLab.Algorithms.LocalSearch-3.3.csproj

    r3097 r3103  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Algorithms.LS</RootNamespace>
    12     <AssemblyName>HeuristicLab.Algorithms.LS-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Algorithms.LocalSearch</RootNamespace>
     12    <AssemblyName>HeuristicLab.Algorithms.LocalSearch-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    8080  </ItemGroup>
    8181  <ItemGroup>
    82     <Compile Include="HeuristicLabAlgorithmsLSPlugin.cs" />
    83     <Compile Include="LSMainLoop.cs" />
     82    <Compile Include="HeuristicLabAlgorithmsLocalSearchPlugin.cs" />
     83    <Compile Include="LocalSearchMainLoop.cs" />
    8484    <Compile Include="Properties\AssemblyInfo.cs" />
    85     <Compile Include="LS.cs" />
     85    <Compile Include="LocalSearch.cs" />
    8686  </ItemGroup>
    8787  <ItemGroup>
    8888    <None Include="HeuristicLab.snk" />
    89     <None Include="HeuristicLabAlgorithmsLSPlugin.cs.frame" />
     89    <None Include="HeuristicLabAlgorithmsLocalSearchPlugin.cs.frame" />
    9090    <None Include="Properties\AssemblyInfo.frame" />
    9191  </ItemGroup>
    … …  
    155155
    156156call PreBuildEvent.cmd
    157 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsLSPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsLSPlugin.cs"</PreBuildEvent>
     157SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsLocalSearchPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsLocalSearchPlugin.cs"</PreBuildEvent>
    158158  </PropertyGroup>
    159159</Project>

  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLabAlgorithmsLocalSearchPlugin.cs.frame

    r3097 r3103  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Algorithms.LS {
     24namespace HeuristicLab.Algorithms.LocalSearch {
    2525  /// <summary>
    26   /// Plugin class for HeuristicLab.Algorithms.LS plugin.
     26  /// Plugin class for HeuristicLab.Algorithms.LocalSearch plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Algorithms.LS", "3.3.0.$WCREV$")]
    29   [PluginFile("HeuristicLab.Algorithms.LS-3.3.dll", PluginFileType.Assembly)]
     28  [Plugin("HeuristicLab.Algorithms.LocalSearch", "3.3.0.$WCREV$")]
     29  [PluginFile("HeuristicLab.Algorithms.LocalSearch-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    3131  [PluginDependency("HeuristicLab.Collections", "3.3")]
    … …  
    3939  [PluginDependency("HeuristicLab.Random", "3.3")]
    4040  [PluginDependency("HeuristicLab.Selection", "3.3")]
    41   public class HeuristicLabAlgorithmsLSPlugin : PluginBase {
     41  public class HeuristicLabAlgorithmsLocalSearchPlugin : PluginBase {
    4242  }
    4343}

  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs

    r3097 r3103  
    3232using HeuristicLab.PluginInfrastructure;
    3333
    34 namespace HeuristicLab.Algorithms.LS {
    35   [Item("LS", "A local search algorithm.")]
     34namespace HeuristicLab.Algorithms.LocalSearch {
     35  [Item("LocalSearch", "A local search algorithm.")]
    3636  [Creatable("Algorithms")]
    37   public sealed class LS : EngineAlgorithm {
     37  public sealed class LocalSearch : EngineAlgorithm {
    3838    #region Problem Properties
    3939    public override Type ProblemType {
    … …  
    9898      get { return (SolutionsCreator)RandomCreator.Successor; }
    9999    }
    100     private LSMainLoop LSMainLoop {
    101       get { return (LSMainLoop)SolutionsCreator.Successor; }
    102     }
    103     #endregion
    104 
    105     public LS()
     100    private LocalSearchMainLoop MainLoop {
     101      get { return (LocalSearchMainLoop)SolutionsCreator.Successor; }
     102    }
     103    #endregion
     104
     105    public LocalSearch()
    106106      : base() {
    107107      Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
    … …  
    114114      RandomCreator randomCreator = new RandomCreator();
    115115      SolutionsCreator solutionsCreator = new SolutionsCreator();
    116       LSMainLoop lsMainLoop = new LSMainLoop();
     116      LocalSearchMainLoop lsMainLoop = new LocalSearchMainLoop();
    117117      OperatorGraph.InitialOperator = randomCreator;
    118118
    … …  
    138138
    139139    [StorableConstructor]
    140     private LS(bool deserializing) : base() { }
     140    private LocalSearch(bool deserializing) : base() { }
    141141
    142142    public override IDeepCloneable Clone(Cloner cloner) {
    143       LS clone = (LS)base.Clone(cloner);
     143      LocalSearch clone = (LocalSearch)base.Clone(cloner);
    144144      clone.Initialize();
    145145      return clone;
    … …  
    272272    }
    273273    private void ParameterizeLSMainLoop() {
    274       LSMainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
    275       LSMainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     274      MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     275      MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
    276276      if (MoveEvaluator != null)
    277         LSMainLoop.MoveQualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
     277        MainLoop.MoveQualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
    278278    }
    279279    private void ParameterizeStochasticOperator(IOperator op) {

  • trunk/sources/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

    r3097 r3103  
    2929using HeuristicLab.Selection;
    3030
    31 namespace HeuristicLab.Algorithms.LS {
     31namespace HeuristicLab.Algorithms.LocalSearch {
    3232  /// <summary>
    33   /// An operator which represents a tabu search.
     33  /// An operator which represents a local search.
    3434  /// </summary>
    35   [Item("LSMainLoop", "An operator which represents the main loop of a best improvement local search.")]
     35  [Item("LocalSearchMainLoop", "An operator which represents the main loop of a best improvement local search (if only a single move is generated in each iteration it is a first improvement local search).")]
    3636  [StorableClass]
    37   public class LSMainLoop : AlgorithmOperator {
     37  public class LocalSearchMainLoop : AlgorithmOperator {
    3838    #region Parameter properties
    3939    public ValueLookupParameter<IRandom> RandomParameter {
    … …  
    7373    #endregion
    7474
    75     public LSMainLoop()
     75    public LocalSearchMainLoop()
    7676      : base() {
    7777      #region Create parameters
Note: See TracChangeset for help on using the changeset viewer.