Changeset 9495 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves

Timestamp:

05/15/13 22:23:36 (12 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;

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SingleGrouping

Files:

• SingleGroupingMove.cs (modified) (2 diffs)
• SingleGroupingMoveGenerator.cs (modified) (3 diffs)
• SingleGroupingMoveHardTabuCriterion.cs (modified) (3 diffs)
• SingleGroupingMoveMaker.cs (modified) (3 diffs)
• SingleGroupingMoveSoftTabuCriterion.cs (modified) (3 diffs)
• SingleGroupingTabuMaker.cs (modified) (3 diffs)
• StochasticSingleGroupingMoveGenerator.cs (added)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SingleGrouping/SingleGroupingMove.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking.Interfaces;
 
 namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
   [Item("Single Grouping Move", "A move on a grouping vector that is specified by a single group-assignment-index.")]
   [StorableClass]
-  public class SingleGroupingMove : Item {
+  public class SingleGroupingMove : Item, IPackingMove{
     [Storable]
     public int Index { get; protected set; }
@@ -53 +55 @@
       return new SingleGroupingMove(this, cloner);
     }
+
+    public IPackingSolutionEncoding GetSolutionAfterMove() {
+      GroupingVectorEncoding newSolution = new GroupingVectorEncoding();
+      newSolution.GroupingVector = new IntegerVector(GroupingVector.GroupingVector);
+      newSolution.GroupingVector[Index] = NewGroup;
+      return newSolution;
+    }
   }
 }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SingleGrouping/SingleGroupingMoveGenerator.cs

@@ -38 +38 @@
       get { return (ILookupParameter<GroupingVectorEncoding>)Parameters["GroupingVector"]; }
     }
