Changeset 15504 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapLocationManipulator.cs

Timestamp:

12/10/17 22:11:10 (6 years ago)

Author:

abeham

Message:

#1614: refactored code

• change problem to derive from basic problem
• using a combined instance class instead of individual parameters

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapLocationManipulator.cs (modified) (5 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapLocationManipulator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -33 +31 @@
   [Item("SwapLocationManipluator", "Swaps two locations by exchanging all equipments between the locations.")]
   [StorableClass]
-  public class SwapLocationManipluator : GQAPManipulator, ICapacitiesAwareGQAPOperator {
-
-    public ILookupParameter<DoubleArray> CapacitiesParameter {
-      get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }
-    }
-
+  public class SwapLocationManipluator : GQAPManipulator {
+    
     [StorableConstructor]
     protected SwapLocationManipluator(bool deserializing) : base(deserializing) { }
@@ -44 +38 @@
     public SwapLocationManipluator()
       : base() {
-      Parameters.Add(new LookupParameter<DoubleArray>("Capacities", GeneralizedQuadraticAssignmentProblem.CapacitiesDescription));
     }
 
@@ -72 +65 @@
     }
 
-    protected override void Manipulate(IRandom random, IntegerVector vector) {
-      Apply(random, vector, CapacitiesParameter.ActualValue.Length);
+    protected override void Manipulate(IRandom random, IntegerVector vector, GQAPInstance problemInstance) {
+      Apply(random, vector, problemInstance.Capacities.Length);
     }
   }