Ignore:
Timestamp:
12/28/18 16:10:48 (2 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.SimulatedAnnealing/3.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/HeuristicLab.Algorithms.SimulatedAnnealing-3.3.csproj

    r16454 r16462  
    102102      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    103103    </Reference>
    104     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     104    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105105      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    106106    </Reference>
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs

    r16453 r16462  
    3131using HeuristicLab.Optimization.Operators;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Fossil;
    3434using HeuristicLab.PluginInfrastructure;
    3535using HeuristicLab.Random;
     
    3838  [Item("Simulated Annealing (SA)", "A simulated annealing algorithm.")]
    3939  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 140)]
    40   [StorableClass]
     40  [StorableType("CE2B6164-C541-4E87-ABF6-FDE6CA6401BF")]
    4141  public sealed class SimulatedAnnealing : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4242    public string Filename { get; set; }
     
    149149
    150150    [StorableConstructor]
    151     private SimulatedAnnealing(bool deserializing) : base(deserializing) { }
     151    private SimulatedAnnealing(StorableConstructorFlag _) : base(_) { }
    152152    [StorableHook(HookType.AfterDeserialization)]
    153153    private void AfterDeserialization() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.PluginInfrastructure;
    3333
     
    3737  /// </summary>
    3838  [Item("SimulatedAnnealingImprovementOperator", "A simulated annealing improvement operator.")]
    39   [StorableClass]
     39  [StorableType("838ADB03-1D6F-4795-B955-10C8B05B2EC4")]
    4040  public sealed class SimulatedAnnealingImprovementOperator : SingleSuccessorOperator, ILocalImprovementAlgorithmOperator, IStochasticOperator, ISingleObjectiveOperator {
    4141    #region IGenericLocalImprovementOperator Properties
     
    131131
    132132    [StorableConstructor]
    133     private SimulatedAnnealingImprovementOperator(bool deserializing) : base(deserializing) { }
     133    private SimulatedAnnealingImprovementOperator(StorableConstructorFlag _) : base(_) { }
    134134    private SimulatedAnnealingImprovementOperator(SimulatedAnnealingImprovementOperator original, Cloner cloner)
    135135      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Algorithms.SimulatedAnnealing {
     
    3333  /// </summary>
    3434  [Item("SimulatedAnnealingMainLoop", "An operator which represents the main loop of a simulated annealing algorithm.")]
    35   [StorableClass]
     35  [StorableType("ADDF6A58-21CD-4224-94BF-FE6AE5CBEE3A")]
    3636  public sealed class SimulatedAnnealingMainLoop : AlgorithmOperator {
    3737    #region Parameter properties
     
    9393
    9494    [StorableConstructor]
    95     private SimulatedAnnealingMainLoop(bool deserializing) : base(deserializing) { }
     95    private SimulatedAnnealingMainLoop(StorableConstructorFlag _) : base(_) { }
    9696    private SimulatedAnnealingMainLoop(SimulatedAnnealingMainLoop original, Cloner cloner)
    9797      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.