Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/BinUtilizationEvaluator.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/BinUtilizationEvaluator.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/BinUtilizationEvaluator.cs	(revision 14167)
@@ -53,6 +53,6 @@
 
       for (int i = 0; i < nrOfBins; i++) {
-        totalUsableSpace += solution.BinPackings[i].BinShape.Volume;
-        totalUsedSpace += solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
+        totalUsableSpace += solution.Bins[i].BinShape.Volume;
+        totalUsedSpace += solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
       }
 
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/PackingRatioEvaluator.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/PackingRatioEvaluator.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/PackingRatioEvaluator.cs	(revision 14167)
@@ -60,6 +60,6 @@
       const double k = 2;
       for (int i = 0; i < nrOfBins; i++) {
-        double f = solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
-        double c = solution.BinPackings[i].BinShape.Volume;
+        double f = solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
+        double c = solution.Bins[i].BinShape.Volume;
         result += Math.Pow(f / c, k);
       }
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs	(revision 14167)
@@ -53,5 +53,5 @@
       Solution partialSolution,
       ref IList<int> remainingIDs, IList<PackingItem> items) {
-      var bp = new BinPacking2D(partialSolution.BinMeasures);
+      var bp = new BinPacking2D(partialSolution.BinShape);
       bp.SlidingBasedPacking(ref remainingIDs, items);
       return bp;
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs	(revision 14167)
@@ -53,5 +53,5 @@
       Solution partialSolution,
       ref IList<int> remainingIDs, IList<PackingItem> items) {
-      var bp = new BinPacking2D(partialSolution.BinMeasures);
+      var bp = new BinPacking2D(partialSolution.BinShape);
       bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: false);
       return bp;
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs	(revision 14167)
@@ -47,5 +47,5 @@
       foreach (var sequence in sequenceMatrix) {
         remainingIDs = remainingIDs.Concat(sequence).ToList();
-        result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items));
       }
       result.UpdateBinPackings();
@@ -54,5 +54,5 @@
       var temp = new List<int>(remainingIDs);
       foreach (int id in temp) {
-        foreach (BinPacking2D bp in result.BinPackings) {
+        foreach (BinPacking2D bp in result.Bins) {
           var position = FindPositionForItem(bp, items[id]);
           if (position != null) {
@@ -66,5 +66,5 @@
       //Put still remaining items in new bins
       while (remainingIDs.Count > 0) {
-        result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items));
       }
       result.UpdateBinPackings();
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/BottomLeftPermutationDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/BottomLeftPermutationDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/BottomLeftPermutationDecoder.cs	(revision 14167)
@@ -47,5 +47,5 @@
         var bp = new BinPacking2D(binShape);
         bp.SlidingBasedPacking(ref remainingIDs, items);
-        result.BinPackings.Add(bp);
+        result.Bins.Add(bp);
       }
       result.UpdateBinPackings();
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/ExtremePointPermutationDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/ExtremePointPermutationDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/ExtremePointPermutationDecoder.cs	(revision 14167)
@@ -47,5 +47,5 @@
         var bp = new BinPacking2D(binShape);
         bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: false);
