Changeset 9495 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/MoveEvaluators/MultiComponentVectorMoveEvaluator.cs

Timestamp:

05/15/13 22:23:36 (11 years ago)

Author:

jhelm

Message:

#1966: Did some major refactoring in Decoder-classes; Added MoveEvaluator classes for different encodings and dimensions; Added new crossover-class for MCV encoding;

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/MoveEvaluators/MultiComponentVectorMoveEvaluator.cs (modified) (3 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/MoveEvaluators/MultiComponentVectorMoveEvaluator.cs

@@ -39 +39 @@
   [StorableClass]
   public class MultiComponentVectorMoveEvaluator : PackingMoveEvaluator<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>, ISingleObjectiveMoveEvaluator, IMultiComponentVectorMoveOperator{
-    public ILookupParameter<MultiComponentVectorMove> MultiComponentVectorMoveParameter {
-      get { return (ILookupParameter<MultiComponentVectorMove>)Parameters["MultiComponentVectorMove"]; }  
+    public ILookupParameter<IPackingMove> MultiComponentVectorMoveParameter {
+      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }  
     }                
     public ILookupParameter<MultiComponentVectorEncoding> MultiComponentVectorParameter {
@@ -51 +51 @@
     public MultiComponentVectorMoveEvaluator()
       : base() {
-      Parameters.Add(new LookupParameter<MultiComponentVectorMove>("MultiComponentVectorMove", "The move to evaluate."));
+        //Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<MultiComponentVectorEncoding>("MultiComponentVector", "The solution to evaluate."));
     }
@@ -60 +60 @@
 
     public override IOperation Apply() {
-      MultiComponentVectorEncoding MultiComponentVector = MultiComponentVectorParameter.ActualValue;
-      MultiComponentVectorMove move = MultiComponentVectorMoveParameter.ActualValue;
+      //MultiComponentVectorEncoding MultiComponentVector = MultiComponentVectorParameter.ActualValue;
+      //MultiComponentVectorMove move = MultiComponentVectorMoveParameter.ActualValue as MultiComponentVectorMove;
 
-      MultiComponentVectorEncoding newSolution = new MultiComponentVectorEncoding();
-      newSolution = move.GetVectorAfterMove();
+      //MultiComponentVectorEncoding newSolution = new MultiComponentVectorEncoding();
+      //newSolution = move.GetSolutionAfterMove() as MultiComponentVectorEncoding;
+      //CurrentScopeParameter.ActualValue.Variables.Add(new Variable("MovedSolution", newSolution));
 
-      var packingPlan = ExtremePointMultiComponentVectorDecoder3D.Decode(newSolution, PackingBinMeasuresParameter.ActualValue, PackingItemMeasuresParameter.ActualValue);
-      DoubleValue quality = PackingRatioRegularIdenticalBinEvaluator<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>.CalculatePackingRatio(
-        packingPlan, PackingBinMeasuresParameter.ActualValue, PackingItemMeasuresParameter.ActualValue);
+      //var packingPlan = ExtremePointMultiComponentVectorDecoder3D.Decode(newSolution, PackingBinMeasuresParameter.ActualValue, PackingItemMeasuresParameter.ActualValue);
+      //CurrentScopeParameter.ActualValue.Variables.Add(new Variable("PackingPlanAfterMove", packingPlan));
 
-      double moveQuality = quality.Value;
+      //DoubleValue quality = PackingRatioRegularIdenticalBinEvaluator<ThreeDimensionalPacking, CuboidPackingBin, CuboidPackingItem>.CalculatePackingRatio(
+      //  packingPlan, PackingBinMeasuresParameter.ActualValue, PackingItemMeasuresParameter.ActualValue);
 
-      if (MoveQualityParameter.ActualValue == null) MoveQualityParameter.ActualValue = new DoubleValue(moveQuality);
-      else MoveQualityParameter.ActualValue.Value = moveQuality;
+      //double moveQuality = quality.Value;
+
+      //if (MoveQualityParameter.ActualValue == null) MoveQualityParameter.ActualValue = new DoubleValue(moveQuality);
+      //else MoveQualityParameter.ActualValue.Value = moveQuality;
       return base.Apply();
     }