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:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/BooleanTreeNode.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    28   [StorableClass]
     28  [StorableType("93829075-7B5D-4D2D-B297-64AD120B6342")]
    2929  public class BooleanTreeNode : SymbolicExpressionTreeTerminalNode {
    3030    private bool value;
    … …  
    3636
    3737    [StorableConstructor]
    38     protected BooleanTreeNode(bool deserializing) : base(deserializing) { }
     38    protected BooleanTreeNode(StorableConstructorFlag _) : base(_) { }
    3939    protected BooleanTreeNode(BooleanTreeNode original, Cloner cloner)
    4040      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/BooleanValue.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.
    … …  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2625
    2726namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    28   [StorableClass]
     27  [StorableType("885EE784-E3EC-44D7-B957-A72EBF556F90")]
    2928  public class BooleanValue : Symbol {
    3029    public override int MinimumArity { get { return 0; } }
    … …  
    3231
    3332    [StorableConstructor]
    34     protected BooleanValue(bool deserializing) : base(deserializing) { }
     33    protected BooleanValue(StorableConstructorFlag _) : base(_) { }
    3534    protected BooleanValue(BooleanValue original, Cloner cloner) : base(original, cloner) { }
    3635

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/CodeSymbol.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.
    … …  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2625
    2726namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    28   [StorableClass]
     27  [StorableType("104E6124-7427-4639-A740-F68384CD8592")]
    2928  // a symbol that can represent any user-defined fragment of code
    3029  public sealed class CodeSymbol : Symbol {
    … …  
    3938
    4039    [StorableConstructor]
    41     private CodeSymbol(bool deserializing) : base(deserializing) { }
     40    private CodeSymbol(StorableConstructorFlag _) : base(_) { }
    4241    private CodeSymbol(CodeSymbol original, Cloner cloner)
    4342      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/Number.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.
    … …  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    23 using System.Globalization;
    2422using HeuristicLab.Common;
    2523using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2725
    2826namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    29   [StorableClass]
     27  [StorableType("579762A5-8A48-475F-90E1-E4222E52DC88")]
    3028  public class Number : Symbol {
    3129    public override int MinimumArity { get { return 0; } }
    … …  
    3331
    3432    [StorableConstructor]
    35     protected Number(bool deserializing) : base(deserializing) { }
     33    protected Number(StorableConstructorFlag _) : base(_) { }
    3634    protected Number(Number original, Cloner cloner) : base(original, cloner) { }
    3735

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/NumberTreeNode.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.
    … …  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    28   [StorableClass]
     28  [StorableType("C2A2B6C5-3320-4231-A1B3-F8B8CF8B03A5")]
    2929  public class NumberTreeNode : SymbolicExpressionTreeTerminalNode {
    3030    private int value;
    … …  
    3636
    3737    [StorableConstructor]
    38     protected NumberTreeNode(bool deserializing) : base(deserializing) { }
     38    protected NumberTreeNode(StorableConstructorFlag _) : base(_) { }
    3939    protected NumberTreeNode(NumberTreeNode original, Cloner cloner)
    4040      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/ShotPower.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.
    … …  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    23 using System.Globalization;
    2422using HeuristicLab.Common;
    2523using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2725
    2826namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    29   [StorableClass]
     27  [StorableType("95B53DAD-A47C-49CD-8157-6DF34A750F68")]
    3028  public class ShotPower : Symbol {
    3129    public override int MinimumArity { get { return 0; } }
    … …  
    3331
    3432    [StorableConstructor]
    35     protected ShotPower(bool deserializing) : base(deserializing) { }
     33    protected ShotPower(StorableConstructorFlag _) : base(_) { }
    3634    protected ShotPower(ShotPower original, Cloner cloner) : base(original, cloner) { }
    3735

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/ShotPowerTreeNode.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.
    … …  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    29   [StorableClass]
     29  [StorableType("BF268663-45F4-4E94-8605-33373BE2D612")]
    3030  public class ShotPowerTreeNode : SymbolicExpressionTreeTerminalNode {
    3131    private double value;
    … …  
    3737
    3838    [StorableConstructor]
    39     protected ShotPowerTreeNode(bool deserializing) : base(deserializing) { }
     39    protected ShotPowerTreeNode(StorableConstructorFlag _) : base(_) { }
    4040    protected ShotPowerTreeNode(ShotPowerTreeNode original, Cloner cloner)
    4141      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.