Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (4 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
19 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAAnalyzer.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;
    3333
    3434namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3535  [Item("CMAAnalyzer", "Analyzes the development of strategy parameters and visualizes the performance of CMA-ES.")]
    36   [StorableClass]
     36  [StorableType("7E36BAC4-D2A5-405D-B46F-FF91BC592D43")]
    3737  public sealed class CMAAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3838
     
    6060
    6161    [StorableConstructor]
    62     private CMAAnalyzer(bool deserializing) : base(deserializing) { }
     62    private CMAAnalyzer(StorableConstructorFlag _) : base(_) { }
    6363    private CMAAnalyzer(CMAAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6464    public CMAAnalyzer()
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAEvolutionStrategy.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.Optimization.Operators;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3434using HeuristicLab.PluginInfrastructure;
    3535using HeuristicLab.Random;
     
    3838  [Item("CMA Evolution Strategy (CMAES)", "An evolution strategy based on covariance matrix adaptation.")]
    3939  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 210)]
    40   [StorableClass]
     40  [StorableType("92CB2910-2D63-49A4-94DE-54DBA0CF2180")]
    4141  public sealed class CMAEvolutionStrategy : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4242    public string Filename { get; set; }
     
    224224
    225225    [StorableConstructor]
    226     private CMAEvolutionStrategy(bool deserializing) : base(deserializing) { }
     226    private CMAEvolutionStrategy(StorableConstructorFlag _) : base(_) { }
    227227    private CMAEvolutionStrategy(CMAEvolutionStrategy original, Cloner cloner)
    228228      : base(original, cloner) {
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAEqualweightedRecombinator.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;
    2525
    2626namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    2727  [Item("CMA Equal-weighted Recombinator", "Calculates weighted mean using equal weights.")]
    28   [StorableClass]
     28  [StorableType("989FE031-C410-4435-B5F5-17A22C4A97BC")]
    2929  public class CMAEqualweightedRecombinator : CMARecombinator {
    3030
    3131    [StorableConstructor]
    32     protected CMAEqualweightedRecombinator(bool deserializing) : base(deserializing) { }
     32    protected CMAEqualweightedRecombinator(StorableConstructorFlag _) : base(_) { }
    3333    protected CMAEqualweightedRecombinator(CMAEqualweightedRecombinator original, Cloner cloner) : base(original, cloner) { }
    3434    public CMAEqualweightedRecombinator() : base() { }
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAInitializer.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using System;
    3030using System.Collections.Generic;
     
    3333namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3434  [Item("CMAInitializer", "Initializes the covariance matrix and step size variables.")]
    35   [StorableClass]
     35  [StorableType("AEE40FF4-A610-474B-B969-032A54D814CE")]
    3636  public class CMAInitializer : SingleSuccessorOperator, ICMAInitializer, IIterationBasedOperator {
    3737
     
    7979
    8080    [StorableConstructor]
    81     protected CMAInitializer(bool deserializing) : base(deserializing) { }
     81    protected CMAInitializer(StorableConstructorFlag _) : base(_) { }
    8282    protected CMAInitializer(CMAInitializer original, Cloner cloner) : base(original, cloner) { }
    8383    public CMAInitializer()
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMALinearweightedRecombinator.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;
    2525
    2626namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    2727  [Item("CMA Linear-weighted Recombinator", "Calculates weighted mean using linear decreasing weights.")]
    28   [StorableClass]
     28  [StorableType("628D27E7-AD3F-418B-A44D-E5338017CA69")]
    2929  public class CMALinearweightedRecombinator : CMARecombinator {
    3030
    3131    [StorableConstructor]
    32     protected CMALinearweightedRecombinator(bool deserializing) : base(deserializing) { }
     32    protected CMALinearweightedRecombinator(StorableConstructorFlag _) : base(_) { }
    3333    protected CMALinearweightedRecombinator(CMALinearweightedRecombinator original, Cloner cloner) : base(original, cloner) { }
    3434    public CMALinearweightedRecombinator() : base() { }
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMALogweightedRecombinator.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.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    2929  [Item("CMA Log-weighted Recombinator", "Calculates weighted mean based on a logarithmic decreasing weights.")]
    30   [StorableClass]
     30  [StorableType("83A47E81-FF87-4A28-AEB4-DE453B55B680")]
    3131  public class CMALogweightedRecombinator : CMARecombinator {
    3232
    3333    [StorableConstructor]
    34     protected CMALogweightedRecombinator(bool deserializing) : base(deserializing) { }
     34    protected CMALogweightedRecombinator(StorableConstructorFlag _) : base(_) { }
    3535    protected CMALogweightedRecombinator(CMALogweightedRecombinator original, Cloner cloner) : base(original, cloner) { }
    3636    public CMALogweightedRecombinator() : base() { }
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAMutator.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.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131using HeuristicLab.Random;
    3232
    3333namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3434  [Item("CMAMutator", "Mutates the solution vector according to the CMA-ES scheme.")]
    35   [StorableClass]
     35  [StorableType("13539C1A-1D94-4CD7-8514-2173C661333D")]
    3636  public sealed class CMAMutator : SingleSuccessorOperator, IStochasticOperator, ICMAManipulator, IIterationBasedOperator {
    3737
     
    8383
    8484    [StorableConstructor]
    85     private CMAMutator(bool deserializing) : base(deserializing) { }
     85    private CMAMutator(StorableConstructorFlag _) : base(_) { }
    8686    private CMAMutator(CMAMutator original, Cloner cloner) : base(original, cloner) { }
    8787    public CMAMutator()
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMARecombinator.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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using System;
    2929
    3030namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3131  [Item("CMARecombinator", "Base class that calculates the weighted mean of a number of offspring.")]
    32   [StorableClass]
     32  [StorableType("C0798B4D-1685-4720-828A-17E40879000B")]
    3333  public abstract class CMARecombinator : SingleSuccessorOperator, ICMARecombinator {
    3434
     
    5656
    5757    [StorableConstructor]
    58     protected CMARecombinator(bool deserializing) : base(deserializing) { }
     58    protected CMARecombinator(StorableConstructorFlag _) : base(_) { }
    5959    protected CMARecombinator(CMARecombinator original, Cloner cloner) : base(original, cloner) { }
    6060    protected CMARecombinator()
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAOperators/CMAUpdater.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.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using System;
    3131using System.Linq;
     
    3333namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3434  [Item("CMAUpdater", "Updates the covariance matrix and strategy parameters of CMA-ES.")]
    35   [StorableClass]
     35  [StorableType("872D120A-1CBE-4C01-8250-E34BF8BBD9DA")]
    3636  public class CMAUpdater : SingleSuccessorOperator, ICMAUpdater, IIterationBasedOperator, ISingleObjectiveOperator {
    3737
     
    7979
    8080    [StorableConstructor]
    81     protected CMAUpdater(bool deserializing) : base(deserializing) { }
     81    protected CMAUpdater(StorableConstructorFlag _) : base(_) { }
    8282    protected CMAUpdater(CMAUpdater original, Cloner cloner) : base(original, cloner) { }
    8383    public CMAUpdater()
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/CMAParameters.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.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    2929  [Item("CMAParameters", "CMA-ES controls many strategy parameters that guide the search and which are combined in this class.")]
    30   [StorableClass]
     30  [StorableType("FB7495E1-6285-4E3E-AEC3-F40CCB182F0F")]
    3131  public sealed class CMAParameters : Item {
    3232
     
    8181
    8282    [StorableConstructor]
    83     private CMAParameters(bool deserializing) : base(deserializing) { }
     83    private CMAParameters(StorableConstructorFlag _) : base(_) { }
    8484    private CMAParameters(CMAParameters original, Cloner cloner)
    8585      : base(original, cloner) {
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/HeuristicLab.Algorithms.CMAEvolutionStrategy-3.4.csproj

    r12817 r16565  
    1111    <RootNamespace>HeuristicLab.Algorithms.CMAEvolutionStrategy</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.CMAEvolutionStrategy-3.4</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    104104      <Private>False</Private>
    105105    </Reference>
     106    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     107      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     108    </Reference>
     109    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     110      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     111    </Reference>
    106112    <Reference Include="System" />
    107113    <Reference Include="System.Core">
     
    109115    </Reference>
    110116    <Reference Include="System.Drawing" />
     117    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     118      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     119    </Reference>
    111120    <Reference Include="System.Xml.Linq">
    112121      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    139148  <ItemGroup>
    140149    <None Include="HeuristicLab.snk" />
     150    <None Include="packages.config" />
    141151    <None Include="Plugin.cs.frame" />
    142152    <None Include="Properties\AssemblyInfo.cs.frame" />
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Interfaces/ICMAInitializer.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Data;
    2626using System;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
     30  [StorableType("EA9351D0-94F1-49D5-BE86-000CA0D4996E")]
    2931  public interface ICMAInitializer : IOperator {
    3032    Type CMAType { get; }
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Interfaces/ICMAManipulator.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    2727using System;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
     31  [StorableType("04C80B53-C695-490F-9D1E-6DAE90FF6AFC")]
    3032  public interface ICMAManipulator : IOperator {
    3133    Type CMAType { get; }
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Interfaces/ICMARecombinator.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    2525using HeuristicLab.Encodings.RealVectorEncoding;
    2626using System;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
     30  [StorableType("33524FCA-B31B-415E-BC53-87C126CAF124")]
    2931  public interface ICMARecombinator : IOperator {
    3032    Type CMAType { get; }
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Interfaces/ICMAUpdater.cs

    r15583 r16565  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
     
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    2727using System;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
     31  [StorableType("0BFE0CF3-24A1-4495-A1F3-6D0ED6634BD7")]
    3032  public interface ICMAUpdater : IOperator {
    3133    Type CMAType { get; }
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Plugin.cs.frame

    r15589 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.
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Properties/AssemblyInfo.cs.frame

    r15589 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.
  • trunk/HeuristicLab.Algorithms.CMAEvolutionStrategy/3.4/Terminator.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.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using System;
    3030using System.Linq;
     
    3232namespace HeuristicLab.Algorithms.CMAEvolutionStrategy {
    3333  [Item("Terminator", "Decides if the algorithm should terminate or not.")]
    34   [StorableClass]
     34  [StorableType("BE0F0791-4B19-4AC0-ACD6-C0FBEF829DBC")]
    3535  public class Terminator : Operator, IIterationBasedOperator, ISingleObjectiveOperator {
    3636
     
    109109
    110110    [StorableConstructor]
    111     protected Terminator(bool deserializing) : base(deserializing) { }
     111    protected Terminator(StorableConstructorFlag _) : base(_) { }
    112112    protected Terminator(Terminator original, Cloner cloner)
    113113      : base(original, cloner) { }
Note: See TracChangeset for help on using the changeset viewer.