Changeset 13460 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/RectangularIdenticalBinPackingProblem.cs

Timestamp:

12/14/15 18:59:13 (8 years ago)

Author:

gkronber

Message:

#1966:

• renamed creatables
• partially fixed bin packing problem instance provider

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/RectangularIdenticalBinPackingProblem.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem/RectangularIdenticalBinPackingProblem.cs

@@ -36 +36 @@
 
 namespace HeuristicLab.Problems.BinPacking.Problem {
-  [Item("RectangularIdenticalBinPackingProblem", "Represents a two-dimensional bin-packing problem using only bins with identical measures and bins/items with rectangular shapes.")]
+  [Item("Bin Packing Problem (2D, identical rectangles) (BPP)", "Represents a two-dimensional bin-packing problem using only bins with identical measures and bins/items with rectangular shapes.")]
   [StorableClass]
-  [Creatable("Problems")]
+  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 300)]
   public class RectangularIdenticalBinPackingProblem : RegularIdenticalBinPackingProblem<TwoDimensionalPacking, RectangularPackingBin, RectangularPackingItem> {
 
@@ -104 +104 @@
     #region Helpers
     protected override void InitializeDecoder() {
-      Operators.RemoveAll(op => typeof(I3DOperator).IsAssignableFrom(op.GetType()));
+      Operators.RemoveAll(op => op is I3DOperator);
 
       PackingSolutionDecoderParameter.ValidValues.Clear();
       if (SolutionCreator is PackingSequenceRandomCreator) {        
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DPSDecoder>());
-        //PackingSolutionDecoder = new ExtremePointPackingSequenceDecoder2D();
       } else if (SolutionCreator is GroupingVectorRandomCreator) {  
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DGVDecoder>());
-        //PackingSolutionDecoder = new ExtremePointGroupingVectorDecoder2D();
       } else if (SolutionCreator is MultiComponentVectorRandomCreator) {  
         PackingSolutionDecoderParameter.ValidValues.UnionWith(ApplicationManager.Manager.GetInstances<I2DMCVDecoder>());
-        //PackingSolutionDecoder = new ExtremePointMultiComponentVectorDecoder2D();
       } else {
         string error = "The given problem does not support the selected solution-creator.";
-        PluginInfrastructure.ErrorHandling.ShowErrorDialog(error, null);
+        ErrorHandling.ShowErrorDialog(error, null);
       }
     }