Changeset 3044 for trunk/sources/HeuristicLab.Algorithms.TS

Timestamp:

03/15/10 18:00:07 (14 years ago)

Author:

abeham

Message:

updated tabu search #840

Location:

trunk/sources/HeuristicLab.Algorithms.TS/3.3

Files:

• HeuristicLab.Algorithms.TS-3.3.csproj (modified) (3 diffs)
• TS.cs (added)
• TSMainLoop.cs (added)
• TSOperator.cs (deleted)
• TabuSelector.cs (modified) (2 diffs)

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

@@ -89 +89 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="TSOperator.cs">
+    <Compile Include="TS.cs" />
+    <Compile Include="TSMainLoop.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -118 +119 @@
       <Name>HeuristicLab.Operators-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
+      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
+      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
@@ -133 +138 @@
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
+      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
+      <Name>HeuristicLab.Random-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Selection\3.3\HeuristicLab.Selection-3.3.csproj">

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

@@ -36 +36 @@
   /// For different aspiration criteria a new operator should be implemented.
   /// </remarks>
-  [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.")]
+  [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).")]
   [StorableClass]
   public class TabuSelector : Selector {
@@ -90 +90 @@
     /// Implements the tabu selection with the default aspiration criteria (choose a tabu move when it is better than the best so far).
     /// </summary>
+    /// <exception cref="InvalidOperationException">Thrown when the neighborhood contained too little moves which are not tabu.</exception>
     /// <param name="scopes">The scopes from which to select.</param>
     /// <returns>The selected scopes.</returns>