Changeset 5160

Timestamp:

12/22/10 16:23:16 (13 years ago)

Author:

svonolfe

Message:

Merged changes from branch into trunk (#1343)

File:

• trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

@@ -96 +96 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new TabuSearchMainLoop(this, cloner);
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      #region Backwards compatible code
+      VariableCreator variableCreator = OperatorGraph.InitialOperator as VariableCreator;
+
+      if (variableCreator != null) {
+        if (!variableCreator.CollectedValues.ContainsKey("Memories")) {
+          variableCreator.CollectedValues.Add(new ValueParameter<VariableCollection>("Memories", new VariableCollection()));
+        }
+      }
+      #endregion
     }
 
@@ -153 +166 @@
       variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("EmptyNeighborhood", new BoolValue(false)));
       variableCreator.CollectedValues.Add(new ValueParameter<ItemList<IItem>>("TabuList", new ItemList<IItem>()));
+      variableCreator.CollectedValues.Add(new ValueParameter<VariableCollection>("Memories", new VariableCollection()));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));