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

Timestamp:

12/14/15 19:52:46 (9 years ago)

Author:

gkronber

Message:

#1966:

• used Items instead of NamedItems and adapted views (Names/Descriptions) were not set anyway
• fixed problems identified by Essential unit tests

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3

Files:

• Encodings/PackingSequence/PackingSequenceInversionManipulator.cs (modified) (2 diffs)
• Encodings/PackingSequence/PackingSequenceScrambleManipulator.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (1 diff)
• Interfaces/IPackingShape.cs (modified) (1 diff)
• PackingBin/CuboidPackingBin.cs (modified) (2 diffs)
• PackingBin/RectangularPackingBin.cs (modified) (2 diffs)
• PackingItem/CuboidPackingItem.cs (modified) (1 diff)
• PackingItem/RectangularPackingItem.cs (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Problem/RegularIdenticalBinPackingProblem.cs (modified) (1 diff)
• Shapes/CuboidPackingShape.cs (modified) (7 diffs)
• Shapes/PackingShape.cs (modified) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceInversionManipulator.cs

@@ -33 +33 @@
     [StorableConstructor]
     protected PackingSequenceInversionManipulator(bool deserializing) : base(deserializing) { }
-    protected PackingSequenceInversionManipulator(PackingSequenceManipulator original, Cloner cloner) : base(original, cloner) { }
+    protected PackingSequenceInversionManipulator(PackingSequenceInversionManipulator original, Cloner cloner) : base(original, cloner) { }
     public PackingSequenceInversionManipulator()
       : base() {
-        EncodedSolutionParameter.ActualName = "PackingSequence";
+      EncodedSolutionParameter.ActualName = "PackingSequence";
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -44 +44 @@
     protected override void Manipulate(IRandom random, PackingSequenceEncoding individual) {
       InversionManipulator.Apply(random, individual.PackingSequence);
-    }   
+    }
   }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceScrambleManipulator.cs

@@ -32 +32 @@
     [StorableConstructor]
     protected PackingSequenceScrambleManipulator(bool deserializing) : base(deserializing) { }
