Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3044


Ignore:
Timestamp:
03/15/10 18:00:07 (14 years ago)
Author:
abeham
Message:

updated tabu search #840

Location:
trunk/sources
Files:
18 added
8 deleted
7 edited

Legend:

Unmodified
Added
Removed

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

    r2997 r3044  
    8989      <SubType>Code</SubType>
    9090    </Compile>
    91     <Compile Include="TSOperator.cs">
     91    <Compile Include="TS.cs" />
     92    <Compile Include="TSMainLoop.cs">
    9293      <SubType>Code</SubType>
    9394    </Compile>
    … …  
    118119      <Name>HeuristicLab.Operators-3.3</Name>
    119120    </ProjectReference>
     121    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     122      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     123      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     124    </ProjectReference>
    120125    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    121126      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    … …  
    133138      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    134139      <Name>HeuristicLab.PluginInfrastructure</Name>
     140    </ProjectReference>
     141    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     142      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     143      <Name>HeuristicLab.Random-3.3</Name>
    135144    </ProjectReference>
    136145    <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">

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

    r3017 r3044  
    3636  /// For different aspiration criteria a new operator should be implemented.
    3737  /// </remarks>
    38   [Item("TabuSelector", "An operator that selects the best move that is either not tabu or satisfies the aspiration criterion. It expects the move subscopes to be sorted.")]
     38  [Item("TabuSelector", "An operator that selects the best move that is either not tabu or satisfies the aspiration criterion. It expects the move subscopes to be sorted by the qualities of the moves (the best move is first).")]
    3939  [StorableClass]
    4040  public class TabuSelector : Selector {
    … …  
    9090    /// Implements the tabu selection with the default aspiration criteria (choose a tabu move when it is better than the best so far).
    9191    /// </summary>
     92    /// <exception cref="InvalidOperationException">Thrown when the neighborhood contained too little moves which are not tabu.</exception>
    9293    /// <param name="scopes">The scopes from which to select.</param>
    9394    /// <returns>The selected scopes.</returns>

  • trunk/sources/HeuristicLab.Encodings.Permutation/3.3/HeuristicLab.Encodings.Permutation-3.3.csproj

    r2997 r3044  
    9696    <Compile Include="Interfaces\IPermutationCrossover.cs" />
    9797    <Compile Include="Interfaces\IPermutationManipulator.cs" />
    98     <Compile Include="Interfaces\IPermutationMoveGenerator.cs" />
     98    <Compile Include="Interfaces\IPermutationMoveOperator.cs" />
    9999    <Compile Include="Interfaces\IPermutationOperator.cs" />
     100    <Compile Include="Interfaces\ITwoOptPermutationMoveOperator.cs" />
    100101    <Compile Include="Manipulators\InsertionManipulator.cs" />
    101102    <Compile Include="Manipulators\InversionManipulator.cs" />
    … …  
    105106    <Compile Include="Manipulators\TranslocationInversionManipulator.cs" />
    106107    <Compile Include="Manipulators\TranslocationManipulator.cs" />
    107     <Compile Include="Moves\ExhaustiveTwoOptMoveGenerator.cs">
     108    <Compile Include="Moves\TwoOpt\ExhaustiveTwoOptMoveGenerator.cs">
    108109      <SubType>Code</SubType>
    109110    </Compile>
    … …  
    111112      <SubType>Code</SubType>
    112113    </Compile>
    113     <Compile Include="Moves\TwoOptMove.cs">
     114    <Compile Include="Moves\TwoOpt\StochasticTwoOptMoveGenerator.cs" />
     115    <Compile Include="Moves\TwoOpt\TwoOptMove.cs">
    114116      <SubType>Code</SubType>
    115117    </Compile>
    116     <Compile Include="Moves\TwoOptMoveMaker.cs">
     118    <Compile Include="Moves\TwoOpt\TwoOptMoveGenerator.cs" />
     119    <Compile Include="Moves\TwoOpt\TwoOptMoveMaker.cs">
    117120      <SubType>Code</SubType>
    118121    </Compile>
    119     <Compile Include="Moves\TwoOptMoveTabuAttribute.cs">
     122    <Compile Include="Moves\TwoOpt\TwoOptMoveTabuAttribute.cs">
    120123      <SubType>Code</SubType>
    121124    </Compile>
    122     <Compile Include="Moves\TwoOptMoveTabuEvaluator.cs">
     125    <Compile Include="Moves\TwoOpt\TwoOptMoveTabuEvaluator.cs">
    123126      <SubType>Code</SubType>
    124127    </Compile>
    125     <Compile Include="Moves\TwoOptMoveTabuMaker.cs">
     128    <Compile Include="Moves\TwoOpt\TwoOptMoveTabuMaker.cs">
    126129      <SubType>Code</SubType>
    127130    </Compile>

  • trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs

    r3023 r3044  
    5050      get { return CurrentScopeParameter.ActualValue; }
    5151    }
     52    public IntData NumberOfSolutions {
     53      get { return NumberOfSolutionsParameter.Value; }
     54      set { NumberOfSolutionsParameter.Value = value; }
     55    }
    5256
    5357    public SolutionsCreator()

  • trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r2997 r3044  
    8686    <None Include="HeuristicLabOptimizationPlugin.cs.frame" />
    8787    <Compile Include="Algorithm.cs" />
     88    <Compile Include="Interfaces\IMoveOperator.cs" />
     89    <Compile Include="Interfaces\ISingleObjectiveMoveEvaluator.cs" />
    8890    <Compile Include="Interfaces\IMoveGenerator.cs" />
     91    <Compile Include="Interfaces\IMoveMaker.cs" />
    8992    <Compile Include="Interfaces\IMultiObjectiveSelector.cs" />
    9093    <Compile Include="Interfaces\ISingleObjectiveSelector.cs" />
    … …  
    102105    <Compile Include="Interfaces\ISolutionCreator.cs" />
    103106    <Compile Include="Interfaces\IStochasticOperator.cs" />
     107    <Compile Include="Interfaces\ITabuMoveEvaluator.cs" />
     108    <Compile Include="Interfaces\ITabuMoveMaker.cs" />
    104109    <Compile Include="UserDefinedAlgorithm.cs" />
    105110    <Compile Include="EngineAlgorithm.cs" />

  • trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IMoveGenerator.cs

    r2997 r3044  
    2121
    2222using HeuristicLab.Core;
     23using HeuristicLab.Parameters;
    2324
    2425namespace HeuristicLab.Optimization {
    … …  
    2627  /// An interface which represents an operator for generating moves.
    2728  /// </summary>
    28   public interface IMoveGenerator : IOperator { }
     29  public interface IMoveGenerator : IOperator {
     30  }
    2931}

  • trunk/sources/HeuristicLab.Problems.TSP/3.3/MoveEvaluators/TwoOptMoveTSPEvaluator.cs

    r3017 r3044  
    7979      moveQuality += CalculateDistance(coordinates[edge1target, 0], coordinates[edge1target, 1],
    8080        coordinates[edge2target, 0], coordinates[edge2target, 1]);
    81       MoveQualityParameter.ActualValue = new DoubleData(moveQuality);
     81      if (MoveQualityParameter.ActualValue == null) MoveQualityParameter.ActualValue = new DoubleData(moveQuality);
     82      else MoveQualityParameter.ActualValue.Value = moveQuality;
    8283      return base.Apply();
    8384    }
Note: See TracChangeset for help on using the changeset viewer.