Changeset 6938 for trunk/sources/HeuristicLab.Optimization/3.3

Timestamp:

10/26/11 23:36:10 (13 years ago)

Author:

abeham

Message:

#1663

• Added an *Operators* parameter in Problem
• Adapted KnapsackProblem, OnemaxProblem, SingleObjectiveTestFunctionProblem, TravelingSalesmanProblem, and VehicleRoutingProblem to derive from SingleObjectiveHeuristicOptimizationProblem<U, V>, renamed and marked old list as obsolete. Note that QuadraticAssignmentProblem, as well as the new DataAnalysisProblems already derived from that class. ArtificialAntProblem was not yet modified.
• Added some test lists and adapted SamplesTest
• Added plugin dependencies that the unit test was complaining about

File:

• trunk/sources/HeuristicLab.Optimization/3.3/Problems/Problem.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -32 +33 @@
   [StorableClass]
   public abstract class Problem : ParameterizedNamedItem, IProblem {
+    private static readonly string OperatorsParameterName = "Operators";
+
+    public IFixedValueParameter<OperatorCollection> OperatorsParameter {
+      get { return (IFixedValueParameter<OperatorCollection>)Parameters[OperatorsParameterName]; }
+    }
+
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
@@ -37 +44 @@
 
     [StorableConstructor]
-    protected Problem(bool deserializing) : base(deserializing) { }
+    protected Problem(bool deserializing)
+      : base(deserializing) {
+      operators = new OperatorCollection(); // operators must never be null
+    }
     protected Problem(Problem original, Cloner cloner)
       : base(original, cloner) {
@@ -47 +57 @@
       : base() {
       operators = new OperatorCollection();
+      Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", operators, false));
+      OperatorsParameter.Hidden = true;
       RegisterEventHandlers();
     }
@@ -52 +64 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      if (!Parameters.ContainsKey(OperatorsParameterName)) {
+        Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", operators, false));
+        OperatorsParameter.Hidden = true;
+      }
+      #endregion
       RegisterEventHandlers();
     }