Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (5 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Problem.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    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() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/ArtificialAnt/Trail.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    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() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression/Problem.cs

    r16453 r16462  
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131using HeuristicLab.Problems.Instances;
     
    3535  [Item("Koza-style Symbolic Regression", "An implementation of symbolic regression without bells-and-whistles. Use \"Symbolic Regression Problem (single-objective)\" if you want to use all features.")]
    3636  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 900)]
    37   [StorableClass]
     37  [StorableType("72011B73-28C6-4D5E-BEDF-27425BC87B9C")]
    3838  public sealed class Problem : SymbolicExpressionTreeProblem, IRegressionProblem, IProblemInstanceConsumer<IRegressionProblemData>, IProblemInstanceExporter<IRegressionProblemData> {
    3939
     
    6767    // persistence
    6868    [StorableConstructor]
    69     private Problem(bool deserializing) : base(deserializing) { }
     69    private Problem(StorableConstructorFlag _) : base(_) { }
    7070    [StorableHook(HookType.AfterDeserialization)]
    7171    private void AfterDeserialization() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/EvenParityProblem.cs

    r16453 r16462  
    2828using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232
     
    3434  [Item("Even Parity Problem", "The Boolean even parity genetic programming problem. See Koza, 1992, page 529 section 20.2 Symbolic Regression of Even-Parity Functions")]
    3535  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 900)]
    36   [StorableClass]
     36  [StorableType("76D6001D-135F-45FB-BC79-061EDAEE33A9")]
    3737  public sealed class EvenParityProblem : SymbolicExpressionTreeProblem {
    3838
     
    6161    // persistence
    6262    [StorableConstructor]
    63     private EvenParityProblem(bool deserializing) : base(deserializing) { }
     63    private EvenParityProblem(StorableConstructorFlag _) : base(_) { }
    6464    [StorableHook(HookType.AfterDeserialization)]
    6565    private void AfterDeserialization() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/Boolean/MultiplexerProblem.cs

    r16453 r16462  
    2929using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333
     
    3636    "The Boolean multiplexer genetic programming problem. See Koza 1992, page 171, section 7.4.1 11-multiplexer.")]
    3737  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 900)]
    38   [StorableClass]
     38  [StorableType("6DFE64E4-3968-446F-AE3D-FAF13C18930C")]
    3939  public sealed class MultiplexerProblem : SymbolicExpressionTreeProblem {
    4040
     
    6363    // persistence
    6464    [StorableConstructor]
    65     private MultiplexerProblem(bool deserializing) : base(deserializing) { }
     65    private MultiplexerProblem(StorableConstructorFlag _) : base(_) { }
    6666    [StorableHook(HookType.AfterDeserialization)]
    6767    private void AfterDeserialization() {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/HeuristicLab.Problems.GeneticProgramming-3.3.csproj

    r16454 r16462  
    102102      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    103103    </Reference>
    104     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     104    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105105      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    106106    </Reference>
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Problem.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Random;
    3232
    3333namespace HeuristicLab.Problems.GeneticProgramming.LawnMower {
    34   [StorableClass]
     34  [StorableType("3F72F63C-CBEB-43BD-ADC0-B3F0AD58331B")]
    3535  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 160)]
    3636  [Item("Lawn Mower Problem", "The lawn mower demo problem for genetic programming.")]
     
    5252    #region item cloning and persistence
    5353    [StorableConstructor]
    54     protected Problem(bool deserializing) : base(deserializing) { }
     54    protected Problem(StorableConstructorFlag _) : base(_) { }
    5555    [StorableHook(HookType.AfterDeserialization)]
    5656    private void AfterDeserialization() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/LawnMower/Solution.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Problems.GeneticProgramming.LawnMower {
    28   [StorableClass]
     28  [StorableType("99ADBE85-803D-4463-8BF2-5F825E14F7BD")]
    2929  public sealed class Solution : NamedItem {
    3030    [Storable]
     
    3939    #region item cloning and persistence
    4040    [StorableConstructor]
    41     private Solution(bool deserializing) : base(deserializing) { }
     41    private Solution(StorableConstructorFlag _) : base(_) { }
    4242    [StorableHook(HookType.AfterDeserialization)]
    4343    private void AfterDeserialization() { }
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/EnemyCollection.cs

    r16453 r16462  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Data;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Grammar.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Problem.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Solution.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/BooleanTreeNode.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/BooleanValue.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/CodeSymbol.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/Number.cs

    r16453 r16462  
    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.Fossil;
    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
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/NumberTreeNode.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    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) {
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/ShotPower.cs

    r16453 r16462  
    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.Fossil;
    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
  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GeneticProgramming/3.3/robocode/Symbols/ShotPowerTreeNode.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    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.