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:
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EnumerableBoolEqualityComparer.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 System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Algorithms.ParameterlessPopulationPyramid {
     27  [StorableType("231ae77d-4352-4a70-8662-5f3d5d44f095")]
    2628  public class EnumerableBoolEqualityComparer : IEqualityComparer<IEnumerable<bool>> {
    2729    public bool Equals(IEnumerable<bool> first, IEnumerable<bool> second) {

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EvaluationTracker.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2727using HeuristicLab.Encodings.BinaryVectorEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.Binary;
    3131
    … …  
    3434  // B. W. Goldman and W. F. Punch, "Parameter-less Population Pyramid," GECCO, pp. 785–792, 2014
    3535  // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
    36   [StorableClass]
     36  [StorableType("D5F1358D-C100-40CF-9BA5-E95F72F64D1A")]
    3737  internal sealed class EvaluationTracker : BinaryProblem {
    3838    [Storable]
    … …  
    6666
    6767    [StorableConstructor]
    68     private EvaluationTracker(bool deserializing) : base(deserializing) { }
     68    private EvaluationTracker(StorableConstructorFlag _) : base(_) { }
    6969
    7070    private EvaluationTracker(EvaluationTracker original, Cloner cloner)

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj

    r11994 r16565  
    1010    <RootNamespace>HeuristicLab.Algorithms.ParameterlessPopulationPyramid</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Algorithms.ParameterlessPopulationPyramid-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" />
    … …  
    94104  <ItemGroup>
    95105    <None Include="HeuristicLab.snk" />
     106    <None Include="packages.config" />
    96107    <None Include="Plugin.cs.frame" />
    97108    <None Include="Properties\AssemblyInfo.cs.frame" />

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    3131using HeuristicLab.Optimization;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3434using HeuristicLab.Problems.Binary;
    3535using HeuristicLab.Random;
    … …  
    4141  // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
    4242  [Item("Hill Climber (HC)", "Binary Hill Climber.")]
    43   [StorableClass]
     43  [StorableType("BA349010-6295-406E-8989-B271FB96ED86")]
    4444  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
    4545  public class HillClimber : BasicAlgorithm {
    … …  
    8383
    8484    [StorableConstructor]
    85     protected HillClimber(bool deserializing) : base(deserializing) { }
     85    protected HillClimber(StorableConstructorFlag _) : base(_) { }
    8686    protected HillClimber(HillClimber original, Cloner cloner)
    8787      : base(original, cloner) {

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageTree.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Encodings.BinaryVectorEncoding;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Random;
    3131
    … …  
    3434  // B. W. Goldman and W. F. Punch, "Parameter-less Population Pyramid," GECCO, pp. 785–792, 2014
    3535  // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
    36   [StorableClass]
     36  [StorableType("40E75AC2-ABD0-43A9-AC91-7478FDD6A399")]
    3737  public class LinkageTree : DeepCloneable {
    3838    [Storable]
    … …  
    5151
    5252    [StorableConstructor]
    53     protected LinkageTree(bool deserializing) : base() { }
     53    protected LinkageTree(StorableConstructorFlag _) { }
    5454
    5555

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

    r16071 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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    3232using HeuristicLab.Optimization;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Attic;
    3535using HeuristicLab.Problems.Binary;
    3636using HeuristicLab.Random;
    … …  
    4141  // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
    4242  [Item("Parameter-less Population Pyramid (P3)", "Binary value optimization algorithm which requires no configuration. B. W. Goldman and W. F. Punch, Parameter-less Population Pyramid, GECCO, pp. 785–792, 2014")]
    43   [StorableClass]
     43  [StorableType("CAD84CAB-1ECC-4D76-BDC5-701AAF690E17")]
    4444  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 400)]
    4545  public class ParameterlessPopulationPyramid : BasicAlgorithm {
    … …  
    166166
    167167    [StorableConstructor]
    168     protected ParameterlessPopulationPyramid(bool deserializing) : base(deserializing) { }
     168    protected ParameterlessPopulationPyramid(StorableConstructorFlag _) : base(_) { }
    169169
    170170    protected ParameterlessPopulationPyramid(ParameterlessPopulationPyramid original, Cloner cloner)

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/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.Algorithms.ParameterlessPopulationPyramid/3.3/Population.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Encodings.BinaryVectorEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.ParameterlessPopulationPyramid {
    … …  
    3232  // B. W. Goldman and W. F. Punch, "Parameter-less Population Pyramid," GECCO, pp. 785–792, 2014
    3333  // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
    34   [StorableClass]
     34  [StorableType("E09EB41C-B95C-40DF-BF60-8F1E21E9892F")]
    3535  public class Population : DeepCloneable {
    3636    [Storable]
    … …  
    4747
    4848    [StorableConstructor]
    49     protected Population(bool deserializing) : base() { }
     49    protected Population(StorableConstructorFlag _) { }
    5050
    5151

  • trunk/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/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.