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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/BattleRunner.java

    r14185 r16565  
    11/* HeuristicLab
    2  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     2 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    33 *
    44 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/EnemyCollection.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.
    … …  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    3232  [Item("EnemyCollection", "A collection of enemy robots for the Robocode genetic programming problem.")]
    33   [StorableClass]
     33  [StorableType("78324566-09C2-4D2F-A54F-79613934D7F1")]
    3434  public class EnemyCollection : CheckedItemList<StringValue> {
    3535    private const string sampleRobotToSelect = "sample.Crazy";
    … …  
    3939
    4040    [StorableConstructor]
    41     protected EnemyCollection(bool deserializing) : base(deserializing) { }
     41    protected EnemyCollection(StorableConstructorFlag _) : base(_) { }
    4242    protected EnemyCollection(EnemyCollection original, Cloner cloner)
    4343      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Grammar.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("DC5FF90A-AD5A-4A56-8A9B-F117D2B842AD")]
    2929  [Item("Robocode Grammar", "The grammar for the Robocode GP problem.")]
    3030  public class Grammar : SymbolicExpressionGrammar {
    … …  
    3939
    4040    [StorableConstructor]
    41     protected Grammar(bool deserializing) : base(deserializing) { }
     41    protected Grammar(StorableConstructorFlag _) : base(_) { }
    4242    protected Grammar(Grammar original, Cloner cloner) : base(original, cloner) { }
    4343

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/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/robocode/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.
    … …  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.GeneticProgramming.Robocode {
    31   [StorableClass]
     31  [StorableType("0B4FE44B-3044-4531-8CA9-3C4D3BB3A4BB")]
    3232  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 360)]
    3333  [Item("Robocode Problem", "Evolution of a robocode program in java using genetic programming.")]
    … …  
    6767
    6868    [StorableConstructor]
    69     protected Problem(bool deserializing) : base(deserializing) { }
     69    protected Problem(StorableConstructorFlag _) : base(_) { }
    7070    protected Problem(Problem original, Cloner cloner)
    7171      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Solution.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("09AA644E-2092-4108-BAAB-4C0B85C56C07")]
    2929  [Item("Solution", "Robocode program and configuration.")]
    3030  public sealed class Solution : Item {
    … …  
    4242
    4343    [StorableConstructor]
    44     private Solution(bool deserializing) : base(deserializing) { }
     44    private Solution(StorableConstructorFlag _) : base(_) { }
    4545    private Solution(Solution original, Cloner cloner)
    4646      : base(original, cloner) {

  • 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.