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

Timestamp:

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

Author:

gkronber

Message:

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

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/RegularIdenticalBinPackingProblem.cs (modified) (8 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/RegularIdenticalBinPackingProblem.cs

@@ -41 +41 @@
   [Item("RegularIdenticalBinPackingProblem", "Represents a bin-packing problem-instance using only bins with identical measures and bins/items with regular shapes (e.g. rectangle, cuboid).")]
   [StorableClass]
-  public abstract class RegularIdenticalBinPackingProblem<D, B, I> : BinPackingProblem<D, B, I>, IProblemInstanceConsumer<BPPData>,  IProblemInstanceExporter<BPPData> 
+  public abstract class RegularIdenticalBinPackingProblem<D, B, I> : BinPackingProblem<D, B, I>, IProblemInstanceConsumer<BPPData>, IProblemInstanceExporter<BPPData>
     where D : class, IPackingDimensions
     where B : PackingShape<D>, IPackingBin, IRegularPackingShape, new()
-    where I : PackingShape<D>, IPackingItem, IRegularPackingShape, new() {        
+    where I : PackingShape<D>, IPackingItem, IRegularPackingShape, new() {
 
     #region Parameter Properties
@@ -58 +58 @@
     public B PackingBinMeasures {
       get { return PackingBinMeasuresParameter.Value; }
-      set { PackingBinMeasuresParameter.Value = value; } 
-    }
-    public PackingSolutionDecoder<D,B,I> PackingSolutionDecoder {
+      set { PackingBinMeasuresParameter.Value = value; }
+    }
+    public PackingSolutionDecoder<D, B, I> PackingSolutionDecoder {
       get { return PackingSolutionDecoderParameter.Value as PackingSolutionDecoder<D, B, I>; }
       set { PackingSolutionDecoderParameter.Value = value; }
@@ -69 +69 @@
     [StorableConstructor]
     protected RegularIdenticalBinPackingProblem(bool deserializing) : base(deserializing) { }
-    protected RegularIdenticalBinPackingProblem(RegularIdenticalBinPackingProblem<D,B,I> original, Cloner cloner)
+    protected RegularIdenticalBinPackingProblem(RegularIdenticalBinPackingProblem<D, B, I> original, Cloner cloner)
       : base(original, cloner) {
       InitializeEventHandlers();
@@ -86 +86 @@
     }
 
-    
+
 
 
@@ -101 +101 @@
     protected abstract void InitializeProblemData();
     protected abstract IPackingPlanEvaluator CreateDefaultEvaluator();
-    private void ApplyHorizontalOrientation() {
+    protected void ApplyHorizontalOrientation() {
       PackingBinMeasures.ApplyHorizontalOrientation();
       foreach (IRegularPackingShape shape in PackingItemMeasures) {
@@ -107 +107 @@
       }
     }
-    private void SortItems() {
+    protected void SortItems() {
       PackingItemMeasures.Sort((x, y) => y.CompareTo(x));
     }
-    private int CalculateLowerBound() {
+    protected int CalculateLowerBound() {
       //This is the obvious continuous lower bound calculation; Martello and Vigo proposed a better way but it has not been implemented yet;
       int items = PackingItemMeasures.Select(x => x.Volume).Sum();
       int bin = PackingBinMeasures.Volume;
-      return (items + bin - 1)/(bin);
+      return (items + bin - 1) / (bin);
     }
 
     protected override void InitializeOperators() {
-      Operators.Clear();  
+      Operators.Clear();
       Operators.Add(new BestBinPackingSolutionAnalyzer<D, B, I>());
 
@@ -134 +134 @@
         Operators.AddRange(ApplicationManager.Manager.GetInstances<IMultiComponentVectorOperator>());
         InitializeDecoder();
-      } 
-    }
-    private void ParameterizeOperators() {    
+      }
+    }
+    private void ParameterizeOperators() {
       foreach (var op in Operators.OfType<BestBinPackingSolutionAnalyzer<D, B, I>>()) {
         op.QualityParameter.ActualName = PackingPlanEvaluator.QualityParameter.ActualName;
@@ -224 +224 @@
       ParameterizeOperators();
     }
-    #endregion
-
-
-    #region Problem instance handling
-    public virtual void Load(BPPData data) {
-      // var realData = data as RealBPPData;
-      // var binData = new B();
-      // binData.InitializeFromMeasures (data.BinMeasures);
-      // 
-      // var itemData = new ItemList<I>(data.Items);
-      // for (int j = 0; j < data.Items; j++) {
-      //   var item = new I();
-      //   item.InitializeFromMeasures(data.ItemMeasures[j]);
-      //   item.AddTargetBinMeasures(data.BinMeasures);
-      //   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();
-
-      throw new NotImplementedException();
-    }
-
-    public BPPData Export() {
-      // var result = new BPPData{
-      //   Name = Name,
-      //   Description = Description,
-      //   Items = PackingItemsParameter.Value.Value,
-      //   BinMeasures = PackingBinMeasures.ToArray() // TODO: split functionality of class in 2d and 3d code
-      // };
-      // 
-      // var itemMeasures = new int[result.Items][];
-      // int i = 0;
-      // foreach (var item in PackingItemMeasures) {
-      //   itemMeasures[i] = item.ToArray();
-      //   i++;
-      // }
-      // result.ItemMeasures = itemMeasures;
-      // return result;
-
-      throw new NotImplementedException();
-    }
-    #endregion
+
+    public abstract void Load(BPPData data);
+
+    public abstract BPPData Export();
+    #endregion
+
   }
 }