Free cookie consent management tool by TermsFeed Policy Generator

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

Renamed TS to TabuSearch #840

Location:
trunk/sources/HeuristicLab.Algorithms.TabuSearch
Files:
5 deleted
2 edited
4 copied
1 moved

Legend:

Unmodified
Added
Removed

  • 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.