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

Timestamp:

07/12/16 18:02:28 (8 years ago)

Author:

gkronber

Message:

#1966: removed interface IRegularPacking shape (=> all our packing shapes are regular)

Location:

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

Files:

• Analyzers/BestBinPackingSolutionAnalyzer.cs (modified) (1 diff)
• BinPackingProblem.cs (modified) (2 diffs)
• Evaluators/BinUtilizationRegularIdenticalBinEvaluator.cs (modified) (1 diff)
• Evaluators/PackingRatioRegularIdenticalBinEvaluator.cs (modified) (1 diff)
• Evaluators/RegularSimpleRotationIdenticalBinPackingPlanEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (1 diff)
• Interfaces/IPackingShape.cs (modified) (2 diffs)
• PackingMoveEvaluator.cs (modified) (1 diff)
• PackingShape.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Analyzers/BestBinPackingSolutionAnalyzer.cs

@@ -38 +38 @@
   public class BestBinPackingSolutionAnalyzer<D, B, I> : BinPackingAnalyzer<D, B, I>, IStochasticOperator
     where D : class, IPackingDimensions
-    where B : PackingShape<D>, IPackingBin, IRegularPackingShape
-    where I : PackingShape<D>, IPackingItem, IRegularPackingShape {
+    where B : PackingShape<D>, IPackingBin
+    where I : PackingShape<D>, IPackingItem {
 
     public ILookupParameter<IRandom> RandomParameter {

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

@@ -43 +43 @@
   public abstract class BinPackingProblem<D, B, I> : SingleObjectiveHeuristicOptimizationProblem<IPackingPlanEvaluationAlgorithm, IPackingSolutionCreator> 
     where D : class, IPackingDimensions 
-    where B : PackingShape<D>, IPackingBin, IRegularPackingShape, new()
-    where I : PackingShape<D>, IPackingItem, IRegularPackingShape, new () {
+    where B : PackingShape<D>, IPackingBin, new()
+    where I : PackingShape<D>, IPackingItem, new () {
 
 
@@ -150 +150 @@
     protected void ApplyHorizontalOrientation() {
       PackingBinMeasures.ApplyHorizontalOrientation();
-      foreach (IRegularPackingShape shape in PackingItemMeasures) {
+      foreach (IPackingShape shape in PackingItemMeasures) {
         shape.ApplyHorizontalOrientation();
       }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/BinUtilizationRegularIdenticalBinEvaluator.cs

@@ -34 +34 @@
   public abstract class BinUtilizationRegularIdenticalBinEvaluator<D, B, I> : RegularSimpleRotationIdenticalBinPackingPlanEvaluator<D, B, I>
     where D : class, IPackingDimensions
-    where B : PackingShape<D>, IPackingBin, IRegularPackingShape
-    where I : PackingShape<D>, IPackingItem, IRegularPackingShape {
+    where B : PackingShape<D>, IPackingBin
+    where I : PackingShape<D>, IPackingItem {
 
     [StorableConstructor]

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/PackingRatioRegularIdenticalBinEvaluator.cs

@@ -34 +34 @@
   public abstract class PackingRatioRegularIdenticalBinEvaluator<D, B, I> : RegularSimpleRotationIdenticalBinPackingPlanEvaluator<D, B, I>
     where D : class, IPackingDimensions
-    where B : PackingShape<D>, IPackingBin, IRegularPackingShape
-    where I : PackingShape<D>, IPackingItem, IRegularPackingShape {
+    where B : PackingShape<D>, IPackingBin
+    where I : PackingShape<D>, IPackingItem {
 
     [StorableConstructor]

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/RegularSimpleRotationIdenticalBinPackingPlanEvaluator.cs

@@ -33 +33 @@
   public abstract class RegularSimpleRotationIdenticalBinPackingPlanEvaluator<D, B, I> : PackingPlanEvaluator<D, B, I>
     where D : class, IPackingDimensions
-    where B : PackingShape<D>, IPackingBin, IRegularPackingShape
-    where I : PackingShape<D>, IPackingItem, IRegularPackingShape {
+    where B : PackingShape<D>, IPackingBin
+    where I : PackingShape<D>, IPackingItem {
 
     #region Parameter Properties

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

@@ -282 +282 @@
     <Compile Include="PackingDimensions.cs" />
     <Compile Include="PackingMoveEvaluator.cs" />
-    <Compile Include="Interfaces\IRegularPackingShape.cs" />
     <Compile Include="Interfaces\IPackingBin.cs" />
     <Compile Include="Interfaces\IPackingItem.cs" />

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Core;
 
@@ -25 +26 @@
   // a packing shape represents a physical object of correct dimension (2d or 3d) 
   // packing bins (containers) and packing items are both packing shapes
-  public interface IPackingShape : IItem { }
+  public interface IPackingShape : IItem, IComparable {
+    int Volume { get; }
+    void ApplyHorizontalOrientation();
+  }
 }

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

@@ -38 +38 @@
   public abstract class PackingMoveEvaluator<D, B, I> : SingleSuccessorOperator, IPackingMoveEvaluator, IMoveOperator
     where D : class, IPackingDimensions
-    where B : PackingShape<D>, IPackingBin, IRegularPackingShape
-    where I : PackingShape<D>, IPackingItem, IRegularPackingShape {     
+    where B : PackingShape<D>, IPackingBin
+    where I : PackingShape<D>, IPackingItem {     
     public override bool CanChangeName {
       get { return false; }

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

@@ -79 +79 @@
     }
 
+    public abstract void ApplyHorizontalOrientation();
+    public abstract int CompareTo(object obj);
+
     public IKeyedItemCollection<string, IParameter> Parameters { get; private set; }
   }