Changeset 15511 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMove.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/NMove.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +31 @@
   public class NMove : Item {
     [Storable]
-    public Dictionary<int, int> NewAssignments { get; private set; }
+    private int[] reassignments;
+    /// <summary>
+    /// Contains for each equipment the newly assigned location.
+    /// </summary>
+    /// <remarks>
+    /// Locations are 1-based. A 0 indicates that this equipment is not reassigned.
+    /// </remarks>
+    public IReadOnlyList<int> Reassignments {
+      get { return reassignments; }
+    }
     [Storable]
-    public IntegerVector OriginalVector { get; private set; }
+    private List<int> indices;
+    /// <summary>
+    /// Which indices (=equipments) are reassigned.
+    /// </summary>
+    /// <remarks>
+    /// Equipments are 0-based.
+    /// </remarks>
+    public IReadOnlyList<int> Indices {
+      get { return indices; }
+    }
 
-    public int N { get { return NewAssignments.Count; } }
+    public int N { get { return Indices.Count; } }
 
     [StorableConstructor]
@@ -42 +59 @@
     protected NMove(NMove original, Cloner cloner)
       : base(original, cloner) {
-      NewAssignments = new Dictionary<int, int>(original.NewAssignments);
-      if (original.OriginalVector != null)
-        OriginalVector = cloner.Clone(original.OriginalVector);
+      reassignments = original.reassignments.ToArray();
+      indices = original.indices.ToList();
     }
-    public NMove() : this(new int[0], new int[0], null) { }
-    public NMove(int[] equipments, int[] locations) : this(equipments, locations, null) { }
-    public NMove(int[] equipments, int[] locations, IntegerVector originalVector)
+    public NMove(int[] reassignments, List<int> indices)
       : base() {
-      if (equipments == null) throw new ArgumentNullException("equipments", "NMove: Equipments must not be null.");
-      if (locations == null) throw new ArgumentNullException("locations", "NMove: Locations must not be null.");
-      if (equipments.Length != locations.Length) throw new ArgumentException("NMove: Length of equipments and locations is not identical.");
-      NewAssignments = new Dictionary<int, int>();
-      for (int i = 0; i < equipments.Length; i++)
-        NewAssignments[equipments[i]] = locations[i];
-      OriginalVector = originalVector;
+      this.reassignments = reassignments;
+      this.indices = indices;
     }