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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/Evaluator.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.
    … …  
    2222
    2323using HeuristicLab.Common;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
    28   [StorableClass]
     28  [StorableType("0EEE96AC-9D20-4154-BDA8-0A34C4D5658A")]
    2929  public abstract class SingleObjectiveEvaluator : SymbolicDataAnalysisSingleObjectiveEvaluator<IProblemData>, ISingleObjectiveEvaluator {
    3030    [StorableConstructor]
    31     protected SingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     31    protected SingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    3232    protected SingleObjectiveEvaluator(SingleObjectiveEvaluator original, Cloner cloner)
    3333      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/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.
    … …  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
    2828  [Item("Symbolic Trading Problem (single-objective)", "Represents a single-objective symbolic trading problem.")]
    29   [StorableClass]
     29  [StorableType("4E1FFD34-5720-4578-8D9E-AF657E157109")]
    3030  [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 150)]
    3131  public class SingleObjectiveProblem : SymbolicDataAnalysisSingleObjectiveProblem<IProblemData, ISingleObjectiveEvaluator, ISymbolicDataAnalysisSolutionCreator>, IProblem {
    … …  
    3434
    3535    [StorableConstructor]
    36     protected SingleObjectiveProblem(bool deserializing) : base(deserializing) { }
     36    protected SingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
    3737    protected SingleObjectiveProblem(SingleObjectiveProblem original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) { return new SingleObjectiveProblem(this, cloner); }

  • trunk/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/ProfitEvaluator.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.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
    3131  [Item("Profit Evaluator", "")]
    32   [StorableClass]
     32  [StorableType("2BDA057D-5E6E-4F83-8DB0-DA12B16E9EF4")]
    3333  public class ProfitEvaluator : SingleObjectiveEvaluator {
    3434    [StorableConstructor]
    35     protected ProfitEvaluator(bool deserializing) : base(deserializing) { }
     35    protected ProfitEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected ProfitEvaluator(ProfitEvaluator original, Cloner cloner)
    3737      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SharpeRatioEvaluator.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.
    … …  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2929
    3030namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
    3131  [Item("Sharpe Ratio Evaluator", "")]
    32   [StorableClass]
     32  [StorableType("5F0F5837-D659-4B77-BBCA-F4EFBAE554DB")]
    3333  public class SharpeRatioEvaluator : SingleObjectiveEvaluator {
    3434    [StorableConstructor]
    35     protected SharpeRatioEvaluator(bool deserializing) : base(deserializing) { }
     35    protected SharpeRatioEvaluator(StorableConstructorFlag _) : base(_) { }
    3636    protected SharpeRatioEvaluator(SharpeRatioEvaluator original, Cloner cloner)
    3737      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/TrainingBestSolutionAnalyzer.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.Encodings.SymbolicExpressionTreeEncoding;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2828
    … …  
    3232  /// </summary>
    3333  [Item("Training-best Solution Analyzer (symbolic trading)", "An operator that analyzes the training best symbolic trading solution for single objective symbolic trading problems.")]
    34   [StorableClass]
     34  [StorableType("001D440F-F70F-4798-BEA9-53AAB8D33E94")]
    3535  public sealed class TrainingBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveTrainingBestSolutionAnalyzer<ISolution>,
    3636  ISymbolicDataAnalysisInterpreterOperator {
    … …  
    4747
    4848    [StorableConstructor]
    49     private TrainingBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     49    private TrainingBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    5050    private TrainingBestSolutionAnalyzer(TrainingBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5151    public TrainingBestSolutionAnalyzer()

  • trunk/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/ValidationBestSolutionAnalyzer.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;
    2626using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2727
    … …  
    3131  /// </summary>
    3232  [Item("Validation-best Solution Analyzer (symbolic trading)", "An operator that analyzes the validation best symbolic trading solution for single objective symbolic trading problems.")]
    33   [StorableClass]
     33  [StorableType("BBDC9398-4D40-4170-B22F-77E36C68709F")]
    3434  public sealed class ValidationBestSolutionAnalyzer : SymbolicDataAnalysisSingleObjectiveValidationBestSolutionAnalyzer<ISolution, ISingleObjectiveEvaluator, IProblemData> {
    3535
    3636    [StorableConstructor]
    37     private ValidationBestSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     37    private ValidationBestSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    3838    private ValidationBestSolutionAnalyzer(ValidationBestSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    3939    public ValidationBestSolutionAnalyzer()
Note: See TracChangeset for help on using the changeset viewer.