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

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.RAPGA/3.3/Analyzers/OffspringSuccessAnalyzer.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.
     
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Algorithms.RAPGA {
     
    3535  /// </summary>
    3636  [Item("OffspringSuccessAnalyzer", "An operator which analyzes the success of the created offspring in a generation.")]
    37   [StorableClass]
     37  [StorableType("1E42247A-C685-448C-82FF-247A598D6C10")]
    3838  public sealed class OffspringSuccessAnalyzer : AlgorithmOperator, IAnalyzer {
    3939    #region Parameter properties
     
    7272    #region Storing & Cloning
    7373    [StorableConstructor]
    74     private OffspringSuccessAnalyzer(bool deserializing) : base(deserializing) { }
     74    private OffspringSuccessAnalyzer(StorableConstructorFlag _) : base(_) { }
    7575    private OffspringSuccessAnalyzer(OffspringSuccessAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7676    public override IDeepCloneable Clone(Cloner cloner) {
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/Analyzers/PopulationSizeAnalyzer.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.
     
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Algorithms.RAPGA {
     
    3535  /// </summary>
    3636  [Item("PopulationSizeAnalyzer", "An operator which analyzes the size of the population in a scope tree.")]
    37   [StorableClass]
     37  [StorableType("766717D5-F4B8-41E6-9E3F-A270CA53C311")]
    3838  public sealed class PopulationSizeAnalyzer : AlgorithmOperator, IAnalyzer {
    3939    #region Parameter properties
     
    6969    #region Storing & Cloning
    7070    [StorableConstructor]
    71     private PopulationSizeAnalyzer(bool deserializing) : base(deserializing) { }
     71    private PopulationSizeAnalyzer(StorableConstructorFlag _) : base(_) { }
    7272    private PopulationSizeAnalyzer(PopulationSizeAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7373    public override IDeepCloneable Clone(Cloner cloner) {
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/Analyzers/SelectionPressureAnalyzer.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.
     
    2828using HeuristicLab.Optimization.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Algorithms.RAPGA {
     
    3535  /// </summary>
    3636  [Item("SelectionPressureAnalyzer", "An operator which analyzes the actual selection pressure.")]
    37   [StorableClass]
     37  [StorableType("D09EA429-381C-43EC-B033-36B113886CB8")]
    3838  public sealed class SelectionPressureAnalyzer : AlgorithmOperator, IAnalyzer {
    3939    #region Parameter properties
     
    6363    #region Storing & Cloning
    6464    [StorableConstructor]
    65     private SelectionPressureAnalyzer(bool deserializing) : base(deserializing) { }
     65    private SelectionPressureAnalyzer(StorableConstructorFlag _) : base(_) { }
    6666    private SelectionPressureAnalyzer(SelectionPressureAnalyzer original, Cloner cloner) : base(original, cloner) { }
    6767    public override IDeepCloneable Clone(Cloner cloner) {
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/DuplicatesSelector.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.
     
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Selection;
    3030
     
    3737  /// </remarks>
    3838  [Item("DuplicatesSelector", "A selection operator which considers a single solution representation and selects duplicates. The remaining scope then contains unique solutions and the selected scope their duplicates.")]
    39   [StorableClass]
     39  [StorableType("08446059-0FB3-4B20-9D70-B73F2EEC2AAF")]
    4040  public sealed class DuplicatesSelector : SingleObjectiveSelector {
    4141    public IValueLookupParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter {
     
    4444
    4545    [StorableConstructor]
    46     private DuplicatesSelector(bool deserializing) : base(deserializing) { }
     46    private DuplicatesSelector(StorableConstructorFlag _) : base(_) { }
    4747    private DuplicatesSelector(DuplicatesSelector original, Cloner cloner) : base(original, cloner) { }
    4848    public DuplicatesSelector()
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/HeuristicLab.Algorithms.RAPGA-3.3.csproj

    r11920 r17097  
    1111    <RootNamespace>HeuristicLab.Algorithms.RAPGA</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.RAPGA-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
     
    8585  </PropertyGroup>
    8686  <ItemGroup>
     87    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     88      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     89    </Reference>
     90    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     91      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     92    </Reference>
    8793    <Reference Include="System" />
    8894    <Reference Include="System.Core" />
    8995    <Reference Include="System.Data" />
    9096    <Reference Include="System.Drawing" />
     97    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     98      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     99    </Reference>
    91100    <Reference Include="System.Xml" />
    92101  </ItemGroup>
     
    105114  <ItemGroup>
    106115    <None Include="HeuristicLab.snk" />
     116    <None Include="packages.config" />
    107117    <None Include="Plugin.cs.frame" />
    108118    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/Plugin.cs.frame

    r15587 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.
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/ProgressiveOffspringPreserver.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.
     
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.RAPGA {
     
    3737  /// </remarks>
    3838  [Item("ProgressiveOffspringPreserver", "An operator that progressively selects offspring by adding it to a scope list. The operator also performs duplication control.")]
    39   [StorableClass]
     39  [StorableType("36A99B15-7DF3-481A-8D76-24BF4ED7B6F8")]
    4040  public sealed class ProgressiveOffspringPreserver : SingleSuccessorOperator {
    4141    #region Parameter Properties
     
    7373
    7474    [StorableConstructor]
    75     private ProgressiveOffspringPreserver(bool deserializing) : base(deserializing) { }
     75    private ProgressiveOffspringPreserver(StorableConstructorFlag _) : base(_) { }
    7676    private ProgressiveOffspringPreserver(ProgressiveOffspringPreserver original, Cloner cloner) : base(original, cloner) { }
    7777    public ProgressiveOffspringPreserver()
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/Properties/AssemblyInfo.cs.frame

    r15587 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.
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.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.
     
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
     
    4040  [Item("RAPGA", "A relevant alleles preserving genetic algorithm (Affenzeller, M. et al. 2007. Self-adaptive population size adjustment for genetic algorithms. Proceedings of Computer Aided Systems Theory: EuroCAST 2007, Lecture Notes in Computer Science, pp 820–828. Springer).")]
    4141  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 140)]
    42   [StorableClass]
     42  [StorableType("8E326660-354E-4016-B96B-A5B137F766D7")]
    4343  public sealed class RAPGA : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4444    public string Filename { get; set; }
     
    197197
    198198    [StorableConstructor]
    199     private RAPGA(bool deserializing) : base(deserializing) { }
     199    private RAPGA(StorableConstructorFlag _) : base(_) { }
    200200    [StorableHook(HookType.AfterDeserialization)]
    201201    private void AfterDeserialization() {
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.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.
     
    2727using HeuristicLab.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Selection;
    3131
     
    3535  /// </summary>
    3636  [Item("RAPGAMainLoop", "An operator which represents the main loop of a relevant alleles preserving genetic algorithm.")]
    37   [StorableClass]
     37  [StorableType("31A887DE-2FE2-419A-9784-1BAE52067930")]
    3838  public sealed class RAPGAMainLoop : AlgorithmOperator {
    3939    #region Parameter properties
     
    111111
    112112    [StorableConstructor]
    113     private RAPGAMainLoop(bool deserializing) : base(deserializing) { }
     113    private RAPGAMainLoop(StorableConstructorFlag _) : base(_) { }
    114114    private RAPGAMainLoop(RAPGAMainLoop original, Cloner cloner) : base(original, cloner) { }
    115115    public RAPGAMainLoop()
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/ScopeRestorer.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.Operators;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Algorithms.RAPGA {
     
    3434  /// </remarks>
    3535  [Item("ScopeRestorer", "An operator that restores created offspring from a scope list. It adds all scopes in the list as sub-scopes to the current scope.")]
    36   [StorableClass]
     36  [StorableType("3246BDED-5177-4681-A2EF-2E9892AAED09")]
    3737  public class ScopeRestorer : SingleSuccessorOperator {
    3838    #region Parameter Properties
     
    5555
    5656    [StorableConstructor]
    57     protected ScopeRestorer(bool deserializing) : base(deserializing) { }
     57    protected ScopeRestorer(StorableConstructorFlag _) : base(_) { }
    5858    protected ScopeRestorer(ScopeRestorer original, Cloner cloner) : base(original, cloner) { }
    5959    public ScopeRestorer()
  • stable/HeuristicLab.Algorithms.RAPGA/3.3/packages.config

    r16565 r17097  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66</packages>
Note: See TracChangeset for help on using the changeset viewer.