Changeset 5159


Ignore:
Timestamp:
12/22/10 16:13:11 (10 years ago)
Author:
svonolfe
Message:

Implemented review comments (#1343)

Location:
branches/TSMemory
Files:
3 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/TSMemory/HeuristicLab.Algorithms.TabuSearch/3.3/HeuristicLab.Algorithms.TabuSearch-3.3.csproj

    r5128 r5159  
    106106  <ItemGroup>
    107107    <None Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs.frame" />
    108     <Compile Include="MemoryCreator.cs" />
    109     <Compile Include="Memory.cs" />
    110108    <Compile Include="HeuristicLabAlgorithmsTabuSearchPlugin.cs" />
    111109    <Compile Include="Properties\AssemblyInfo.cs" />
  • branches/TSMemory/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.cs

    r5128 r5159  
    8484    }
    8585    #endregion
     86
     87    [StorableHook(HookType.AfterDeserialization)]
     88    private void AfterDeserialization() {
     89      #region Backwards compatible code
     90      VariableCreator variableCreator = OperatorGraph.InitialOperator as VariableCreator;
     91
     92      if (variableCreator != null) {
     93        if (!variableCreator.CollectedValues.ContainsKey("Memories")) {
     94          variableCreator.CollectedValues.Add(new ValueParameter<VariableCollection>("Memories", new VariableCollection()));
     95        }
     96      }
     97      #endregion
     98    }
    8699
    87100    [StorableConstructor]
     
    153166      variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("EmptyNeighborhood", new BoolValue(false)));
    154167      variableCreator.CollectedValues.Add(new ValueParameter<ItemList<IItem>>("TabuList", new ItemList<IItem>()));
    155       variableCreator.CollectedValues.Add(new ValueParameter<Memory>("Memory", new Memory()));
     168      variableCreator.CollectedValues.Add(new ValueParameter<VariableCollection>("Memories", new VariableCollection()));
    156169      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
    157170
  • branches/TSMemory/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

    r5128 r5159  
    112112    <Compile Include="Algorithm.cs" />
    113113    <Compile Include="BatchRun.cs" />
    114     <Compile Include="Interfaces\IMemory.cs" />
    115114    <Compile Include="Interfaces\IMultiAnalyzer.cs" />
    116115    <Compile Include="Interfaces\IIterationBasedOperator.cs" />
Note: See TracChangeset for help on using the changeset viewer.