Changeset 14170 for stable/HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs

Timestamp:

07/21/16 21:57:36 (8 years ago)

Author:

gkronber

Message:

#2641: merged r14162,r14163,r14167,r14168,r14169 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.BinPacking (copied) (copied from trunk/sources/HeuristicLab.Problems.BinPacking)
• HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs (modified) (6 diffs)

stable/HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs

@@ -38 +38 @@
     public int NrOfBins {
       get {
-        if (BinPackings != null)
-          return BinPackings.Count;
+        if (Bins != null)
+          return Bins.Count;
         else return 0;
       }
@@ -49 +49 @@
 
     [Storable]
-    public B BinMeasures { get; private set; }
+    public B BinShape { get; private set; }
 
     [Storable]
-    public ObservableList<BinPacking<D, B, I>> BinPackings { get; set; }
+    public ObservableList<BinPacking<D, B, I>> Bins { get; set; }
 
     [Storable]
@@ -69 +69 @@
     #endregion
 
-    protected PackingPlan(B binMeasures, bool useExtremePoints, bool stackingConstraints)
+    protected PackingPlan(B binShape, bool useExtremePoints, bool stackingConstraints)
       : base() {
-      BinMeasures = (B)binMeasures.Clone();
+      BinShape = (B)binShape.Clone();
       StackingConstraints = stackingConstraints;
       UseExtremePoints = useExtremePoints;
-      BinPackings = new ObservableList<BinPacking<D, B, I>>();
+      Bins = new ObservableList<BinPacking<D, B, I>>();
     }
 
@@ -81 +81 @@
     protected PackingPlan(PackingPlan<D, B, I> original, Cloner cloner)
       : base(original, cloner) {
-      this.BinPackings = new ObservableList<BinPacking<D, B, I>>(original.BinPackings.Select(p => cloner.Clone(p)));
+      this.Bins = new ObservableList<BinPacking<D, B, I>>(original.Bins.Select(p => cloner.Clone(p)));
       UseExtremePoints = original.UseExtremePoints;
       StackingConstraints = original.StackingConstraints;
-      BinMeasures = cloner.Clone(original.BinMeasures);
+      BinShape = cloner.Clone(original.BinShape);
       Quality = cloner.Clone(original.Quality);
     }
@@ -90 +90 @@
 
     public void UpdateBinPackings() {
-      BinPackings.RemoveAll(x => x.Positions.Count == 0);
-      BinPackings = new ObservableList<BinPacking<D, B, I>>(BinPackings.OrderByDescending(bp => bp.PackingDensity));
+      Bins.RemoveAll(x => x.Positions.Count == 0);
+      Bins = new ObservableList<BinPacking<D, B, I>>(Bins.OrderByDescending(bp => bp.PackingDensity));
     }
 
@@ -110 +110 @@
       OnQualityChanged();
     }
-
-    public event EventHandler BinPackingsChanged;
     #endregion
   }