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

Timestamp:

01/26/12 00:36:45 (12 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

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPMoveGenerator.cs (modified) (2 diffs)

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."));
     }
   }