Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Trading

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/IEvaluator.cs

    r15584 r17097  
    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.
    … …  
    2121
    2222using HeuristicLab.Problems.DataAnalysis.Symbolic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
     26  [StorableType("d271ad83-6ee0-46cc-8f38-98f0c186e53e")]
    2527  public interface IEvaluator : ISymbolicDataAnalysisEvaluator<IProblemData> {
    2628  }

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/IModel.cs

    r15584 r17097  
    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.
    … …  
    2121
    2222using HeuristicLab.Problems.DataAnalysis.Symbolic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
     26  [StorableType("3d34cc92-f473-4d18-952e-3aaf0c073f83")]
    2527  public interface IModel : Trading.IModel, ISymbolicDataAnalysisModel {
    2628  }

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/ISingleObjectiveEvaluator.cs

    r15584 r17097  
    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.
    … …  
    2121
    2222using HeuristicLab.Problems.DataAnalysis.Symbolic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
     26  [StorableType("2ac3c3c3-f91c-4ca6-a1e5-79d9afd64a34")]
    2527  public interface ISingleObjectiveEvaluator : IEvaluator, ISymbolicDataAnalysisSingleObjectiveEvaluator<IProblemData> {
    2628  }

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Interfaces/ISolution.cs

    r15584 r17097  
    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.
    … …  
    2121
    2222using HeuristicLab.Problems.DataAnalysis.Symbolic;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.DataAnalysis.Trading.Symbolic {
     26  [StorableType("efc8089d-0545-4ad7-b444-85e286dd7596")]
    2527  public interface ISolution : Trading.ISolution, ISymbolicDataAnalysisSolution {
    2628    new IModel Model { get; }

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Model.cs

    r17054 r17097  
    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.Core;
    2727using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3030
    … …  
    3333  /// Represents a symbolic trading model
    3434  /// </summary>
    35   [StorableClass]
     35  [StorableType("EDBE6BAD-B331-4301-AA8C-234196942DF4")]
    3636  [Item(Name = "Model (symbolic trading)", Description = "Represents a symbolic trading model.")]
    3737  public class Model : SymbolicDataAnalysisModel, IModel {
    3838
    3939    [StorableConstructor]
    40     protected Model(bool deserializing) : base(deserializing) { }
     40    protected Model(StorableConstructorFlag _) : base(_) { }
    4141    protected Model(Model original, Cloner cloner)
    4242      : base(original, cloner) { }

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/Evaluator.cs

    r15584 r17097  
    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) {

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/Problem.cs

    r15584 r17097  
    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); }

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/ProfitEvaluator.cs

    r15584 r17097  
    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) {

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SharpeRatioEvaluator.cs

    r15584 r17097  
    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) {

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/TrainingBestSolutionAnalyzer.cs

    r15584 r17097  
    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()

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/ValidationBestSolutionAnalyzer.cs

    r15584 r17097  
    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()

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Solution.cs

    r15584 r17097  
    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.Data;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727using HeuristicLab.Problems.DataAnalysis.Symbolic;
    2828
    … …  
    3131  /// Represents a symbolic trading solution (model + data) and attributes of the solution like accuracy and complexity
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("A4B82FA6-562B-477D-998C-996724EA1366")]
    3434  [Item(Name = "Solution (symbolic trading)",
    3535    Description =
    … …  
    6060
    6161    [StorableConstructor]
    62     private SymbolicSolution(bool deserializing)
    63       : base(deserializing) {
     62    private SymbolicSolution(StorableConstructorFlag _) : base(_) {
    6463    }
    6564
Note: See TracChangeset for help on using the changeset viewer.