Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3100


Ignore:
Timestamp:
03/18/10 15:10:55 (15 years ago)
Author:
abeham
Message:

Renamed TS to TabuSearch #840

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

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r3093 r3100  
    177177Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Persistence-3.3.Tests", "HeuristicLab.Persistence\3.3\Tests\HeuristicLab.Persistence-3.3.Tests.csproj", "{BF7D9494-A586-457B-8DF9-ED599F9E6A71}"
    178178EndProject
    179 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.TS-3.3", "HeuristicLab.Algorithms.TS\3.3\HeuristicLab.Algorithms.TS-3.3.csproj", "{D58A232D-04BA-4186-B73E-0EC86FD31ABE}"
    180 EndProject
    181179Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization.Operators-3.3", "HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj", "{25087811-F74C-4128-BC86-8324271DA13E}"
    182180EndProject
    … …  
    214212EndProject
    215213Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Services.Deployment.DataAccess-3.3", "HeuristicLab.Services.Deployment.DataAccess\3.3\HeuristicLab.Services.Deployment.DataAccess-3.3.csproj", "{EBEBA863-DD05-4331-BE25-5758B15F7407}"
     214EndProject
     215Project("{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}"
    216216EndProject
    217217Global
    … …  
    959959    {BF7D9494-A586-457B-8DF9-ED599F9E6A71}.Services|x64.ActiveCfg = Release|x64
    960960    {BF7D9494-A586-457B-8DF9-ED599F9E6A71}.Services|x86.ActiveCfg = Release|x86
    961     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    962     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU
    963     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x64.ActiveCfg = Debug|x64
    964     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x64.Build.0 = Debug|x64
    965     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x86.ActiveCfg = Debug|x86
    966     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x86.Build.0 = Debug|x86
    967     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU
    968     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|Any CPU.Build.0 = Release|Any CPU
    969     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x64.ActiveCfg = Release|x64
    970     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x64.Build.0 = Release|x64
    971     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x86.ActiveCfg = Release|x86
    972     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x86.Build.0 = Release|x86
    973     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|Any CPU.ActiveCfg = Release|Any CPU
    974     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|Any CPU.Build.0 = Release|Any CPU
    975     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|x64.ActiveCfg = Release|x64
    976     {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|x86.ActiveCfg = Release|x86
    977961    {25087811-F74C-4128-BC86-8324271DA13E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    978962    {25087811-F74C-4128-BC86-8324271DA13E}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    11991183    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|x64.ActiveCfg = Release|x64
    12001184    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}.Services|x86.ActiveCfg = Release|x86
     1185    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1186    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1187    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x64.ActiveCfg = Debug|x64
     1188    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x64.Build.0 = Debug|x64
     1189    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x86.ActiveCfg = Debug|x86
     1190    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x86.Build.0 = Debug|x86
     1191    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1192    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|Any CPU.Build.0 = Release|Any CPU
     1193    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x64.ActiveCfg = Release|x64
     1194    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x64.Build.0 = Release|x64
     1195    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x86.ActiveCfg = Release|x86
     1196    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x86.Build.0 = Release|x86
     1197    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Services|Any CPU.ActiveCfg = Release|x86
     1198    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Services|x64.ActiveCfg = Release|x86
     1199    {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Services|x86.ActiveCfg = Release|x86
    12011200    {C458C60D-33CE-42B8-8B7A-651B698A3C96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    12021201    {C458C60D-33CE-42B8-8B7A-651B698A3C96}.Debug|Any CPU.Build.0 = Debug|Any CPU
    … …  
    12391238    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Services|x86.ActiveCfg = Release|x86
    12401239    {EBEBA863-DD05-4331-BE25-5758B15F7407}.Services|x86.Build.0 = Release|x86
    1241     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1242     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1243     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x64.ActiveCfg = Debug|x64
    1244     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x64.Build.0 = Debug|x64
    1245     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x86.ActiveCfg = Debug|x86
    1246     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Debug|x86.Build.0 = Debug|x86
    1247     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1248     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|Any CPU.Build.0 = Release|Any CPU
    1249     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x64.ActiveCfg = Release|x64
    1250     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x64.Build.0 = Release|x64
    1251     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x86.ActiveCfg = Release|x86
    1252     {96E5ED5B-187D-4012-9CDA-D85CDAD38342}.Release|x86.Build.0 = Release|x86
     1240    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1241    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1242    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x64.ActiveCfg = Debug|x64
     1243    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x64.Build.0 = Debug|x64
     1244    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x86.ActiveCfg = Debug|x86
     1245    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Debug|x86.Build.0 = Debug|x86
     1246    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1247    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|Any CPU.Build.0 = Release|Any CPU
     1248    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x64.ActiveCfg = Release|x64
     1249    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x64.Build.0 = Release|x64
     1250    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x86.ActiveCfg = Release|x86
     1251    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Release|x86.Build.0 = Release|x86
     1252    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|Any CPU.ActiveCfg = Release|x86
     1253    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|x64.ActiveCfg = Release|x86
     1254    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|x86.ActiveCfg = Release|x86
     1255    {D58A232D-04BA-4186-B73E-0EC86FD31ABE}.Services|x86.Build.0 = Release|x86
    12531256  EndGlobalSection
    12541257  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab 3.3/Files.txt

    r3094 r3100  
    66HeuristicLab.Algorithms.SGA\3.3:HeuristicLab.Algorithms.SGA-3.3.dll
    77HeuristicLab.Algorithms.SGA.Views\3.3:HeuristicLab.Algorithms.SGA.Views-3.3.dll
    8 HeuristicLab.Algorithms.TS\3.3:HeuristicLab.Algorithms.TS-3.3.dll
     8HeuristicLab.Algorithms.TabuSearch\3.3:HeuristicLab.Algorithms.TabuSearch-3.3.dll
    99HeuristicLab.Algorithms.LS\3.3:HeuristicLab.Algorithms.LS-3.3.dll
    1010HeuristicLab.Algorithms.SimulatedAnnealing\3.3:HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll

  • trunk/sources/HeuristicLab.Algorithms.SGA/3.3/Tests/HeuristicLab.Algorithms.SGA-3.3.Tests.csproj

    r3054 r3100  
    7878  </ItemGroup>
    7979  <ItemGroup>
    80     <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.TS\3.3\HeuristicLab.Algorithms.TS-3.3.csproj">
    81       <Project>{D58A232D-04BA-4186-B73E-0EC86FD31ABE}</Project>
    82       <Name>HeuristicLab.Algorithms.TS-3.3</Name>
    83     </ProjectReference>
    8480    <ProjectReference Include="..\..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    8581      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>

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

    r3097 r3100  
    99    <OutputType>Library</OutputType>
    1010    <AppDesignerFolder>Properties</AppDesignerFolder>
    11     <RootNamespace>HeuristicLab.Algorithms.TS</RootNamespace>
    12     <AssemblyName>HeuristicLab.Algorithms.TS-3.3</AssemblyName>
     11    <RootNamespace>HeuristicLab.Algorithms.TabuSearch</RootNamespace>
     12    <AssemblyName>HeuristicLab.Algorithms.TabuSearch-3.3</AssemblyName>
    1313    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    … …  
    8080  </ItemGroup>
    8181  <ItemGroup>
    82     <None Include="HeuristicLabAlgorithmsTSPlugin.cs.frame" />
    83     <Compile Include="HeuristicLabAlgorithmsTSPlugin.cs" />
     82    <None Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame" />
     83    <Compile Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs" />
    8484    <Compile Include="Properties\AssemblyInfo.cs" />
    8585    <Compile Include="TabuListCreator.cs">
    … …  
    8989      <SubType>Code</SubType>
    9090    </Compile>
    91     <Compile Include="TS.cs" />
    92     <Compile Include="TSMainLoop.cs">
     91    <Compile Include="TabuSearch.cs" />
     92    <Compile Include="TabuSearchMainLoop.cs">
    9393      <SubType>Code</SubType>
    9494    </Compile>
    … …  
    163163
    164164call PreBuildEvent.cmd
    165 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsTSPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsTSPlugin.cs"</PreBuildEvent>
     165SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsTabuSearchPlugin.cs"</PreBuildEvent>
    166166  </PropertyGroup>
    167167</Project>

  • trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame

    r3097 r3100  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Algorithms.TS {
     24namespace HeuristicLab.Algorithms.TabuSearch {
    2525  /// <summary>
    2626  /// Plugin class for HeuristicLab.Algorithms.TS plugin.
    … …  
    3636  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3737  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    38   //[PluginDependency("HeuristicLab.Random", "3.3")]
     38  [PluginDependency("HeuristicLab.Random", "3.3")]
    3939  [PluginDependency("HeuristicLab.Selection", "3.3")]
    4040  public class HeuristicLabAlgorithmsTSPlugin : PluginBase {

  • trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuListCreator.cs

    r3017 r3100  
    2828using HeuristicLab.Selection;
    2929
    30 namespace HeuristicLab.Algorithms.TS {
     30namespace HeuristicLab.Algorithms.TabuSearch {
    3131  [Item("TabuListCreator", "An operator that creates a new empty tabu list. It can also replace an existing tabu list with a new empty one.")]
    3232  [StorableClass]

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

    r3097 r3100  
    3232using HeuristicLab.PluginInfrastructure;
    3333
    34 namespace HeuristicLab.Algorithms.TS {
    35   [Item("TS", "A tabu search algorithm.")]
     34namespace HeuristicLab.Algorithms.TabuSearch {
     35  [Item("TabuSearch", "A tabu search algorithm.")]
    3636  [Creatable("Algorithms")]
    37   public sealed class TS : EngineAlgorithm {
     37  public sealed class TabuSearch : EngineAlgorithm {
    3838    #region Problem Properties
    3939    public override Type ProblemType {
    … …  
    119119      get { return (SolutionsCreator)RandomCreator.Successor; }
    120120    }
    121     private TSMainLoop TSMainLoop {
    122       get { return (TSMainLoop)SolutionsCreator.Successor; }
    123     }
    124     #endregion
    125 
    126     public TS()
     121    private TabuSearchMainLoop MainLoop {
     122      get { return (TabuSearchMainLoop)SolutionsCreator.Successor; }
     123    }
     124    #endregion
     125
     126    public TabuSearch()
    127127      : base() {
    128128      Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
    … …  
    138138      RandomCreator randomCreator = new RandomCreator();
    139139      SolutionsCreator solutionsCreator = new SolutionsCreator();
    140       TSMainLoop tsMainLoop = new TSMainLoop();
     140      TabuSearchMainLoop tsMainLoop = new TabuSearchMainLoop();
    141141      OperatorGraph.InitialOperator = randomCreator;
    142142
    … …  
    164164
    165165    [StorableConstructor]
    166     private TS(bool deserializing) : base() { }
     166    private TabuSearch(bool deserializing) : base() { }
    167167
    168168    public override IDeepCloneable Clone(Cloner cloner) {
    169       TS clone = (TS)base.Clone(cloner);
     169      TabuSearch clone = (TabuSearch)base.Clone(cloner);
    170170      clone.Initialize();
    171171      return clone;
    … …  
    314314    }
    315315    private void ParameterizeTSMainLoop() {
    316       TSMainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
    317       TSMainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     316      MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
     317      MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
    318318      if (MoveEvaluator != null)
    319         TSMainLoop.MoveQualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
     319        MainLoop.MoveQualityParameter.ActualName = MoveEvaluator.MoveQualityParameter.ActualName;
    320320    }
    321321    private void ParameterizeStochasticOperator(IOperator op) {

  • trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

    r3097 r3100  
    2828using HeuristicLab.Selection;
    2929
    30 namespace HeuristicLab.Algorithms.TS {
     30namespace HeuristicLab.Algorithms.TabuSearch {
    3131  /// <summary>
    3232  /// An operator which represents a tabu search.
    3333  /// </summary>
    34   [Item("TSMainLoop", "An operator which represents the main loop of a tabu search.")]
     34  [Item("TabuSearchMainLoop", "An operator which represents the main loop of a tabu search.")]
    3535  [StorableClass]
    36   public class TSMainLoop : AlgorithmOperator {
     36  public class TabuSearchMainLoop : AlgorithmOperator {
    3737    #region Parameter properties
    3838    public ValueLookupParameter<IRandom> RandomParameter {
    … …  
    8181    #endregion
    8282
    83     public TSMainLoop()
     83    public TabuSearchMainLoop()
    8484      : base() {
    8585      #region Create parameters

  • trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.cs

    r3048 r3100  
    2929using HeuristicLab.Selection;
    3030
    31 namespace HeuristicLab.Algorithms.TS {
     31namespace HeuristicLab.Algorithms.TabuSearch {
    3232  /// <summary>
    3333  /// The tabu selector is a selection operator that separates the best n moves that are either not tabu or satisfy the default aspiration criterion from the rest. It expects the move subscopes to be sorted.
Note: See TracChangeset for help on using the changeset viewer.