Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/StochasticInsertionMoveGenerator.cs

Timestamp:

07/20/16 14:02:36 (7 years ago)

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/StochasticInsertionMoveGenerator.cs (modified) (4 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/StochasticInsertionMoveGenerator.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -58 +59 @@
     }
 
-    public static InsertionMove[] Apply(PackingSequenceEncoding PackingSequence, IRandom random, int sampleSize) {
+    public static InsertionMove[] Apply(Permutation packingSequence, IRandom random, int sampleSize) {
 
       int nrOfBins = 0;
-      foreach (int binNr in PackingSequence.PackingSequence) {
+      foreach (int binNr in packingSequence) {
         if (binNr > nrOfBins)
           nrOfBins = binNr;
@@ -67 +68 @@
       nrOfBins++;
       var generatedMoves = new List<InsertionMove>();
-      var moves = new List<InsertionMove>(ExhaustiveInsertionMoveGenerator.Generate(PackingSequence, nrOfBins));
+      var moves = new List<InsertionMove>(ExhaustiveInsertionMoveGenerator.Generate(packingSequence, nrOfBins));
       int moveCount = moves.Count;
       for (int i = 0; i < sampleSize; i++) {
@@ -76 +77 @@
     }
 
-    protected override InsertionMove[] GenerateMoves(PackingSequenceEncoding SwapSequence) {
+    protected override InsertionMove[] GenerateMoves(Permutation packingSequence) {
       IRandom random = RandomParameter.ActualValue;
-      return Apply(SwapSequence, random, SampleSizeParameter.ActualValue.Value);
+      return Apply(packingSequence, random, SampleSizeParameter.ActualValue.Value);
     }
   }