Changeset 9599 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector

Timestamp:

06/09/13 12:58:39 (12 years ago)

Author:

jhelm

Message:

#1966: Bugfixing; Refactoring; Performancetuning;

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector

Files:

• BinBasedMultiComponentVectorCrossover.cs (modified) (2 diffs)
• SequenceBasedMultiComponentVectorCrossover.cs (modified) (1 diff)
• ThreeWayMultiComponentVectorManipulator.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/BinBasedMultiComponentVectorCrossover.cs

@@ -46 +46 @@
 
       int nrOfItems = parent1.NrOfItems;
+
       bool[] itemAlreadyAssigned = new bool[nrOfItems];
       int nrOfBins = parent1.NrOfBins > parent2.NrOfBins ? parent2.NrOfBins : parent1.NrOfBins;
@@ -82 +83 @@
         if (!itemAlreadyAssigned[itemID])
           child.PackingInformations[0].Add(new PackingInformation(itemID, random.Next(2) == 0 ? true : false));
-      }
-
+      }                
 
       return child;

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/SequenceBasedMultiComponentVectorCrossover.cs

@@ -92 +92 @@
           child.PackingInformations[0].Add(new PackingInformation(itemID, random.Next(2) == 0 ? true : false));
       }
-
       
       return child;

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/ThreeWayMultiComponentVectorManipulator.cs

@@ -58 +58 @@
         if (individual.NrOfBins > 1)
           do { targetBin = random.Next(individual.NrOfBins); }
-          while (targetBin != affectedBin);
+          while (targetBin == affectedBin);
         individual.PackingInformations = SingleGroupingMove.GetVectorAfterMove(individual, affectedBin, affectedIndex, targetBin).PackingInformations;
       }
@@ -67 +67 @@
         if (nrOfItems > 1)
           do { targetIndex = random.Next(nrOfItems); }
-          while (targetIndex != affectedIndex);
+          while (targetIndex == affectedIndex);
         individual.PackingInformations = ChangePositionMove.GetVectorAfterMove(individual, affectedBin, affectedIndex, targetIndex).PackingInformations;
       }