-    public ILookupParameter<SingleGroupingMove> SingleGroupingMoveParameter {
-      get { return (LookupParameter<SingleGroupingMove>)Parameters["SingleGroupingMove"]; }
+    public ILookupParameter<IPackingMove> PackingMoveParameter {
+      get { return (LookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     }
     protected ScopeParameter CurrentScopeParameter {
@@ -51 +51 @@
       : base() {
       Parameters.Add(new LookupParameter<GroupingVectorEncoding>("GroupingVector", "The grouping vector for which moves should be generated."));
-      Parameters.Add(new LookupParameter<SingleGroupingMove>("SingleGroupingMove", "The moves that should be generated in subscopes."));
+      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The moves that should be generated in subscopes."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the moves should be added as subscopes."));
     }
@@ -61 +61 @@
       for (int i = 0; i < moveScopes.Length; i++) {
         moveScopes[i] = new Scope(i.ToString());
-        moveScopes[i].Variables.Add(new Variable(SingleGroupingMoveParameter.ActualName, moves[i]));
+        moveScopes[i].Variables.Add(new Variable(PackingMoveParameter.ActualName, moves[i]));
       }
       CurrentScopeParameter.ActualValue.SubScopes.AddRange(moveScopes);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SingleGrouping/SingleGroupingMoveHardTabuCriterion.cs

@@ -38 +38 @@
       get { return false; }
     }
-    public ILookupParameter<SingleGroupingMove> SingleGroupingMoveParameter {
-      get { return (ILookupParameter<SingleGroupingMove>)Parameters["SingleGroupingMove"]; }
+    public ILookupParameter<IPackingMove> PackingMoveParameter {
+      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     }
     public ILookupParameter<GroupingVectorEncoding> GroupingVectorParameter {
@@ -65 +65 @@
     public SingleGroupingMoveHardTabuCriterion()
       : base() {
-      Parameters.Add(new LookupParameter<SingleGroupingMove>("SingleGroupingMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<GroupingVectorEncoding>("GroupingVector", "The solution to evaluate."));
       Parameters.Add(new LookupParameter<BoolValue>("MoveTabu", "The variable to store if a move was tabu."));
@@ -80 +80 @@
     public override IOperation Apply() {
       ItemList<IItem> tabuList = TabuListParameter.ActualValue;
-      SingleGroupingMove move = SingleGroupingMoveParameter.ActualValue;
+      SingleGroupingMove move = PackingMoveParameter.ActualValue as SingleGroupingMove;
       GroupingVectorEncoding groupingVector = GroupingVectorParameter.ActualValue;
       int length = groupingVector.GroupingVector.Length;

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SingleGrouping/SingleGroupingMoveMaker.cs

@@ -42 +42 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["MoveQuality"]; }
     }
-    public ILookupParameter<SingleGroupingMove> SingleGroupingMoveParameter {
-      get { return (ILookupParameter<SingleGroupingMove>)Parameters["SingleGroupingMove"]; }
+    public ILookupParameter<IPackingMove> PackingMoveParameter {
+      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     }
     public ILookupParameter<GroupingVectorEncoding> GroupingVectorParameter {
       get { return (ILookupParameter<GroupingVectorEncoding>)Parameters["GroupingVector"]; }
+    }
+    public ILookupParameter<IPackingPlan> PackingPlanParameter {
+      get { return (ILookupParameter<IPackingPlan>)Parameters["PackingPlan"]; }
+    }
+    public ILookupParameter<IPackingPlan> PackingPlanAfterMoveParameter {
+      get { return (ILookupParameter<IPackingPlan>)Parameters["PackingPlanAfterMove"]; }
     }
 
@@ -55 +61 @@
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the solution."));
-      Parameters.Add(new LookupParameter<SingleGroupingMove>("SingleGroupingMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The relative quality of the move."));
       Parameters.Add(new LookupParameter<GroupingVectorEncoding>("GroupingVector", "The solution as grouping vector."));
+      Parameters.Add(new LookupParameter<IPackingPlan>("PackingPlan", "The currently best performing, decoded bin-packing solution represented as generalized packing-plan."));
+      Parameters.Add(new LookupParameter<IPackingPlan>("PackingPlanAfterMove", "The moved and decoded bin-packing solution represented as generalized packing-plan."));
     }
 
@@ -65 +73 @@
 
     public override IOperation Apply() {
-      SingleGroupingMove move = SingleGroupingMoveParameter.ActualValue;
+      IPackingMove move = PackingMoveParameter.ActualValue;
       GroupingVectorEncoding groupingVector = GroupingVectorParameter.ActualValue;
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;
       DoubleValue quality = QualityParameter.ActualValue;
 
-      groupingVector.GroupingVector[move.Index] = move.NewGroup;
+      groupingVector.GroupingVector = (move.GetSolutionAfterMove() as GroupingVectorEncoding).GroupingVector;
+      PackingPlanParameter.ActualValue = PackingPlanAfterMoveParameter.ActualValue;
 
       quality.Value = moveQuality.Value;

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SingleGrouping/SingleGroupingMoveSoftTabuCriterion.cs

@@ -38 +38 @@
       get { return false; }
     }
-    public ILookupParameter<SingleGroupingMove> SingleGroupingMoveParameter {
-      get { return (ILookupParameter<SingleGroupingMove>)Parameters["SingleGroupingMove"]; }
+    public ILookupParameter<IPackingMove> PackingMoveParameter {
+      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     }
     public ILookupParameter<GroupingVectorEncoding> GroupingVectorParameter {
@@ -65 +65 @@
     public SingleGroupingMoveSoftTabuCriterion()
       : base() {
-      Parameters.Add(new LookupParameter<SingleGroupingMove>("SingleGroupingMove", "The move to evaluate."));
+      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<GroupingVectorEncoding>("GroupingVector", "The solution to evaluate."));
       Parameters.Add(new LookupParameter<BoolValue>("MoveTabu", "The variable to store if a move was tabu."));
@@ -80 +80 @@
     public override IOperation Apply() {
       ItemList<IItem> tabuList = TabuListParameter.ActualValue;
-      SingleGroupingMove move = SingleGroupingMoveParameter.ActualValue;
+      SingleGroupingMove move = PackingMoveParameter.ActualValue as SingleGroupingMove;
       GroupingVectorEncoding groupingVector = GroupingVectorParameter.ActualValue;
       int length = groupingVector.GroupingVector.Length;

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SingleGrouping/SingleGroupingTabuMaker.cs

@@ -32 +32 @@
   [StorableClass]
   public class SingleGroupingTabuMaker : TabuMaker, IGroupingVectorMoveOperator{
-    public ILookupParameter<SingleGroupingMove> SingleGroupingMoveParameter {
-      get { return (ILookupParameter<SingleGroupingMove>)Parameters["SingleGroupingMove"]; }
+    public ILookupParameter<IPackingMove> PackingMoveParameter {
+      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     }
     public ILookupParameter<GroupingVectorEncoding> GroupingVectorParameter {
@@ -44 +44 @@
     public SingleGroupingTabuMaker()
       : base() {
-      Parameters.Add(new LookupParameter<SingleGroupingMove>("SingleGroupingMove", "The move to evaluate."));
+        Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
       Parameters.Add(new LookupParameter<GroupingVectorEncoding>("GroupingVector", "The solution to evaluate."));
     }
@@ -53 +53 @@
 
     protected override IItem GetTabuAttribute(bool maximization, double quality, double moveQuality) {
-      SingleGroupingMove move = SingleGroupingMoveParameter.ActualValue;
+      IPackingMove move = PackingMoveParameter.ActualValue;
       GroupingVectorEncoding groupingVector = GroupingVectorParameter.ActualValue;    
       double baseQuality = moveQuality;
       if (maximization && quality > moveQuality || !maximization && quality < moveQuality) 
         baseQuality = quality; // we make an uphill move, the lower bound is the solution quality
-            
-      return new SingleGroupingMoveAttribute (move.Index, move.NewGroup, baseQuality);
+
+      var sgMove = move as SingleGroupingMove;
+      if (sgMove != null)
+        return new SingleGroupingMoveAttribute(sgMove.Index, sgMove.NewGroup, baseQuality);
+      else
+        return move.GetSolutionAfterMove();
     }
   }