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

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.GrammaticalEvolution

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisEvaluator.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#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.Attic;
    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) {

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisProblem.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.
    … …  
    3434using HeuristicLab.Optimization;
    3535using HeuristicLab.Parameters;
    36 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     36using HEAL.Attic;
    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() {

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisSingleObjectiveEvaluator.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.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicDataAnalysisSingleObjectiveProblem.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.
    … …  
    3030using HeuristicLab.Optimization;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicExpressionGrammar.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.
    … …  
    2828using HeuristicLab.Core;
    2929using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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()

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicRegressionSingleObjectiveEvaluator.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.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    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()

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/GESymbolicRegressionSingleObjectiveProblem.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.
    … …  
    2828using HeuristicLab.Encodings.IntegerVectorEncoding;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisEvaluator.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.
    … …  
    3131using HeuristicLab.Problems.DataAnalysis.Symbolic;
    3232using HeuristicLab.Problems.GrammaticalEvolution.Mappers;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GrammaticalEvolution {
    35 
     36  [StorableType("25134297-7d7e-4d77-bd7a-25b2b10e15c1")]
    3637  public interface IGESymbolicDataAnalysisEvaluator<T> : IEvaluator
    3738    where T : class, IDataAnalysisProblemData {

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisProblem.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.
    … …  
    2828using HeuristicLab.Problems.DataAnalysis;
    2929using HeuristicLab.Problems.DataAnalysis.Symbolic;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GrammaticalEvolution {
     33  [StorableType("ce854ef0-6bf9-453f-8638-9db029eb01c6")]
    3234  public interface IGESymbolicDataAnalysisProblem : IDataAnalysisProblem, IHeuristicOptimizationProblem {
    3335
    … …  
    4749  }
    4850
     51  [StorableType("763c58e2-dc9b-440d-b1d0-5b6c9524242c")]
    4952  public interface IGESymbolicDataAnalysisSingleObjectiveProblem : IGESymbolicDataAnalysisProblem, ISingleObjectiveHeuristicOptimizationProblem { }
    5053}

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisSingleObjectiveEvaluator.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.Optimization;
    2626using HeuristicLab.Problems.DataAnalysis;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GrammaticalEvolution {
     30  [StorableType("52190d05-dfdd-4ebb-9a95-5cd96eb3dc7e")]
    2931  public interface IGESymbolicDataAnalysisSingleObjectiveEvaluator<T> : IGESymbolicDataAnalysisEvaluator<T>, ISingleObjectiveEvaluator
    3032    where T : class,IDataAnalysisProblemData {

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicDataAnalysisValidationAnalyzer.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.Problems.DataAnalysis;
    2727using HeuristicLab.Problems.DataAnalysis.Symbolic;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GrammaticalEvolution {
     31  [StorableType("79deee07-e4f9-41e4-9d12-c0ab504a6b4f")]
    3032  public interface IGESymbolicDataAnalysisValidationAnalyzer<T, U> : ISymbolicDataAnalysisAnalyzer, ISymbolicDataAnalysisInterpreterOperator
    3133    where T : class,IGESymbolicDataAnalysisEvaluator<U>

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicRegressionEvaluator.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.
    … …  
    2424
    2525using HeuristicLab.Problems.DataAnalysis;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.GrammaticalEvolution {
     29  [StorableType("d02447bf-6490-4497-8d46-18bfd65fdce9")]
    2830  public interface IGESymbolicRegressionEvaluator : IGESymbolicDataAnalysisEvaluator<IRegressionProblemData> {
    2931  }

  • trunk/HeuristicLab.Problems.GrammaticalEvolution/3.4/SymbolicRegression/IGESymbolicRegressionSingleObjectiveEvaluator.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.Problems.DataAnalysis;
    2727using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GrammaticalEvolution {
     31  [StorableType("7a1f572f-6ba7-4849-a6b7-57935f28215e")]
    3032  public interface IGESymbolicRegressionSingleObjectiveEvaluator : IGESymbolicRegressionEvaluator,
    3133                                                                   IGESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData> {
Note: See TracChangeset for help on using the changeset viewer.