Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Interpreter.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333
    … …  
    3535  [Item("Artificial Ant Problem", "Represents the Artificial Ant problem.")]
    3636  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 170)]
    37   [StorableClass]
     37  [StorableType("D365171B-7077-4CC2-835C-1827EA67C843")]
    3838  public sealed class Problem : SymbolicExpressionTreeProblem, IStorableContent {
    3939
    … …  
    105105    // persistence
    106106    [StorableConstructor]
    107     private Problem(bool deserializing) : base(deserializing) { }
     107    private Problem(StorableConstructorFlag _) : base(_) { }
    108108    [StorableHook(HookType.AfterDeserialization)]
    109109    private void AfterDeserialization() { }

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Trail.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.GeneticProgramming.ArtificialAnt {
    … …  
    3232  /// </summary>
    3333  [Item("AntTrail", "Represents a trail of an artificial ant which can be visualized in the GUI.")]
    34   [StorableClass]
     34  [StorableType("6C666B13-1A69-4924-9ED7-4AC06151FDC6")]
    3535  public sealed class Solution : Item {
    3636    public static new Image StaticItemImage {
    … …  
    5555    #region item cloning and persistence
    5656    [StorableConstructor]
    57     private Solution(bool deserializing) : base(deserializing) { }
     57    private Solution(StorableConstructorFlag _) : base(_) { }
    5858    [StorableHook(HookType.AfterDeserialization)]
    5959    private void AfterDeserialization() { }
Note: See TracChangeset for help on using the changeset viewer.