Changeset 14050 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans

Timestamp:

07/12/16 20:35:19 (8 years ago)

Author:

gkronber

Message:

#1966: renamed evaluators

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs (modified) (5 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs

@@ -37 +37 @@
   [Item("PackingPlan", "Represents a concrete solution for a bin-packing problem.")]
   [StorableClass]
-  public abstract class PackingPlan<D, B, I> :Item, IPackingPlan
+  public abstract class PackingPlan<D, B, I> : Item, IPackingPlan
     where D : class, IPackingPosition
     where B : PackingShape<D>
@@ -77 +77 @@
 
     protected PackingPlan(B binMeasures, bool useExtremePoints, bool stackingConstraints)
-      : base(){
-        BinMeasures = (B)binMeasures.Clone();
-        StackingConstraints = stackingConstraints;
-        UseExtremePoints = useExtremePoints;
-        BinPackings = new ObservableList<BinPacking<D, B, I>>();
+      : base() {
+      BinMeasures = (B)binMeasures.Clone();
+      StackingConstraints = stackingConstraints;
+      UseExtremePoints = useExtremePoints;
+      BinPackings = new ObservableList<BinPacking<D, B, I>>();
     }
 
     [StorableConstructor]
     protected PackingPlan(bool deserializing) : base(deserializing) { }
-    protected PackingPlan(PackingPlan<D,B,I> original, Cloner cloner)
+    protected PackingPlan(PackingPlan<D, B, I> original, Cloner cloner)
       : base(original, cloner) {
-        this.BinPackings = new ObservableList<BinPacking<D, B, I>>(original.BinPackings);
-    }
-    
+      this.BinPackings = new ObservableList<BinPacking<D, B, I>>(original.BinPackings);
+    }
+
 
     public abstract BinPacking<D, B, I> NewBinPacking();
     public void UpdateBinPackings() {
       BinPackings.RemoveAll(x => x.ItemPositions.Count == 0);
-      BinPackings = new ObservableList<BinPacking<D, B, I>>(BinPackings.OrderByDescending (bp => bp.PackingDensity));
+      BinPackings = new ObservableList<BinPacking<D, B, I>>(BinPackings.OrderByDescending(bp => bp.PackingDensity));
     }
 
@@ -139 +139 @@
       UpdateBinPackings();
 
-      var newSolution = new ObservableDictionary<int,ItemList<PackingInformation>> ();
+      var newSolution = new ObservableDictionary<int, ItemList<PackingInformation>>();
       foreach (var bp in BinPackings) {
         int binIndex = newSolution.Count;
         newSolution[binIndex] = new ItemList<PackingInformation>();
         foreach (var entry in bp.ItemPositions)
-          newSolution[binIndex].Add(new PackingInformation (entry.Key, entry.Value.Rotated));
+          newSolution[binIndex].Add(new PackingInformation(entry.Key, entry.Value.Rotated));
       }
       solution.PackingInformations = newSolution;
@@ -167 +167 @@
       var temp = new List<int>(remainingIDs);
       foreach (int id in temp) {
-        foreach (var bp in BinPackings) {  
-          var position = UseExtremePoints ? bp.FindExtremePointForItem (itemMeasures[id], false, StackingConstraints) : bp.FindPositionBySliding(itemMeasures[id], false);
+        foreach (var bp in BinPackings) {
+          var position = UseExtremePoints ? bp.FindExtremePointForItem(itemMeasures[id], false, StackingConstraints) : bp.FindPositionBySliding(itemMeasures[id], false);
           if (position != null) {
             bp.PackItem(id, itemMeasures[id], position);
@@ -195 +195 @@
         binIndex++;
       }
-      solution.GroupingVector = new IntegerVector (newSolution);
+      solution.GroupingVector = new IntegerVector(newSolution);
     }
     public void Pack(PackingSequenceEncoding solution, ItemList<I> itemMeasures) {