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.Encodings.SymbolicExpressionTreeEncoding
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentCreater.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Random;
    3131
    … …  
    3636  /// </summary>
    3737  [Item("ArgumentCreater", "Manipulates a symbolic expression by creating a new argument within one function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 106")]
    38   [StorableClass]
     38  [StorableType("2AC1EE1A-B2B4-47E7-97AF-BFC9FB2D7BA2")]
    3939  public sealed class ArgumentCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    4040    private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
    … …  
    5757    #endregion
    5858    [StorableConstructor]
    59     private ArgumentCreater(bool deserializing) : base(deserializing) { }
     59    private ArgumentCreater(StorableConstructorFlag _) : base(_) { }
    6060    private ArgumentCreater(ArgumentCreater original, Cloner cloner) : base(original, cloner) { }
    6161    public ArgumentCreater()

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDeleter.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Random;
    2828
    … …  
    3232  /// </summary>
    3333  [Item("ArgumentDeleter", "Manipulates a symbolic expression by deleting an argument from an existing function defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 112")]
    34   [StorableClass]
     34  [StorableType("5A449735-B6B7-40AB-B1D6-A626FB768F71")]
    3535  public sealed class ArgumentDeleter : SymbolicExpressionTreeArchitectureManipulator {
    3636    [StorableConstructor]
    37     private ArgumentDeleter(bool deserializing) : base(deserializing) { }
     37    private ArgumentDeleter(StorableConstructorFlag _) : base(_) { }
    3838    private ArgumentDeleter(ArgumentDeleter original, Cloner cloner) : base(original, cloner) { }
    3939    public ArgumentDeleter() : base() { }

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/ArgumentDuplicater.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Random;
    3030
    … …  
    3535  /// </summary>
    3636  [Item("ArgumentDuplicater", "Manipulates a symbolic expression by duplicating an existing argument node of a function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 94")]
    37   [StorableClass]
     37  [StorableType("4F97833A-ECF6-436A-9634-1A9111302912")]
    3838  public sealed class ArgumentDuplicater : SymbolicExpressionTreeArchitectureManipulator {
    3939    [StorableConstructor]
    40     private ArgumentDuplicater(bool deserializing) : base(deserializing) { }
     40    private ArgumentDuplicater(StorableConstructorFlag _) : base(_) { }
    4141    private ArgumentDuplicater(ArgumentDuplicater original, Cloner cloner) : base(original, cloner) { }
    4242    public ArgumentDuplicater() : base() { }

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/GrammarModifier.cs

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

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/MultiSymbolicExpressionTreeArchitectureManipulator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    3535namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    3636  [Item("MultiSymbolicExpressionTreeArchitectureManipulator", "Randomly selects and applies one of its architecture manipulators every time it is called.")]
    37   [StorableClass]
     37  [StorableType("6D524953-37A3-4789-AB3A-6881E5289F49")]
    3838  public sealed class MultiSymbolicExpressionTreeArchitectureManipulator : StochasticMultiBranch<ISymbolicExpressionTreeManipulator>,
    3939    ISymbolicExpressionTreeArchitectureManipulator,
    … …  
    8686
    8787    [StorableConstructor]
    88     private MultiSymbolicExpressionTreeArchitectureManipulator(bool deserializing) : base(deserializing) { }
     88    private MultiSymbolicExpressionTreeArchitectureManipulator(StorableConstructorFlag _) : base(_) { }
    8989    private MultiSymbolicExpressionTreeArchitectureManipulator(MultiSymbolicExpressionTreeArchitectureManipulator original, Cloner cloner) : base(original, cloner) { }
    9090    public MultiSymbolicExpressionTreeArchitectureManipulator()

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineCreater.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.Random;
    3232
    … …  
    3838  /// </summary>
    3939  [Item("SubroutineCreater", "Manipulates a symbolic expression by adding one new function-defining branch containing a proportion of a preexisting branch and by creating a reference to the new branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 97")]
    40   [StorableClass]
     40  [StorableType("2F1F0953-534F-495C-B9C5-2C64D85E9AE2")]
    4141  public sealed class SubroutineCreater : SymbolicExpressionTreeArchitectureManipulator, ISymbolicExpressionTreeSizeConstraintOperator {
    4242    private const double ARGUMENT_CUTOFF_PROBABILITY = 0.05;
    … …  
    6060    #endregion
    6161    [StorableConstructor]
    62     private SubroutineCreater(bool deserializing) : base(deserializing) { }
     62    private SubroutineCreater(StorableConstructorFlag _) : base(_) { }
    6363    private SubroutineCreater(SubroutineCreater original, Cloner cloner) : base(original, cloner) { }
    6464    public SubroutineCreater()

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDeleter.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Random;
    2929
    … …  
    3434  /// </summary>
    3535  [Item("SubroutineDeleter", "Manipulates a symbolic expression by deleting a preexisting function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 108")]
    36   [StorableClass]
     36  [StorableType("A4AB4A79-F013-4DF4-847D-5F2C171859A7")]
    3737  public sealed class SubroutineDeleter : SymbolicExpressionTreeArchitectureManipulator {
    3838    [StorableConstructor]
    39     private SubroutineDeleter(bool deserializing) : base(deserializing) { }
     39    private SubroutineDeleter(StorableConstructorFlag _) : base(_) { }
    4040    private SubroutineDeleter(SubroutineDeleter original, Cloner cloner) : base(original, cloner) { }
    4141    public SubroutineDeleter() : base() { }

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SubroutineDuplicater.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Random;
    3131
    … …  
    3636  /// </summary>
    3737  [Item("SubroutineDuplicater", "Manipulates a symbolic expression by duplicating a preexisting function-defining branch. As described in Koza, Bennett, Andre, Keane, Genetic Programming III - Darwinian Invention and Problem Solving, 1999, pp. 88")]
    38   [StorableClass]
     38  [StorableType("FA58A28B-95B5-43BF-B94A-99FBFF4C9316")]
    3939  public sealed class SubroutineDuplicater : SymbolicExpressionTreeArchitectureManipulator {
    4040    [StorableConstructor]
    41     private SubroutineDuplicater(bool deserializing) : base(deserializing) { }
     41    private SubroutineDuplicater(StorableConstructorFlag _) : base(_) { }
    4242    private SubroutineDuplicater(SubroutineDuplicater original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/1772_HeuristicLab.EvolutionTracking/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/ArchitectureManipulators/SymbolicExpressionTreeArchitectureManipulator.cs

    r16130 r17434  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
    … …  
    3030  /// Base class for architecture altering operators for symbolic expression trees.
    3131  /// </summary>
    32   [StorableClass]
     32  [StorableType("7D5ACE3E-DA4F-4E2D-9723-2596AB856B4D")]
    3333  public abstract class SymbolicExpressionTreeArchitectureManipulator : SymbolicExpressionTreeManipulator, ISymbolicExpressionTreeArchitectureManipulator {
    3434    private const string MaximumFunctionArgumentsParameterName = "MaximumFunctionArguments";
    … …  
    5454    #endregion
    5555    [StorableConstructor]
    56     protected SymbolicExpressionTreeArchitectureManipulator(bool deserializing) : base(deserializing) { }
     56    protected SymbolicExpressionTreeArchitectureManipulator(StorableConstructorFlag _) : base(_) { }
    5757    protected SymbolicExpressionTreeArchitectureManipulator(SymbolicExpressionTreeArchitectureManipulator original, Cloner cloner) : base(original, cloner) { }
    5858    public SymbolicExpressionTreeArchitectureManipulator()
Note: See TracChangeset for help on using the changeset viewer.