Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.Binary/3.3/BinaryProblem.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.
    … …  
    3232using HeuristicLab.Optimization.Operators;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Attic;
    3535
    3636namespace HeuristicLab.Problems.Binary {
    37   [StorableClass]
     37  [StorableType("2F6FEB34-BD19-47AF-9484-7F48565C0C43")]
    3838  public abstract class BinaryProblem : SingleObjectiveBasicProblem<BinaryVectorEncoding> {
    3939    public virtual int Length {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected BinaryProblem(bool deserializing) : base(deserializing) { }
     49    protected BinaryProblem(StorableConstructorFlag _) : base(_) { }
    5050    [StorableHook(HookType.AfterDeserialization)]
    5151    private void AfterDeserialization() {

  • trunk/HeuristicLab.Problems.Binary/3.3/DeceptiveStepTrapProblem.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.
    … …  
    2727using HeuristicLab.Encodings.BinaryVectorEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.Binary {
    3232  [Item("Deceptive Step Trap Problem", "Genome encodes completely separable blocks, where each block deceptive with fitness plateaus.")]
    33   [StorableClass]
     33  [StorableType("89777145-7979-4B7B-B798-5F7C7E892A21")]
    3434  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 230)]
    3535  public class DeceptiveStepTrapProblem : DeceptiveTrapProblem {
    3636    [StorableConstructor]
    37     protected DeceptiveStepTrapProblem(bool deserializing) : base(deserializing) { }
     37    protected DeceptiveStepTrapProblem(StorableConstructorFlag _) : base(_) { }
    3838    protected DeceptiveStepTrapProblem(DeceptiveStepTrapProblem original, Cloner cloner)
    3939      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.Binary/3.3/DeceptiveTrapProblem.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.
    … …  
    2828using HeuristicLab.Encodings.BinaryVectorEncoding;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.Binary {
    3333  [Item("Deceptive Trap Problem", "Genome encodes completely separable blocks, where each block is fully deceptive.")]
    34   [StorableClass]
     34  [StorableType("399FFE01-2B76-4DBF-B363-8BB65FE95A5D")]
    3535  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 230)]
    3636  public class DeceptiveTrapProblem : BinaryProblem {
    3737    [StorableConstructor]
    38     protected DeceptiveTrapProblem(bool deserializing) : base(deserializing) { }
     38    protected DeceptiveTrapProblem(StorableConstructorFlag _) : base(_) { }
    3939    protected DeceptiveTrapProblem(DeceptiveTrapProblem original, Cloner cloner)
    4040      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.Binary/3.3/HIFFProblem.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.Core;
    2727using HeuristicLab.Encodings.BinaryVectorEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.Binary {
    3131  [Item("Hierararchical If and only If problem (HIFF)", "Genome evaluated in nested subsets to see if each subset contains either all 0s or all 1s.")]
    32   [StorableClass]
     32  [StorableType("8AC6D94E-E7B4-4216-B2CA-8E142E7A1391")]
    3333  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 220)]
    3434  public class HIFFProblem : BinaryProblem {
    3535    [StorableConstructor]
    36     protected HIFFProblem(bool deserializing) : base(deserializing) { }
     36    protected HIFFProblem(StorableConstructorFlag _) : base(_) { }
    3737    protected HIFFProblem(HIFFProblem original, Cloner cloner)
    3838      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.Binary/3.3/HeuristicLab.Problems.Binary-3.3.csproj

    r14412 r16565  
    1010    <RootNamespace>HeuristicLab.Problems.Binary</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.Binary-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414  </PropertyGroup>
    … …  
    7373  </PropertyGroup>
    7474  <ItemGroup>
     75    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     76      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     77    </Reference>
     78    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     79      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     80    </Reference>
    7581    <Reference Include="System" />
    7682    <Reference Include="System.Core" />
     83    <Reference Include="System.Drawing" />
     84    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     85      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     86    </Reference>
    7787    <Reference Include="System.Xml.Linq" />
    7888    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    92102  <ItemGroup>
    93103    <None Include="HeuristicLab.snk" />
     104    <None Include="packages.config" />
    94105    <None Include="Plugin.cs.frame" />
    95106    <None Include="Properties\AssemblyInfo.cs.frame" />

  • trunk/HeuristicLab.Problems.Binary/3.3/OneMaxProblem.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.Core;
    2626using HeuristicLab.Encodings.BinaryVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.Binary {
    3030  [Item("One Max Problem", "Represents a problem whose objective is to maximize the number of true values.")]
    3131  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 210)]
    32   [StorableClass]
     32  [StorableType("A290ADDE-33F5-4607-ABC0-19349CD0FBF1")]
    3333  public class OneMaxProblem : BinaryProblem {
    3434    public override bool Maximization {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected OneMaxProblem(bool deserializing) : base(deserializing) { }
     45    protected OneMaxProblem(StorableConstructorFlag _) : base(_) { }
    4646
    4747    protected OneMaxProblem(OneMaxProblem original, Cloner cloner) : base(original, cloner) { }

  • trunk/HeuristicLab.Problems.Binary/3.3/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.Problems.Binary/3.3/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.
Note: See TracChangeset for help on using the changeset viewer.