Changeset 6416 for branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms

Timestamp:

06/15/11 23:11:41 (14 years ago)

Author:

abeham

Message:

#1541

• Added PermutationView that allows to change the permutation type
• Updated AFA and PopDiv Analyzer
• Simplified QAP name to just the instance when loading from embedded resource

Location:

branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3

Files:

• HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3.csproj (modified) (1 diff)
• QAPRandomizedRobustTabooSeachOperator.cs (added)
• QAPRobustTabooSeachOperator.cs (modified) (1 diff)
• RandomizedRobustTabooSearch.cs (added)

branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3.csproj

@@ -107 +107 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="QAPRandomizedRobustTabooSeachOperator.cs" />
+    <Compile Include="RandomizedRobustTabooSearch.cs" />
     <Compile Include="QAPRobustTabooSeachOperator.cs" />
     <Compile Include="RobustTabooSearch.cs" />

branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/QAPRobustTabooSeachOperator.cs

@@ -165 +165 @@
       if (bestMove == null) return base.Apply();
 
-      shortTermMemory[bestMove.Index1, solution[bestMove.Index2]] = iteration;
-      shortTermMemory[bestMove.Index2, solution[bestMove.Index1]] = iteration;
+      shortTermMemory[bestMove.Index1, solution[bestMove.Index1]] = iteration;
+      shortTermMemory[bestMove.Index2, solution[bestMove.Index2]] = iteration;
       Swap2Manipulator.Apply(solution, bestMove.Index1, bestMove.Index2);
       quality.Value += bestMoveQuality;