Changeset 7431 for trunk/sources/HeuristicLab.Optimization

Timestamp:

01/31/12 13:09:08 (13 years ago)

Author:

abeham

Message:

#1769

• removed private field and stored the collection in the parameter only
• forwarded calls to Operators to the parameter
• put StorableOperators property out of use as the collection is persisted through the parameters' persistence

File:

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

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

@@ -44 +44 @@
 
     [StorableConstructor]
-    protected Problem(bool deserializing)
-      : base(deserializing) {
-      operators = new OperatorCollection(); // operators must never be null
-    }
+    protected Problem(bool deserializing) : base(deserializing) { }
     protected Problem(Problem original, Cloner cloner)
       : base(original, cloner) {
-      operators = cloner.Clone(original.operators);
       RegisterEventHandlers();
     }
@@ -56 +52 @@
     protected Problem()
       : base() {
-      operators = new OperatorCollection();
-      Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", operators, false));
+      Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", new OperatorCollection(), false));
       OperatorsParameter.Hidden = true;
       RegisterEventHandlers();
@@ -64 +59 @@
     [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();
     }
@@ -81 +69 @@
 
     #region properties
-    private OperatorCollection operators;
+    // BackwardsCompatibility3.3
+    #region Backwards compatible code, remove with 3.4
     [Storable(Name = "Operators")]
     private IEnumerable<IOperator> StorableOperators {
-      get { return operators; }
-      set { operators = new OperatorCollection(value); }
+      get { return null; }
+      set {
+        if (!Parameters.ContainsKey(OperatorsParameterName)) {
+          Parameters.Add(new FixedValueParameter<OperatorCollection>(OperatorsParameterName, "The operators that the problem provides to the algorithms.", new OperatorCollection(value), false));
+          OperatorsParameter.Hidden = true;
+        }
+      }
     }
+    #endregion
     protected OperatorCollection Operators {
-      get { return this.operators; }
+      get {
+        // 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.", new OperatorCollection(), false));
+          OperatorsParameter.Hidden = true;
+        }
+        #endregion
+        return OperatorsParameter.Value;
+      }
     }
-    IEnumerable<IOperator> IProblem.Operators { get { return operators; } }
+    IEnumerable<IOperator> IProblem.Operators { get { return Operators; } }
     #endregion