Ignore:
Timestamp:
01/12/16 10:42:58 (5 years ago)
Author:
gkronber
Message:

#1966: fixed various problems: bugs in cloning, bugs in persistence, method names, various minor improvements of source code for readability.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Shapes/PackingShape.cs

    r13461 r13497  
    3030  [Item("PackingShape", "Represents an abstract shape to describe the measures and the positioning of objects related to bin-packing problems.")]
    3131  [StorableClass]
    32   public abstract class PackingShape<D> : Item, IPackingShape
    33     where D : class, IPackingDimensions {
     32  public abstract class PackingShape<T> : Item, IPackingShape
     33    where T : class, IPackingDimensions {
    3434    public static Type PositionType {
    35       get { return typeof(D); }
     35      get { return typeof(T); }
    3636    }
    3737
    38     public abstract bool EnclosesPoint(D myPosition, D checkedPoint);
    39     public abstract bool Encloses(D checkedPosition, PackingShape<D> checkedShape);
    40     public abstract bool Overlaps(D myPosition, D checkedPosition, PackingShape<D> checkedShape);
     38    public abstract bool EnclosesPoint(T myPosition, T checkedPoint);
     39    public abstract bool Encloses(T checkedPosition, PackingShape<T> checkedShape);
     40    public abstract bool Overlaps(T myPosition, T checkedPosition, PackingShape<T> checkedShape);
    4141    public abstract void InitializeFromMeasures(int[] measures);
    4242    public abstract int[] ToArray();
    4343    public abstract int MultipliedMeasures { get; }
    44     public abstract D Origin { get; }
     44    public abstract T Origin { get; }
    4545
    4646    protected PackingShape(int[] measures) {
     
    5353    [StorableConstructor]
    5454    protected PackingShape(bool deserializing) : base(deserializing) { }
    55     protected PackingShape(PackingShape<D> original, Cloner cloner)
     55    protected PackingShape(PackingShape<T> original, Cloner cloner)
    5656      : base(original, cloner) {
    5757    }
Note: See TracChangeset for help on using the changeset viewer.