Changeset 8004 for trunk/sources/HeuristicLab.Optimization

Timestamp:

06/14/12 09:53:42 (13 years ago)

Author:

mkommend

Message:

#1864: Corrected deserialization of the operator collection.

File:

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

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

@@ -34 +34 @@
   [StorableClass]
   public abstract class Problem : ParameterizedNamedItem, IProblem {
-    private static readonly string OperatorsParameterName = "Operators";
+    private const string OperatorsParameterName = "Operators";
     public IFixedValueParameter<ItemCollection<IItem>> OperatorsParameter {
       get { return (IFixedValueParameter<ItemCollection<IItem>>)Parameters[OperatorsParameterName]; }
@@ -61 +61 @@
       // BackwardsCompatibility3.3
       #region Backwards compatible code, remove with 3.4
-      if (Parameters.ContainsKey(OperatorsParameterName) && Parameters[OperatorsParameterName] is FixedValueParameter<OperatorCollection>) {
-        OperatorCollection tmp = ((IFixedValueParameter<OperatorCollection>)Parameters[OperatorsParameterName]).Value;
-        Parameters.Remove(OperatorsParameterName);
-        Parameters.Add(new FixedValueParameter<ItemCollection<IItem>>(OperatorsParameterName, "The operators and items that the problem provides to the algorithms.", new ItemCollection<IItem>(tmp), false));        
-        OperatorsParameter.Hidden = true;
+      IParameter operatorsParam;
+      if (Parameters.TryGetValue(OperatorsParameterName, out operatorsParam)) {
+        var operators = operatorsParam.ActualValue as OperatorCollection;
+        if (operators != null) {
+          Parameters.Remove(OperatorsParameterName);
+          Parameters.Add(new FixedValueParameter<ItemCollection<IItem>>(OperatorsParameterName, "The operators and items that the problem provides to the algorithms.", new ItemCollection<IItem>(operators), false));
+          OperatorsParameter.Hidden = true;
+        }
       }
       #endregion
@@ -84 +87 @@
     private IEnumerable<IOperator> StorableOperators {
       set {
+        IParameter operatorsParam;
+        if (Parameters.TryGetValue(OperatorsParameterName, out operatorsParam)) {
+          var items = operatorsParam.ActualValue as ItemCollection<IItem>;
+          if (items == null) Parameters.Remove(operatorsParam);
+        }
+
+        //necessary to convert old experiments files where no parameter was used for saving the operators
         if (!Parameters.ContainsKey(OperatorsParameterName)) {
-          Parameters.Add(new FixedValueParameter<ItemCollection<IItem>>(OperatorsParameterName, "The operators and items that the problem provides to the algorithms.", new ItemCollection<IItem>(value), false));
+          Parameters.Add(new FixedValueParameter<ItemCollection<IItem>>(OperatorsParameterName, "The operators and items that the problem provides to the algorithms.", new ItemCollection<IItem>(), false));
           OperatorsParameter.Hidden = true;
         }
+        if (value != null) Operators.AddRange(value);
       }
     }