Changeset 15511 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveAbsoluteAttribute.cs

Timestamp:

12/11/17 23:06:32 (7 years ago)

Author:

abeham

Message:

#1614: Improved performance by switching from Dictionary to Array

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveAbsoluteAttribute.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveAbsoluteAttribute.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Common;
@@ -32 +33 @@
 
     [Storable]
-    public Dictionary<int, int> OldAssignments { get; private set; }
+    public List<Tuple<int, int>> OldAssignments { get; private set; }
     [Storable]
     public double MoveQuality { get; private set; }
@@ -41 +42 @@
     public NMoveAbsoluteTabuAttribute(NMove move, IntegerVector assignment, double moveQuality)
       : base() {
-      OldAssignments = new Dictionary<int, int>();
-      foreach (var kvp in move.NewAssignments)
-        OldAssignments.Add(kvp.Key, assignment[kvp.Key]);
+      OldAssignments = new List<Tuple<int, int>>(move.N);
+      foreach (var equip in move.Indices)
+        OldAssignments.Add(Tuple.Create(equip, assignment[equip]));
       MoveQuality = moveQuality;
     }