Changeset 11576 for branches/OptimizationNetworks/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3

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.VariableNeighborhoodSearch/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs (modified) (1 diff)

branches/OptimizationNetworks/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Plugin.cs.frame

@@ -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.
@@ -26 +26 @@
   /// Plugin class for HeuristicLab.Algorithms.VariableNeighborhoodSearch plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Algorithms.VariableNeighborhoodSearch", "3.3.9.$WCREV$")]
+  [Plugin("HeuristicLab.Algorithms.VariableNeighborhoodSearch", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]  

branches/OptimizationNetworks/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.cs.frame

@@ -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.
@@ -31 +31 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2013 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2014 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -53 +53 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.9.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.10.$WCREV$")]

branches/OptimizationNetworks/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.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.
@@ -283 +283 @@
     private void ParameterizeLocalImprovementOperators() {
       foreach (ILocalImprovementOperator op in LocalImprovementParameter.ValidValues) {
-        if (op != LocalImprovementParameter.Value) op.Problem = null;
         op.MaximumIterationsParameter.Value = null;
         op.MaximumIterationsParameter.ActualName = LocalImprovementMaximumIterationsParameter.Name;
-      }
-      if (LocalImprovementParameter.Value != null)
-        LocalImprovementParameter.Value.Problem = Problem;
+
+        var algOp = op as ILocalImprovementAlgorithmOperator;
+        if (algOp != null && algOp != LocalImprovementParameter.Value) algOp.Problem = null;
+      }
+      if (LocalImprovementParameter.Value is ILocalImprovementAlgorithmOperator)
+        ((ILocalImprovementAlgorithmOperator)LocalImprovementParameter.Value).Problem = Problem;
     }
     private void InitializeLocalImprovementOperators() {
-      if (Problem == null) {
-        LocalImprovementParameter.ValidValues.Clear();
-      } else {
-        foreach (var entry in LocalImprovementParameter.ValidValues.ToList()) {
-          if (!entry.ProblemType.IsAssignableFrom(Problem.GetType())) {
-            LocalImprovementParameter.ValidValues.Remove(entry);
-          }
+      LocalImprovementParameter.ValidValues.Clear();
+      if (Problem != null) {
+        // Regular ILocalImprovementOperators queried from Problem
+        foreach (var op in Problem.Operators.OfType<ILocalImprovementOperator>().Where(x => !(x is ILocalImprovementAlgorithmOperator))) {
+          LocalImprovementParameter.ValidValues.Add(op);
         }
-        foreach (ILocalImprovementOperator op in ApplicationManager.Manager.GetInstances<ILocalImprovementOperator>().Where(x => x.ProblemType.IsAssignableFrom(Problem.GetType()))) {
-          if (!LocalImprovementParameter.ValidValues.Any(x => x.GetType() == op.GetType()))
+        // ILocalImprovementAlgorithmOperators queried from ApplicationManager
+        var algOps = ApplicationManager.Manager.GetInstances<ILocalImprovementAlgorithmOperator>()
+                                               .Where(x => x.ProblemType.IsInstanceOfType(Problem));
+        foreach (var op in algOps) {
+          if (LocalImprovementParameter.ValidValues.All(x => x.GetType() != op.GetType()))
             LocalImprovementParameter.ValidValues.Add(op);
         }

branches/OptimizationNetworks/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.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.