Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/11/20 13:36:02 (5 years ago)
Author:
bburlacu
Message:

#1772: Merge trunk changes and fix all errors and compilation warnings.

Location:
branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/AfterCrossoverOperator.cs

    r14574 r17434  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    … …  
    2627
    2728namespace HeuristicLab.EvolutionTracking {
    28   [StorableClass]
    2929  [Item("AfterCrossoverOperator", "A generic operator that can record genealogical relationships between crossover parents and children.")]
     30  [StorableType("E43B0F0A-998D-4CD1-A030-B2A927086433")]
    3031  public class AfterCrossoverOperator<T> : EvolutionTrackingOperator<T>, ICrossoverOperator<T> where T : class, IItem {
    3132    private const string ParentsParameterName = "Parents";
    … …  
    4647    }
    4748    [StorableConstructor]
    48     protected AfterCrossoverOperator(bool deserializing) : base(deserializing) { }
     49    protected AfterCrossoverOperator(StorableConstructorFlag _) : base(_) { }
    4950
    5051    public AfterCrossoverOperator() {

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/AfterManipulatorOperator.cs

    r11227 r17434  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    … …  
    2627
    2728namespace HeuristicLab.EvolutionTracking {
    28   [StorableClass]
    2929  [Item("AfterCrossoverOperator", "Performs an action after the crossover operator is applied.")]
     30  [StorableType("DF888AB7-709A-41BD-A201-F026CE4DB8F4")]
    3031  public class AfterManipulatorOperator<T> : EvolutionTrackingOperator<T>, IManipulatorOperator<T> where T : class,IItem {
    3132    private const string ChildParameterName = "Child";
    … …  
    4243    }
    4344    [StorableConstructor]
    44     protected AfterManipulatorOperator(bool deserializing) : base(deserializing) { }
     45    protected AfterManipulatorOperator(StorableConstructorFlag _) : base(_) { }
    4546
    4647    public AfterManipulatorOperator() {

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/AfterSolutionCreatorOperator.cs

    r10650 r17434  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Core;
    2324using HeuristicLab.Parameters;
    … …  
    2526
    2627namespace HeuristicLab.EvolutionTracking.Operators {
    27   [StorableClass]
    2828  [Item("AfterSolutionCreatorOperator", "An operator that runs after the solution creator and performs additional actions.")]
     29  [StorableType("A5B1528D-336B-48CF-8F74-8F2322F8A136")]
    2930  public class AfterSolutionCreatorOperator<T> : EvolutionTrackingOperator<T>
    3031    where T : class,IItem {

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeCrossoverOperator.cs

    r11858 r17434  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2930
    3031namespace HeuristicLab.EvolutionTracking {
    31   [StorableClass]
    3232  [Item("BeforeCrossoverOperator", "A generic operator that can record genealogical relationships between crossover parents and children.")]
     33  [StorableType("A44A9100-AD1D-459C-A45A-CE7C1B894E71")]
    3334  public class BeforeCrossoverOperator<T> : EvolutionTrackingOperator<T>, ICrossoverOperator<T> where T : class,IItem {
    3435    private const string ParentsParameterName = "Parents";
    … …  
    5556
    5657    [StorableConstructor]
    57     protected BeforeCrossoverOperator(bool deserializing) : base(deserializing) { }
     58    protected BeforeCrossoverOperator(StorableConstructorFlag _) : base(_) { }
    5859
    5960    public BeforeCrossoverOperator() {

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/BeforeManipulatorOperator.cs

    r13527 r17434  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    … …  
    2728
    2829namespace HeuristicLab.EvolutionTracking {
    29   [StorableClass]
    3030  [Item("AfterCrossoverOperator", "Performs an action after the crossover operator is applied.")]
     31  [StorableType("78C5698A-39B8-4158-83F6-7E6CFAF5BD2A")]
    3132  public class BeforeManipulatorOperator<T> : EvolutionTrackingOperator<T>, IManipulatorOperator<T> where T : class, IItem {
    3233    private const string ChildParameterName = "Child";
    … …  
    4546
    4647    [StorableConstructor]
    47     protected BeforeManipulatorOperator(bool deserializing) : base(deserializing) { }
     48    protected BeforeManipulatorOperator(StorableConstructorFlag _) : base(_) { }
    4849
    4950    public BeforeManipulatorOperator() {

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/EvolutionTrackingOperator.cs

    r12951 r17434  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    … …  
    3031namespace HeuristicLab.EvolutionTracking {
    3132  [Item("EvolutionTrackingOperator", "A base operator which facilitates access to the genealogy graph.")]
    32   [StorableClass]
     33  [StorableType("27D4603D-0EDC-4C77-9AB9-ED10CA6D4613")]
    3334  public class EvolutionTrackingOperator<T> : SingleSuccessorOperator where T : class, IItem {
    3435    // evolution tracking-related parameters
    … …  
    7374    }
    7475    [StorableConstructor]
    75     protected EvolutionTrackingOperator(bool deserializing) : base(deserializing) { }
     76    protected EvolutionTrackingOperator(StorableConstructorFlag _) : base(_) { }
    7677  }
    7778}

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking/3.4/Operators/RemovePopulationGraphFromResults.cs

    r16131 r17434  
    1 using HeuristicLab.Common;
     1using HEAL.Attic;
     2using HeuristicLab.Common;
    23using HeuristicLab.Core;
    34using HeuristicLab.Operators;
    … …  
    1213
    1314namespace HeuristicLab.EvolutionTracking.Operators {
    14   [StorableClass]
    1515  [Item("RemovePopulationGraphFromResultsOperator", "In some cases the genealogy graph is necessary during the run but to save memory it should be removed from the results at the end of the run.")]
     16  [StorableType("5F5FEAAD-DA7C-4C8C-A9B3-B4DE30B64C51")]
    1617  public class RemovePopulationGraphFromResultsOperator : SingleSuccessorOperator {
    1718
    … …  
    2324
    2425    [StorableConstructor]
    25     protected RemovePopulationGraphFromResultsOperator(bool deserializing) : base(deserializing) { }
     26    protected RemovePopulationGraphFromResultsOperator(StorableConstructorFlag _) : base(_) { }
    2627
    2728    [StorableHook(HookType.AfterDeserialization)]
Note: See TracChangeset for help on using the changeset viewer.