Free cookie consent management tool by TermsFeed Policy Generator

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

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Analysis

  • stable/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationDiversityAnalyzer.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;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Analysis {
    … …  
    3939  [Obsolete]
    4040  [Item("PopulationDiversityAnalyzer", "An operator for analyzing the solution diversity in a population.")]
    41   [StorableClass]
     41  [StorableType("58DAB745-C7AB-464B-8894-705E45FE0C7A")]
    4242  public abstract class PopulationDiversityAnalyzer<T> : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator where T : class, IItem {
    4343    public virtual bool EnabledByDefault {
    … …  
    6868
    6969    [StorableConstructor]
    70     protected PopulationDiversityAnalyzer(bool deserializing) : base(deserializing) { }
     70    protected PopulationDiversityAnalyzer(StorableConstructorFlag _) : base(_) { }
    7171    protected PopulationDiversityAnalyzer(PopulationDiversityAnalyzer<T> original, Cloner cloner) : base(original, cloner) { }
    7272    public PopulationDiversityAnalyzer()

  • stable/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/PopulationSimilarityAnalyzer.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.
    … …  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232
    3333namespace HeuristicLab.Analysis {
    … …  
    3636  /// </summary>
    3737  [Item("PopulationSimilarityAnalyzer", "An operator for analyzing the solution similarity in a population.")]
    38   [StorableClass]
     38  [StorableType("56A495B0-573F-421A-99E2-24D67D8DB686")]
    3939  public class PopulationSimilarityAnalyzer : SingleSuccessorOperator, IAnalyzer, ISimilarityBasedOperator {
    4040    private const string DiversityResultNameParameterName = "DiversityResultsName";
    … …  
    9696
    9797    [StorableConstructor]
    98     protected PopulationSimilarityAnalyzer(bool deserializing) : base(deserializing) { }
     98    protected PopulationSimilarityAnalyzer(StorableConstructorFlag _) : base(_) { }
    9999
    100100    protected PopulationSimilarityAnalyzer(PopulationSimilarityAnalyzer original, Cloner cloner)

  • stable/HeuristicLab.Analysis/3.3/PopulationSimilarityAnalysis/SingleObjectivePopulationDiversityAnalyzer.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.
    … …  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    … …  
    3636  [NonDiscoverableType]
    3737  [Item("SingleObjectivePopulationDiversityAnalyzer", "An operator for analyzing the solution diversity in a population.")]
    38   [StorableClass]
     38  [StorableType("71612344-657C-4270-8A44-5D521C0118A8")]
    3939  public class SingleObjectivePopulationDiversityAnalyzer : PopulationSimilarityAnalyzer {
    4040    [StorableConstructor]
    41     protected SingleObjectivePopulationDiversityAnalyzer(bool deserializing) : base(deserializing) { }
     41    protected SingleObjectivePopulationDiversityAnalyzer(StorableConstructorFlag _) : base(_) { }
    4242    protected SingleObjectivePopulationDiversityAnalyzer(SingleObjectivePopulationDiversityAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4343
Note: See TracChangeset for help on using the changeset viewer.