-    protected PackingSequenceScrambleManipulator(PackingSequenceManipulator original, Cloner cloner) : base(original, cloner) { }
+    protected PackingSequenceScrambleManipulator(PackingSequenceScrambleManipulator original, Cloner cloner) : base(original, cloner) { }
     public PackingSequenceScrambleManipulator()
       : base() {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

@@ -155 +155 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingShape.cs

@@ -23 +23 @@
 
 namespace HeuristicLab.Problems.BinPacking.Interfaces {
-  public interface IPackingShape : INamedItem {
+  public interface IPackingShape : IItem {
   }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingBin/CuboidPackingBin.cs

@@ -31 +31 @@
   [StorableClass]
   public class CuboidPackingBin : CuboidPackingShape, IPackingBin {
-    
-    public CuboidPackingBin(int width, int height, int depth) : base (width, height, depth) {}
+
+    public CuboidPackingBin(int width, int height, int depth) : base(width, height, depth) { }
 
     [StorableConstructor]
@@ -42 +42 @@
       return new CuboidPackingBin(this, cloner);
     }
-    public CuboidPackingBin() : base() {
-
+    public CuboidPackingBin()
+      : base() {
     }
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingBin/RectangularPackingBin.cs

@@ -32 +32 @@
 
     public RectangularPackingBin(int width, int height) : base(width, height) { }
-    public RectangularPackingBin() : base() {
+    public RectangularPackingBin()
+      : base() {
 
     }
@@ -40 +41 @@
     protected RectangularPackingBin(RectangularPackingBin original, Cloner cloner)
       : base(original, cloner) {
-    }              
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RectangularPackingBin(this, cloner);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingItem/CuboidPackingItem.cs

@@ -51 +51 @@
     }
     public CuboidPackingItem() : base() {
-
     }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingItem/RectangularPackingItem.cs

@@ -31 +31 @@
   [Item("RectangularPackingItem", "Represents a rectangular packing-item for bin-packing problems.")]
   [StorableClass]
-  public class RectangularPackingItem : RectangularPackingShape, IPackingItem{
+  public class RectangularPackingItem : RectangularPackingShape, IPackingItem {
 
     public RectangularPackingBin TargetBin { get; set; }
@@ -50 +50 @@
       return new RectangularPackingItem(this, cloner);
     }
-    public RectangularPackingItem() : base() {
+    public RectangularPackingItem()
+      : base() {
     }
 
     public RectangularPackingItem(int width, int height, RectangularPackingBin targetBin) : base(width, height) { this.TargetBin = new RectangularPackingBin(targetBin.Width, targetBin.Height); }
-                                 
+
     public void AddTargetBinMeasures(int[] targetBinMeasures) {
       TargetBin = new RectangularPackingBin(targetBinMeasures[0], targetBinMeasures[1]);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Problems.BinPacking-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]
-  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsBinPackingPlugin : PluginBase {
   }

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

@@ -47 +47 @@
 
     #region Parameter Properties
-    public ValueParameter<B> PackingBinMeasuresParameter {
-      get { return (ValueParameter<B>)Parameters["PackingBinMeasures"]; }
-    }
-    public ConstrainedValueParameter<IPackingSolutionDecoder> PackingSolutionDecoderParameter {
-      get { return (ConstrainedValueParameter<IPackingSolutionDecoder>)Parameters["PackingSolutionDecoder"]; }
+    public IValueParameter<B> PackingBinMeasuresParameter {
+      get { return (IValueParameter<B>)Parameters["PackingBinMeasures"]; }
+    }
+    public IConstrainedValueParameter<IPackingSolutionDecoder> PackingSolutionDecoderParameter {
+      get { return (IConstrainedValueParameter<IPackingSolutionDecoder>)Parameters["PackingSolutionDecoder"]; }
     }
     #endregion

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/CuboidPackingShape.cs

@@ -31 +31 @@
   [StorableClass]
   public abstract class CuboidPackingShape : PackingShape<ThreeDimensionalPacking>, IRegularPackingShape, IComparable<CuboidPackingShape> {
-    #region Properties 
+    #region Properties
     /// <summary>
     /// Describes the size on the X-axis
@@ -62 +62 @@
     }
     public override bool Encloses(ThreeDimensionalPacking checkedPosition, PackingShape<ThreeDimensionalPacking> checkedShape) {
-      return Encloses(checkedPosition, (CuboidPackingShape) checkedShape);
+      return Encloses(checkedPosition, (CuboidPackingShape)checkedShape);
     }
     private bool Encloses(ThreeDimensionalPacking checkedPosition, CuboidPackingShape checkedShape) {
       return Encloses(new CuboidDiagonal(this), new CuboidDiagonal(checkedPosition, checkedShape));
-    }  
+    }
     private bool Encloses(CuboidDiagonal c1, CuboidDiagonal c2) {
       return (c1.x1 <= c2.x1 &&
@@ -84 +84 @@
     private bool Overlaps(CuboidDiagonal c1, CuboidDiagonal c2) {
       return !(c1.x1 > c2.x2 ||
-               c1.y1 > c2.y2 ||  
+               c1.y1 > c2.y2 ||
                c1.z1 > c2.z2 ||
                c1.x2 < c2.x1 ||
@@ -98 +98 @@
       }
     }
-    #endregion        
+    #endregion
 
-    public CuboidPackingShape(int width, int height, int depth) : base () {
+    protected CuboidPackingShape(int width, int height, int depth)
+      : base() {
       this.Width = width;
       this.Height = height;
@@ -108 +109 @@
     public override void InitializeFromMeasures(int[] measures) {
       if (measures.Length != 3)
-        throw new InvalidOperationException("Nr of measures does not fit shape-dimension.");        
+        throw new InvalidOperationException("Nr of measures does not fit shape-dimension.");
       this.Width = measures[0];
       this.Height = measures[1];
@@ -125 +126 @@
       this.Depth = original.Depth;
     }
-    public CuboidPackingShape() : base(){ }
+
+    protected CuboidPackingShape() : base() { }
 
     public override string ToString() {
@@ -136 +138 @@
       //Using "Clustered-Area-Height"-comparison as descr
 
-      int result = (this.Width * this.Depth).CompareTo (other.Width * other.Depth);
-    
-    if (result == 0)
-    result = this.MultipliedMeasures.CompareTo(other.MultipliedMeasures);
-      //if (result == 0) {
-      //  result = this.Depth.CompareTo(other.Depth) + this.Width.CompareTo(other.Width);
-      //  if (result == 0) {        
-      //    result = this.Width.CompareTo(other.Width);
-    if (result == 0)               
-    result = this.Height.CompareTo(other.Height);
-      //  }
-      //}
+      int result = (this.Width * this.Depth).CompareTo(other.Width * other.Depth);
+
+      if (result == 0)
+        result = this.MultipliedMeasures.CompareTo(other.MultipliedMeasures);
+      if (result == 0)
+        result = this.Height.CompareTo(other.Height);
       return result;
-    }        
+    }
 
     public int CompareTo(object obj) {
-      if (obj.GetType().Equals(this.GetType()))
+      if (obj.GetType() == this.GetType())
         return this.CompareTo((CuboidPackingShape)obj);
       else return 0;
     }
 
-    #endregion 
+    #endregion
 
     private struct CuboidDiagonal {

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/PackingShape.cs

@@ -30 +30 @@
   [Item("PackingShape", "Represents an abstract shape to describe the measures and the positioning of objects related to bin-packing problems.")]
   [StorableClass]
-  public abstract class PackingShape<D> : NamedItem, IPackingShape
-    where D: class, IPackingDimensions
-  {
+  public abstract class PackingShape<D> : Item, IPackingShape
+    where D : class, IPackingDimensions {
     public static Type PositionType {
       get { return typeof(D); }
@@ -45 +44 @@
     public abstract D Origin { get; }
 
-    public PackingShape(int[] measures) {
+    protected PackingShape(int[] measures) {
       InitializeFromMeasures(measures);
     }
-    public PackingShape() {
 
-    }
+    protected PackingShape() { }