Changeset 14154 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding

Timestamp:

07/21/16 15:08:21 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding

Files:

• PermutationProblem.cs (modified) (2 diffs)
• Swap2MoveEvaluator.cs (modified) (1 diff)
• TranslocationMoveEvaluator.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding/PermutationProblem.cs

@@ -23 +23 @@
 
 using System.Linq;
+using System.Windows.Forms;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -72 +73 @@
       Encoding.ConfigureOperators(Operators.OfType<IOperator>());
 
-      // TODO: configure the move evaluators (add interface for my move evaluators)
+      foreach (var op in Operators.OfType<IOperator<Permutation>>()) {
+        op.BinShapeParameter.ActualName = BinShapeParameter.Name;
+        op.ItemsParameter.ActualName = ItemsParameter.Name;
+        op.SolutionEvaluatorParameter.ActualName = SolutionEvaluatorParameter.Name;
+        op.DecoderParameter.ActualName = DecoderParameter.Name;
+      }
     }
 

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding/Swap2MoveEvaluator.cs

@@ -50 +50 @@
       // uses full evaluation
       Swap2Manipulator.Apply(permutation, move.Index1, move.Index2);
-      var solution = PackingSolutionDecoderParameter.ActualValue.Decode(permutation, binShape, items);
+      var solution = DecoderParameter.ActualValue.Decode(permutation, binShape, items);
 
-      return PackingPlanEvaluatorParameter.ActualValue.Evaluate(solution);
+      return SolutionEvaluatorParameter.ActualValue.Evaluate(solution);
     }
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PermutationEncoding/TranslocationMoveEvaluator.cs

@@ -51 +51 @@
       // uses full evaluation
       TranslocationManipulator.Apply(permutation, move.Index1, move.Index2, move.Index3);
-      var solution = PackingSolutionDecoderParameter.ActualValue.Decode(permutation, binShape, items);
+      var solution = DecoderParameter.ActualValue.Decode(permutation, binShape, items);
 
-      return PackingPlanEvaluatorParameter.ActualValue.Evaluate(solution);
+      return SolutionEvaluatorParameter.ActualValue.Evaluate(solution);
     }
   }