Changeset 7413 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves

Timestamp:

01/26/12 00:36:45 (13 years ago)

Author:

abeham

Message:

#1614

• renamed AssemblyInfo frame files to proper name
• fixed discovery of move operators
• fixed a bug in the move evaluator
• fixed a bug in the DiscreteLocationCrossover

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves

Files:

• GQAPMoveGenerator.cs (modified) (2 diffs)
• GQAPNMoveGenerator.cs (modified) (2 diffs)
• NMoveMaker.cs (modified) (2 diffs)
• StochasticNMoveMultiMoveGenerator.cs (modified) (1 diff)
• StochasticNMoveSingleMoveGenerator.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPMoveGenerator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -29 +31 @@
   [Item("GQAPMoveGenerator", "Base class for move generators for the Generalized Quadratic Assignment Problem.")]
   [StorableClass]
-  public class GQAPMoveGenerator : SingleSuccessorOperator, IMoveGenerator {
+  public abstract class GQAPMoveGenerator : SingleSuccessorOperator, IMoveGenerator, IGQAPMoveOperator {
+
+    public ILookupParameter<IntegerVector> AssignmentParameter {
+      get { return (ILookupParameter<IntegerVector>)Parameters["Assignment"]; }
+    }
 
     [StorableConstructor]
     protected GQAPMoveGenerator(bool deserializing) : base(deserializing) { }
-    protected GQAPMoveGenerator(GQAPMoveGenerator original, Cloner cloner)
-      : base(original, cloner) {
-      // TODO: All fields, especially storable fields, need to be deep-cloned here
-      // myField = cloner.Clone(original.myField);
-    }
+    protected GQAPMoveGenerator(GQAPMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public GQAPMoveGenerator()
       : base() {
-      // TODO: Add construction logic here
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new GQAPMoveGenerator(this, cloner);
+      Parameters.Add(new LookupParameter<IntegerVector>("Assignment", "The current equipment-location assignment."));
     }
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPNMoveGenerator.cs

@@ -34 +34 @@
   public abstract class GQAPNMoveGenerator : GQAPMoveGenerator, IGQAPNMoveOperator {
 
-    public ILookupParameter<IntegerVector> AssignmentParameter {
-      get { return (ILookupParameter<IntegerVector>)Parameters["Assignment"]; }
-    }
     public ILookupParameter<NMove> MoveParameter {
       get { return (ILookupParameter<NMove>)Parameters["Move"]; }
@@ -49 +46 @@
     public GQAPNMoveGenerator()
       : base() {
-      Parameters.Add(new LookupParameter<IntegerVector>("Assignment", "The current equipment-location assignment."));
       Parameters.Add(new LookupParameter<NMove>("Move", "The move to generate."));
       Parameters.Add(new ValueLookupParameter<IntValue>("N", "The maximum number of equipment(s) that should be moved.", new IntValue(2)));

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveMaker.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +32 @@
   [Item("NMoveMaker", "Performs an n-move.")]
   [StorableClass]
-  public class NMoveMaker : SingleSuccessorOperator, IGQAPNMoveOperator {
+  public class NMoveMaker : SingleSuccessorOperator, IGQAPNMoveOperator, IMoveMaker {
 
     public ILookupParameter<IntegerVector> AssignmentParameter {

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveMultiMoveGenerator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  [Item("Stochastic 1-move MultiMoveGenerator", "Randomly samples a number of moves according to the 1-move described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
+  [Item("Stochastic n-move MultiMoveGenerator", "Randomly samples a number of n-moves.")]
   [StorableClass]
   public class StochasticNMoveMultiMoveGenerator : GQAPNMoveGenerator, ILocationAwareGQAPOperator, IMultiMoveGenerator, IStochasticOperator {

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  [Item("Stochastic 1-move and 2-move SingleMoveGenerator", "Randomly samples a single 1-move or 2-move as described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
+  [Item("Stochastic n-move SingleMoveGenerator", "Randomly samples a single n-move.")]
   [StorableClass]
   public class StochasticNMoveSingleMoveGenerator : GQAPNMoveGenerator, ILocationAwareGQAPOperator, ISingleMoveGenerator, IStochasticOperator {