Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingMoveEvaluator.cs

Timestamp:

07/20/16 14:02:36 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingMoveEvaluator.cs (modified) (6 diffs)

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

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PackingEncoding;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
@@ -32 +33 @@
   [Item("PackingMoveEvaluator", "A base class for operators which evaluate Packing-Solution moves.")]
   [StorableClass]
-  public abstract class PackingMoveEvaluator<D, B, I> : SingleSuccessorOperator, IPackingMoveEvaluator, IMoveOperator
+  public abstract class PackingMoveEvaluator<D, B, I, M> : SingleSuccessorOperator, IPackingMoveEvaluator
     where D : class, IPackingPosition
     where B : PackingShape<D>
-    where I : PackingShape<D>, IPackingItem {     
+    where I : PackingShape<D>, IPackingItem 
+    where M : IItem {     
     public override bool CanChangeName {
       get { return false; }
@@ -61 +63 @@
       get { return (ScopeParameter)Parameters["CurrentScope"]; }
     }
-    public ILookupParameter<IPackingMove> PackingMoveParameter {
-      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
+    public ILookupParameter<IPackingMove<M>> PackingMoveParameter {
+      get { return (ILookupParameter<IPackingMove<M>>)Parameters["PackingMove"]; }
     }  
     
     [StorableConstructor]
     protected PackingMoveEvaluator(bool deserializing) : base(deserializing) { }
-    protected PackingMoveEvaluator(PackingMoveEvaluator<D, B, I> original, Cloner cloner) : base(original, cloner) { }
+    protected PackingMoveEvaluator(PackingMoveEvaluator<D, B, I, M> original, Cloner cloner) : base(original, cloner) { }
     protected PackingMoveEvaluator()
       : base() {
@@ -77 +79 @@
       Parameters.Add(new ValueLookupParameter<IEvaluator>("PackingPlanEvaluator", "The actual packing plan evaluation operator."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the decoded solution should be added to."));
-      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<IPackingMove<M>>("PackingMove", "The move to evaluate."));
     }
 
@@ -83 +85 @@
 
     public override IOperation Apply() {
-      IPackingMove move = PackingMoveParameter.ActualValue;
-      IPackingSolutionEncoding newSolution = move.GetSolutionAfterMove();
+      IPackingMove<M> move = PackingMoveParameter.ActualValue;
+      var newSolution = move.GetSolutionAfterMove();
       CurrentScopeParameter.ActualValue.Variables.Add(new Variable("MovedSolution", newSolution));
 
@@ -93 +95 @@
       CurrentScopeParameter.ActualValue.Variables.Add(new Variable("PackingPlanAfterMove", packingPlan));
 
-      DoubleValue quality = PackingRatioEvaluator<D, B, I>.CalculatePackingRatio(packingPlan);
+      var quality = PackingRatioEvaluator<D, B, I>.CalculatePackingRatio(packingPlan);
 
-      double moveQuality = quality.Value;
+      double moveQuality = quality;
 
       if (MoveQualityParameter.ActualValue == null) MoveQualityParameter.ActualValue = new DoubleValue(moveQuality);