Changeset 5159

Timestamp:

12/22/10 16:13:11 (14 years ago)

Author:

svonolfe

Message:

Implemented review comments (#1343)

Location:

branches/TSMemory

Files:

• HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLab.Algorithms.TabuSearch-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.TabuSearch/3.3/Memory.cs (deleted)
• HeuristicLab.Algorithms.TabuSearch/3.3/MemoryCreator.cs (deleted)
• HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IMemory.cs (deleted)

branches/TSMemory/HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLab.Algorithms.TabuSearch-3.3.csproj

@@ -106 +106 @@
   <ItemGroup>
     <None Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame" />
-    <Compile Include="MemoryCreator.cs" />
-    <Compile Include="Memory.cs" />
     <Compile Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/TSMemory/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

@@ -84 +84 @@
     }
     #endregion
+
+    [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
+    }
 
     [StorableConstructor]
@@ -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<Memory>("Memory", new Memory()));
+      variableCreator.CollectedValues.Add(new ValueParameter<VariableCollection>("Memories", new VariableCollection()));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
 

branches/TSMemory/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -112 +112 @@
     <Compile Include="Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
-    <Compile Include="Interfaces\IMemory.cs" />
     <Compile Include="Interfaces\IMultiAnalyzer.cs" />
     <Compile Include="Interfaces\IIterationBasedOperator.cs" />