Changeset 11576 for branches/OptimizationNetworks/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

Timestamp:

11/25/14 03:26:00 (10 years ago)

Author:

swagner

Message:

#2205: Merged changes r11062:11557 from trunk/sources into branches/OptimizationNetworks

Location:

branches/OptimizationNetworks

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified) (2 diffs)

branches/OptimizationNetworks/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -351 +351 @@
       MoveGeneratorParameter.ValidValues.Clear();
       if (Problem != null) {
+        // only add move generators that also have a corresponding tabu-checker and tabu-maker
         foreach (IMoveGenerator generator in Problem.Operators.OfType<IMoveGenerator>().OrderBy(x => x.Name)) {
-          MoveGeneratorParameter.ValidValues.Add(generator);
+          // get all interfaces equal to or derived from IMoveOperator that this move generator implements 
+          var moveTypes = generator.GetType().GetInterfaces().Where(x => typeof(IMoveOperator).IsAssignableFrom(x)).ToList();
+          // keep only the most specific interfaces (e.g. IPermutationTranslocationMoveOperator);
+          // by removing all interfaces for which a derived interface is also contained in the moveTypes set
+          foreach (var type in moveTypes.ToList()) {
+            if (moveTypes.Any(t => t != type && type.IsAssignableFrom(t))) moveTypes.Remove(type);
+          }
+          // keep move generator only if there is a tabu checker and a tabu maker that is derived from the same move interface
+          if (Problem.Operators.OfType<ITabuChecker>().Any(op => moveTypes.Any(m => m.IsInstanceOfType(op)))
+            && Problem.Operators.OfType<ITabuMaker>().Any(op => moveTypes.Any(m => m.IsInstanceOfType(op))))
+            MoveGeneratorParameter.ValidValues.Add(generator);
         }
       }