Changeset 14039 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D

Timestamp:

07/12/16 17:12:15 (8 years ago)

Author:

gkronber

Message:

#1966 restored functionality after splitting into 2d and 3d problems

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3

Files:

• RectangularIdenticalBinPackingProblem.cs (modified) (4 diffs)
• RectangularPackingItem.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularIdenticalBinPackingProblem.cs

@@ -34 +34 @@
 using HeuristicLab.Problems.Instances;
 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
+using HeuristicLab.Data;
+using System;
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
@@ -101 +103 @@
     }
 
+    #region Problem instance handling
+    public override void Load(BPPData data) {
+      var realData = data as RealBPPData;
+      var binData = new RectangularPackingBin(data.BinMeasures[0], data.BinMeasures[1]);
+
+      var itemData = new ItemList<RectangularPackingItem>(data.Items);
+      for (int j = 0; j < data.Items; j++) {
+        var bin = new RectangularPackingBin(data.BinMeasures[0], data.BinMeasures[1]);
+        var item = new RectangularPackingItem(data.ItemMeasures[j][0], data.ItemMeasures[j][1], bin);
+        if (realData != null) {
+          item.Weight = realData.ItemWeights[j];
+          item.Material = realData.ItemMaterials[j];
+        }
+        itemData.Add(item);
+      }
+
+      BestKnownQuality = data.BestKnownQuality.HasValue ? new DoubleValue(data.BestKnownQuality.Value) : null;
+
+      PackingBinMeasures = binData;
+      PackingItemMeasures = itemData;
+
+      ApplyHorizontalOrientation();
+      SortItems();
+      PackingItemsParameter.Value.Value = PackingItemMeasures.Count;
+      LowerBoundParameter.Value.Value = CalculateLowerBound();
+    }
+
+
+    public override BPPData Export() {
+      var result = new BPPData {
+        Name = Name,
+        Description = Description,
+        Items = PackingItemsParameter.Value.Value,
+        BinMeasures = new int[] { PackingBinMeasures.Width, PackingBinMeasures.Height }
+      };
+
+      var itemMeasures = new int[result.Items][];
+      int i = 0;
+      foreach (var item in PackingItemMeasures) {
+        itemMeasures[i] = new int[] { item.Width, item.Height };
+        i++;
+      }
+      result.ItemMeasures = itemMeasures;
+      return result;
+    }
+    #endregion
 
     #region Helpers
@@ -107 +155 @@
 
       PackingSolutionDecoderParameter.ValidValues.Clear();
-      if (SolutionCreator is PackingSequenceRandomCreator) {        
+      if (SolutionCreator is PackingSequenceRandomCreator) {
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DPSDecoder>());
-      } else if (SolutionCreator is GroupingVectorRandomCreator) {  
+      } else if (SolutionCreator is GroupingVectorRandomCreator) {
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DGVDecoder>());
-      } else if (SolutionCreator is MultiComponentVectorRandomCreator) {  
+      } else if (SolutionCreator is MultiComponentVectorRandomCreator) {
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DMCVDecoder>());
       } else {
@@ -120 +168 @@
 
     protected override IPackingPlanEvaluator CreateDefaultEvaluator() {
-      return new PackingRatioRectangularIdenticalBinEvaluator ();
+      return new PackingRatioRectangularIdenticalBinEvaluator();
     }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularPackingItem.cs

@@ -69 +69 @@
     public RectangularPackingItem(int width, int height, RectangularPackingBin targetBin)
       : this() {
-      this.Weight = width;
+      this.Width = width;
       this.Height = height;
       this.TargetBin = (RectangularPackingBin)targetBin.Clone();