Changeset 5723 for branches/QAP/HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs

Timestamp:

03/16/11 22:32:33 (13 years ago)

Author:

abeham

Message:

#1330

• Moved MDS into Analysis
• Added test with some simple examples

Location:

branches/QAP

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (copied) (copied from trunk/sources/HeuristicLab.Optimization)
• HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs (modified) (2 diffs)

branches/QAP

@@ -1 +1 @@
 *.suo
 TestResults
+*.testsettings

@@ -1 +1 @@
 *.suo
 TestResults
+*.testsettings

branches/QAP/HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs

@@ -41 +41 @@
       : base() {
       Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized."));
-      Parameters.Add(new ValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
+      Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
     }
 
-    public ValueParameter<BoolValue> MaximizationParameter {
+    [StorableHook(HookType.AfterDeserialization)]
+    protected virtual void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code (remove with 3.4)
+      if (BestKnownQualityParameter is ValueParameter<DoubleValue>) {
+        Parameters.Remove(BestKnownQualityParameterName);
+        Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem."));
+      }
+      #endregion
+    }
+
+    public IValueParameter<BoolValue> MaximizationParameter {
       get { return (ValueParameter<BoolValue>)Parameters[MaximizationParameterName]; }
     }
@@ -55 +66 @@
     }
 
-    public ValueParameter<DoubleValue> BestKnownQualityParameter {
-      get { return (ValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
+    public IValueParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
     }
     IParameter ISingleObjectiveProblem.BestKnownQualityParameter {

@@ -1 +1 @@
 *.suo
 TestResults
+*.testsettings