Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 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.GrammaticalEvolution/3.4
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/ArtificialAnt/GEArtificialAntProblem.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.Problems.GeneticProgramming.ArtificialAnt;
    3333using HeuristicLab.Problems.GrammaticalEvolution.Mappers;
    … …  
    3737  [Item("Grammatical Evolution Artificial Ant Problem (GE)", "Represents the Artificial Ant problem, implemented in Grammatical Evolution.")]
    3838  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 170)]
    39   [StorableClass]
     39  [StorableType("B6F0EBC4-FA3B-42E6-958F-404FA89C81FA")]
    4040  public sealed class GEArtificialAntProblem : SingleObjectiveBasicProblem<IntegerVectorEncoding>, IStorableContent {
    4141
    … …  
    6464
    6565    [StorableConstructor]
    66     private GEArtificialAntProblem(bool deserializing) : base(deserializing) { }
     66    private GEArtificialAntProblem(StorableConstructorFlag _) : base(_) { }
    6767    [StorableHook(HookType.AfterDeserialization)]
    6868    private void AfterDeserialization() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/HeuristicLab.Problems.GrammaticalEvolution-3.4.csproj

    r16454 r16462  
    108108      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    109109    </Reference>
    110     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     110    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111111      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    112112    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/Mappers/BreathFirstMapper.cs

    r16453 r16462  
    2929using HeuristicLab.Encodings.IntegerVectorEncoding;
    3030using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.GrammaticalEvolution {
    … …  
    3636  /// </summary>
    3737  [Item("BreathFirstMapper", "Resolves the non-terminal symbols of the resulting phenotypic syntax tree in a breath-first manner.")]
    38   [StorableClass]
     38  [StorableType("7E8D7511-83C3-4F12-8883-BD20FCB58986")]
    3939  public class BreathFirstMapper : GenotypeToPhenotypeMapper {
    4040
    4141    [StorableConstructor]
    42     protected BreathFirstMapper(bool deserializing) : base(deserializing) { }
     42    protected BreathFirstMapper(StorableConstructorFlag _) : base(_) { }
    4343    protected BreathFirstMapper(BreathFirstMapper original, Cloner cloner) : base(original, cloner) { }
    4444    public BreathFirstMapper() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/Mappers/DepthFirstMapper.cs

    r16453 r16462  
    3030using HeuristicLab.Encodings.IntegerVectorEncoding;
    3131using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333
    3434namespace HeuristicLab.Problems.GrammaticalEvolution {
    … …  
    3737  /// </summary>
    3838  [Item("DepthFirstMapper", "Resolves the non-terminal symbols of the resulting phenotypic syntax tree in a depth-first manner.")]
    39   [StorableClass]
     39  [StorableType("9FACB397-FB99-4858-8962-DBB1FE16C54B")]
    4040  public class DepthFirstMapper : GenotypeToPhenotypeMapper {
    4141
    4242    [StorableConstructor]
    43     protected DepthFirstMapper(bool deserializing) : base(deserializing) { }
     43    protected DepthFirstMapper(StorableConstructorFlag _) : base(_) { }
    4444    protected DepthFirstMapper(DepthFirstMapper original, Cloner cloner) : base(original, cloner) { }
    4545    public DepthFirstMapper() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/Mappers/GenotypeToPhenotypeMapper.cs

    r16453 r16462  
    2929using HeuristicLab.Encodings.IntegerVectorEncoding;
    3030using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232using HeuristicLab.Problems.GrammaticalEvolution.Mappers;
    3333using HeuristicLab.Random;
    … …  
    3737  /// Abstract base class for GenotypeToPhenotypeMappers
    3838  /// </summary>
    39   [StorableClass]
     39  [StorableType("427C4EB7-7888-4AB2-824A-E1F2EB1DE2FA")]
    4040  public abstract class GenotypeToPhenotypeMapper : IntegerVectorOperator, IGenotypeToPhenotypeMapper {
    4141
    4242    [StorableConstructor]
    43     protected GenotypeToPhenotypeMapper(bool deserializing) : base(deserializing) { }
     43    protected GenotypeToPhenotypeMapper(StorableConstructorFlag _) : base(_) { }
    4444    protected GenotypeToPhenotypeMapper(GenotypeToPhenotypeMapper original, Cloner cloner) : base(original, cloner) { }
    4545    protected GenotypeToPhenotypeMapper() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/Mappers/PIGEMapper.cs

    r16453 r16462  
    2828using HeuristicLab.Encodings.IntegerVectorEncoding;
    2929using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.GrammaticalEvolution {
    … …  
    6868  /// </remarks>
    6969  [Item("PIGEMapper", "Position Independent (PI) Grammatical Evolution Mapper")]
    70   [StorableClass]
     70  [StorableType("AFD85902-C2EA-47F5-8284-BA1759848580")]
    7171  public class PIGEMapper : GenotypeToPhenotypeMapper {
    7272
    … …  
    8686
    8787    [StorableConstructor]
    88     protected PIGEMapper(bool deserializing) : base(deserializing) { }
     88    protected PIGEMapper(StorableConstructorFlag _) : base(_) { }
    8989    protected PIGEMapper(PIGEMapper original, Cloner cloner) : base(original, cloner) { }
    9090    public PIGEMapper() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/Mappers/RandomMapper.cs

    r16453 r16462  
    2828using HeuristicLab.Encodings.IntegerVectorEncoding;
    2929using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Random;
    3232
    … …  
    3636  /// </summary>
    3737  [Item("RandomMapper", "Randomly determines the next non-terminal symbol to expand.")]
    38   [StorableClass]
     38  [StorableType("FD52470F-EA9A-4E95-8DE0-66C9B9F5F4EB")]
    3939  public class RandomMapper : GenotypeToPhenotypeMapper {
    4040
    4141    [StorableConstructor]
    42     protected RandomMapper(bool deserializing) : base(deserializing) { }
     42    protected RandomMapper(StorableConstructorFlag _) : base(_) { }
    4343    protected RandomMapper(RandomMapper original, Cloner cloner) : base(original, cloner) { }
    4444    public RandomMapper() : base() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisEvaluator.cs

    r16453 r16462  
    2222#endregion
    2323
    24 using System;
    25 using System.Collections.Generic;
    26 using System.Linq;
    2724using HeuristicLab.Common;
    2825using HeuristicLab.Core;
    … …  
    3330using HeuristicLab.Optimization;
    3431using HeuristicLab.Parameters;
    35 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3633using HeuristicLab.Problems.DataAnalysis;
    3734using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3835using HeuristicLab.Problems.GrammaticalEvolution.Mappers;
    39 using HeuristicLab.Random;
    4036
    4137namespace HeuristicLab.Problems.GrammaticalEvolution {
    42   [StorableClass]
     38  [StorableType("3E723725-9141-4259-BB1D-BACE36657086")]
    4339  public abstract class GESymbolicDataAnalysisEvaluator<T> : SingleSuccessorOperator,
    4440    IGESymbolicDataAnalysisEvaluator<T>, ISymbolicDataAnalysisInterpreterOperator, ISymbolicDataAnalysisBoundedOperator, IStochasticOperator
    … …  
    106102
    107103    [StorableConstructor]
    108     protected GESymbolicDataAnalysisEvaluator(bool deserializing) : base(deserializing) { }
     104    protected GESymbolicDataAnalysisEvaluator(StorableConstructorFlag _) : base(_) { }
    109105    protected GESymbolicDataAnalysisEvaluator(GESymbolicDataAnalysisEvaluator<T> original, Cloner cloner)
    110106      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisProblem.cs

    r16453 r16462  
    3434using HeuristicLab.Optimization;
    3535using HeuristicLab.Parameters;
    36 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     36using HEAL.Fossil;
    3737using HeuristicLab.PluginInfrastructure;
    3838using HeuristicLab.Problems.DataAnalysis;
    … …  
    4242
    4343namespace HeuristicLab.Problems.GrammaticalEvolution {
    44   [StorableClass]
     44  [StorableType("E31AC1E8-590D-4D65-883F-3113544B6C91")]
    4545  public abstract class GESymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>,
    4646                                                                 IGESymbolicDataAnalysisProblem, IStorableContent,
    … …  
    150150
    151151    [StorableConstructor]
    152     protected GESymbolicDataAnalysisProblem(bool deserializing) : base(deserializing) { }
     152    protected GESymbolicDataAnalysisProblem(StorableConstructorFlag _) : base(_) { }
    153153    [StorableHook(HookType.AfterDeserialization)]
    154154    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisSingleObjectiveEvaluator.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131
    3232namespace HeuristicLab.Problems.GrammaticalEvolution {
    33   [StorableClass]
     33  [StorableType("BEC10226-1F0C-4D42-ABDF-38E604C0B2F2")]
    3434  public abstract class GESymbolicDataAnalysisSingleObjectiveEvaluator<T> : GESymbolicDataAnalysisEvaluator<T>, IGESymbolicDataAnalysisSingleObjectiveEvaluator<T>
    3535   where T : class, IDataAnalysisProblemData {
    … …  
    4444    #endregion
    4545    [StorableConstructor]
    46     protected GESymbolicDataAnalysisSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     46    protected GESymbolicDataAnalysisSingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    4747    protected GESymbolicDataAnalysisSingleObjectiveEvaluator(GESymbolicDataAnalysisSingleObjectiveEvaluator<T> original, Cloner cloner)
    4848      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisSingleObjectiveProblem.cs

    r16453 r16462  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.Problems.DataAnalysis;
    3434using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3535
    3636namespace HeuristicLab.Problems.GrammaticalEvolution {
    37   [StorableClass]
     37  [StorableType("27E01C21-6772-4CE5-8301-EF3102D1BB28")]
    3838  public abstract class GESymbolicDataAnalysisSingleObjectiveProblem<T, U, V> : GESymbolicDataAnalysisProblem<T, U, V>,
    3939                                                                                IGESymbolicDataAnalysisSingleObjectiveProblem
    … …  
    7272
    7373    [StorableConstructor]
    74     protected GESymbolicDataAnalysisSingleObjectiveProblem(bool deserializing) : base(deserializing) { }
     74    protected GESymbolicDataAnalysisSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
    7575    protected GESymbolicDataAnalysisSingleObjectiveProblem(GESymbolicDataAnalysisSingleObjectiveProblem<T, U, V> original, Cloner cloner)
    7676      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicExpressionGrammar.cs

    r16453 r16462  
    2828using HeuristicLab.Core;
    2929using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3232using HeuristicLab.Random;
    3333
    3434namespace HeuristicLab.Problems.GrammaticalEvolution {
    35   [StorableClass]
     35  [StorableType("73D43A23-02FF-4BD8-9834-55D8A90E0FCE")]
    3636  [Item("GESymbolicExpressionGrammar", "Represents a grammar for functional expressions for grammatical evolution.")]
    3737  public class GESymbolicExpressionGrammar : SymbolicExpressionGrammar, ISymbolicDataAnalysisGrammar {
    3838    [StorableConstructor]
    39     protected GESymbolicExpressionGrammar(bool deserializing) : base(deserializing) { }
     39    protected GESymbolicExpressionGrammar(StorableConstructorFlag _) : base(_) { }
    4040    protected GESymbolicExpressionGrammar(GESymbolicExpressionGrammar original, Cloner cloner) : base(original, cloner) { }
    4141    public GESymbolicExpressionGrammar()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicRegressionSingleObjectiveEvaluator.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Problems.DataAnalysis;
    3131using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
    3232
    3333namespace HeuristicLab.Problems.GrammaticalEvolution {
    34   [StorableClass]
     34  [StorableType("85880E49-DE2F-4FB4-8C1E-F1C51D862FDF")]
    3535  public class GESymbolicRegressionSingleObjectiveEvaluator : GESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>,
    3636                                                              IGESymbolicRegressionSingleObjectiveEvaluator {
    … …  
    5757
    5858    [StorableConstructor]
    59     protected GESymbolicRegressionSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     59    protected GESymbolicRegressionSingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    6060    protected GESymbolicRegressionSingleObjectiveEvaluator(GESymbolicRegressionSingleObjectiveEvaluator original, Cloner cloner) : base(original, cloner) { }
    6161    public GESymbolicRegressionSingleObjectiveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicRegressionSingleObjectiveProblem.cs

    r16453 r16462  
    2828using HeuristicLab.Encodings.IntegerVectorEncoding;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131using HeuristicLab.Problems.DataAnalysis;
    3232using HeuristicLab.Problems.DataAnalysis.Symbolic;
    … …  
    3636  [Item("Grammatical Evolution Symbolic Regression Problem (GE)",
    3737        "Represents grammatical evolution for single objective symbolic regression problems.")]
    38   [StorableClass]
     38  [StorableType("65208F51-3181-4765-BA04-33CADBCE0826")]
    3939  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 180)]
    4040  public class GESymbolicRegressionSingleObjectiveProblem : GESymbolicDataAnalysisSingleObjectiveProblem<IRegressionProblemData, IGESymbolicRegressionSingleObjectiveEvaluator, IIntegerVectorCreator>,
    … …  
    5757    #endregion
    5858    [StorableConstructor]
    59     protected GESymbolicRegressionSingleObjectiveProblem(bool deserializing) : base(deserializing) { }
     59    protected GESymbolicRegressionSingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
    6060    protected GESymbolicRegressionSingleObjectiveProblem(GESymbolicRegressionSingleObjectiveProblem original, Cloner cloner)
    6161      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.