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.GeneticAlgorithm/3.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

    r16453 r16462  
    2222using System;
    2323using System.Linq;
     24using HEAL.Fossil;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
     
    3031using HeuristicLab.Optimization.Operators;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
     
    4040  [Item("Genetic Algorithm (GA)", "A genetic algorithm.")]
    4141  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 100)]
    42   [StorableClass]
     42  [StorableType("B63D21BD-D6AE-474B-A319-AC92CCB30AF6")]
    4343  public sealed class GeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4444    public string Filename { get; set; }
     
    213213    }
    214214    [StorableConstructor]
    215     private GeneticAlgorithm(bool deserializing) : base(deserializing) { }
     215    private GeneticAlgorithm(StorableConstructorFlag _) : base(_) { }
    216216    [StorableHook(HookType.AfterDeserialization)]
    217217    private void AfterDeserialization() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.Selection;
    3030
     
    3434  /// </summary>
    3535  [Item("GeneticAlgorithmMainLoop", "An operator which represents the main loop of a genetic algorithm.")]
    36   [StorableClass]
     36  [StorableType("890C1856-16C9-45F0-A0DD-67A152A70D28")]
    3737  public sealed class GeneticAlgorithmMainLoop : AlgorithmOperator {
    3838    #region Parameter properties
     
    9292
    9393    [StorableConstructor]
    94     private GeneticAlgorithmMainLoop(bool deserializing) : base(deserializing) { }
     94    private GeneticAlgorithmMainLoop(StorableConstructorFlag _) : base(_) { }
    9595    private GeneticAlgorithmMainLoop(GeneticAlgorithmMainLoop original, Cloner cloner)
    9696      : base(original, cloner) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj

    r16454 r16462  
    110110      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    111111    </Reference>
    112     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     112    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    113113      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    114114    </Reference>
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
     
    4040  [Item("Island Genetic Algorithm (Island-GA)", "An island genetic algorithm.")]
    4141  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 110)]
    42   [StorableClass]
     42  [StorableType("C36FD509-4EF2-4BA7-9483-8CFCEF7EDA91")]
    4343  public sealed class IslandGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4444    public string Filename { get; set; }
     
    203203
    204204    [StorableConstructor]
    205     private IslandGeneticAlgorithm(bool deserializing) : base(deserializing) { }
     205    private IslandGeneticAlgorithm(StorableConstructorFlag _) : base(_) { }
    206206    [StorableHook(HookType.AfterDeserialization)]
    207207    private void AfterDeserialization() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Selection;
    3131
     
    3535  /// </summary>
    3636  [Item("IslandGeneticAlgorithmMainLoop", "An island genetic algorithm main loop operator.")]
    37   [StorableClass]
     37  [StorableType("E015F135-AA23-4425-A84A-DEF880185D0A")]
    3838  public sealed class IslandGeneticAlgorithmMainLoop : AlgorithmOperator {
    3939    #region Parameter Properties
     
    119119
    120120    [StorableConstructor]
    121     private IslandGeneticAlgorithmMainLoop(bool deserializing) : base(deserializing) { }
     121    private IslandGeneticAlgorithmMainLoop(StorableConstructorFlag _) : base(_) { }
    122122    private IslandGeneticAlgorithmMainLoop(IslandGeneticAlgorithmMainLoop original, Cloner cloner)
    123123      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.