Changeset 6540

Timestamp:

07/07/11 16:20:22 (13 years ago)

Author:

abeham

Message:

#1469

• fixed backwards compatibility methods

Location:

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3

Files:

• Analyzers/BestQAPSolutionAnalyzer.cs (modified) (1 diff)
• QuadraticAssignmentProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/BestQAPSolutionAnalyzer.cs

@@ -93 +93 @@
       #region Backwards compatible code, remove with 3.4
       if (!Parameters.ContainsKey("BestKnownSolutions")) {
-        Parameters.Add(new LookupParameter<ItemList<Permutation>>("BestKnownSolutions", "The best known solutions of this QAP instance."));
+        Parameters.Add(new LookupParameter<ItemSet<Permutation>>("BestKnownSolutions", "The best known solutions of this QAP instance."));
+      } else if (Parameters["BestKnownSolutions"].GetType().Equals(typeof(LookupParameter<ItemList<Permutation>>))) {
+        string actualName = (Parameters["BestKnownSolutions"] as LookupParameter<ItemList<Permutation>>).ActualName;
+        Parameters.Remove("BestKnownSolutions");
+        Parameters.Add(new LookupParameter<ItemSet<Permutation>>("BestKnownSolutions", "The best known solutions of this QAP instance.", actualName));
       }
       #endregion

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -156 +156 @@
       } else if (Parameters["BestKnownSolutions"].GetType().Equals(typeof(OptionalValueParameter<ItemList<Permutation>>))) {
         ItemList<Permutation> list = ((OptionalValueParameter<ItemList<Permutation>>)Parameters["BestKnownSolutions"]).Value;
+        Parameters.Remove("BestKnownSolutions");
         Parameters.Add(new OptionalValueParameter<ItemSet<Permutation>>("BestKnownSolutions", "The list of best known solutions which is updated whenever a new better solution is found or may be the optimal solution if it is known beforehand.", new ItemSet<Permutation>(list)));
       }