-        result.BinPackings.Add(bp);
+        result.Bins.Add(bp);
       }
       result.UpdateBinPackings();
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Solution.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Solution.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Solution.cs	(revision 14167)
@@ -29,6 +29,6 @@
   [StorableClass]
   public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> {
-    public Solution(PackingShape binMeasures) : this(binMeasures, false, false) { }
-    public Solution(PackingShape binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
+    public Solution(PackingShape binShape) : this(binShape, false, false) { }
+    public Solution(PackingShape binShape, bool useExtremePoints, bool stackingConstraints) : base(binShape, useExtremePoints, stackingConstraints) { }
     [StorableConstructor]
     protected Solution(bool deserializing) : base(deserializing) { }
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/BinUtilizationEvaluator.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/BinUtilizationEvaluator.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/BinUtilizationEvaluator.cs	(revision 14167)
@@ -54,6 +54,6 @@
 
       for (int i = 0; i < nrOfBins; i++) {
-        totalUsableSpace += solution.BinPackings[i].BinShape.Volume;
-        totalUsedSpace += solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
+        totalUsableSpace += solution.Bins[i].BinShape.Volume;
+        totalUsedSpace += solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
       }
 
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/PackingRatioEvaluator.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/PackingRatioEvaluator.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/PackingRatioEvaluator.cs	(revision 14167)
@@ -61,6 +61,6 @@
       const double k = 2;
       for (int i = 0; i < nrOfBins; i++) {
-        double f = solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
-        double c = solution.BinPackings[i].BinShape.Volume;
+        double f = solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
+        double c = solution.Bins[i].BinShape.Volume;
         result += Math.Pow(f / c, k);
       }
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs	(revision 14167)
@@ -60,5 +60,5 @@
       Solution partialSolution,
       ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
-      var bp = new BinPacking3D(partialSolution.BinMeasures);
+      var bp = new BinPacking3D(partialSolution.BinShape);
       bp.SlidingBasedPacking(ref remainingIDs, items);
       return bp;
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs	(revision 14167)
@@ -53,5 +53,5 @@
       Solution partialSolution,
       ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
-      var bp = new BinPacking3D(partialSolution.BinMeasures);
+      var bp = new BinPacking3D(partialSolution.BinShape);
       bp.ExtremePointBasedPacking(ref remainingIDs, items, useStackingConstraints);
       return bp;
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs	(revision 14167)
@@ -47,5 +47,5 @@
       foreach (var sequence in sequenceMatrix) {
         remainingIDs = remainingIDs.Concat(sequence).ToList();
-        result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
       }
       result.UpdateBinPackings();
@@ -54,5 +54,5 @@
       var temp = new List<int>(remainingIDs);
       foreach (int id in temp) {
-        foreach (BinPacking3D bp in result.BinPackings) {
+        foreach (BinPacking3D bp in result.Bins) {
           var position = FindPositionForItem(bp, items[id], useStackingConstraints);
           if (position != null) {
@@ -66,5 +66,5 @@
       //Put still remaining items in new bins
       while (remainingIDs.Count > 0) {
-        result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
       }
       result.UpdateBinPackings();
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs	(revision 14167)
@@ -35,5 +35,4 @@
   [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 330)]
   public sealed class IntegerVectorProblem : ProblemBase<IntegerVectorEncoding, IntegerVector> {
-    // persistence
     [StorableConstructor]
     private IntegerVectorProblem(bool deserializing) : base(deserializing) { }
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs	(revision 14167)
@@ -47,5 +47,5 @@
         var bp = new BinPacking3D(binShape);
         bp.SlidingBasedPacking(ref remainingIDs, items);
-        result.BinPackings.Add(bp);
+        result.Bins.Add(bp);
       }
       result.UpdateBinPackings();
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs	(revision 14167)
@@ -47,5 +47,5 @@
         var bp = new BinPacking3D(binShape);
         bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: useStackingConstraints);
-        result.BinPackings.Add(bp);
+        result.Bins.Add(bp);
       }
       result.UpdateBinPackings();
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs	(revision 14167)
@@ -34,5 +34,4 @@
   [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 320)]
   public sealed class PermutationProblem : ProblemBase<PermutationEncoding, Permutation> {
-    // persistence
     [StorableConstructor]
     private PermutationProblem(bool deserializing) : base(deserializing) { }
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Solution.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Solution.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D/Solution.cs	(revision 14167)
@@ -8,6 +8,6 @@
   [StorableClass]
   public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> {
-    public Solution(PackingShape binMeasures) : this(binMeasures, false, false) { }
-    public Solution(PackingShape binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
+    public Solution(PackingShape binShape) : this(binShape, false, false) { }
+    public Solution(PackingShape binShape, bool useExtremePoints, bool stackingConstraints) : base(binShape, useExtremePoints, stackingConstraints) { }
     [StorableConstructor]
     protected Solution(bool deserializing) : base(deserializing) { }
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs	(revision 14167)
@@ -38,6 +38,6 @@
     public int NrOfBins {
       get {
-        if (BinPackings != null)
-          return BinPackings.Count;
+        if (Bins != null)
+          return Bins.Count;
         else return 0;
       }
@@ -49,8 +49,8 @@
 
     [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,10 +69,10 @@
     #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,8 +81,8 @@
     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,6 +90,6 @@
 
     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,6 +110,4 @@
       OnQualityChanged();
     }
-
-    public event EventHandler BinPackingsChanged;
     #endregion
   }
Index: trunk/sources/HeuristicLab.Problems.BinPacking/3.3/PackingShape.cs
===================================================================
--- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/PackingShape.cs	(revision 14163)
+++ trunk/sources/HeuristicLab.Problems.BinPacking/3.3/PackingShape.cs	(revision 14167)
@@ -78,4 +78,5 @@
     public abstract int CompareTo(object obj);
 
+    [Storable]
     public IKeyedItemCollection<string, IParameter> Parameters { get; private set; }
   }
