Changeset 15504 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.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/MultiGQAPManipulator.cs (modified) (5 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.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.
@@ -35 +35 @@
   [Item("MultiGQAPManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
   [StorableClass]
-  public class MultiGQAPManipulator : StochasticMultiBranch<IGQAPManipulator>, IGQAPManipulator {
+  public class MultiGQAPManipulator : StochasticMultiBranch<IGQAPManipulator>, IGQAPManipulator,
+    IProblemInstanceAwareGQAPOperator {
     public override bool CanChangeName {
       get { return false; }
@@ -46 +47 @@
       get { return (ILookupParameter<IntegerVector>)Parameters["Assignment"]; }
     }
+    public ILookupParameter<GQAPInstance> ProblemInstanceParameter {
+      get { return (ILookupParameter<GQAPInstance>)Parameters["ProblemInstance"]; }
+    }
 
     [StorableConstructor]
@@ -53 +57 @@
       : base() {
       Parameters.Add(new LookupParameter<IntegerVector>("Assignment", GQAPSolutionCreator.AssignmentDescription));
+      Parameters.Add(new LookupParameter<GQAPInstance>("ProblemInstance", GQAP.ProblemInstanceDescription));
+
       foreach (Type type in ApplicationManager.Manager.GetTypes(typeof(IGQAPManipulator))) {
         if (!typeof(MultiOperator<IGQAPManipulator>).IsAssignableFrom(type))
@@ -73 +79 @@
 
     private void Parameterize() {
-      foreach (var op in Operators.OfType<IGQAPManipulator>())
+      foreach (var op in Operators.OfType<IGQAPManipulator>()) {
         op.AssignmentParameter.ActualName = AssignmentParameter.Name;
-      foreach (var op in Operators.OfType<IStochasticOperator>())
+        op.AssignmentParameter.Hidden = true;
+      }
+      foreach (var op in Operators.OfType<IStochasticOperator>()) {
         op.RandomParameter.ActualName = RandomParameter.Name;
+        op.RandomParameter.Hidden = true;
+      }
+      foreach (var op in Operators.OfType<IProblemInstanceAwareGQAPOperator>()) {
+        op.ProblemInstanceParameter.ActualName = ProblemInstanceParameter.Name;
+        op.ProblemInstanceParameter.Hidden = true;
+      }
     }
 
     public override IOperation InstrumentedApply() {
       if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one manipulator to choose from.");
-      return base.Apply();
+      return base.InstrumentedApply();
     }
   }