Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (6 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/BestSelector.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Selection {
    … …  
    3434  /// </summary>
    3535  [Item("BestSelector", "A selection operator which considers a single double quality value and selects the best.")]
    36   [StorableClass]
     36  [StorableType("D0D03F30-C2A2-488B-81B0-856CA259AA03")]
    3737  public sealed class BestSelector : SingleObjectiveSelector, ISingleObjectiveSelector {
    3838    public BestSelector() : base() { }
    3939    [StorableConstructor]
    40     private BestSelector(bool deserializing) : base(deserializing) { }
     40    private BestSelector(StorableConstructorFlag _) : base(_) { }
    4141    private BestSelector(BestSelector original, Cloner cloner)
    4242      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/ConditionalSelector.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    3030  [Item("ConditionalSelector", "Selects sub-scopes where a certain boolean variable is true.")]
    31   [StorableClass]
     31  [StorableType("ACF05DDC-50DC-41CF-BD5D-CF89AD309A38")]
    3232  public class ConditionalSelector : Selector {
    3333    public ScopeTreeLookupParameter<BoolValue> ConditionParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected ConditionalSelector(bool deserializing) : base(deserializing) { }
     46    protected ConditionalSelector(StorableConstructorFlag _) : base(_) { }
    4747    protected ConditionalSelector(ConditionalSelector original, Cloner cloner)
    4848      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/CrowdedTournamentSelector.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Selection {
    3232  [Item("CrowdedTournamentSelector", "Selects solutions using tournament selection by using the partial order defined in Deb et al. 2002. A Fast and Elitist Multiobjective Genetic Algorithm: NSGA-II. IEEE Transactions on Evolutionary Computation, 6(2), pp. 182-197.")]
    33   [StorableClass]
     33  [StorableType("343E8160-873B-4F76-BCA0-9F031CB6D1D7")]
    3434  public class CrowdedTournamentSelector : Selector, IMultiObjectiveSelector, IStochasticOperator {
    3535    public ILookupParameter<BoolArray> MaximizationParameter {
    … …  
    6464
    6565    [StorableConstructor]
    66     protected CrowdedTournamentSelector(bool deserializing) : base(deserializing) { }
     66    protected CrowdedTournamentSelector(StorableConstructorFlag _) : base(_) { }
    6767    protected CrowdedTournamentSelector(CrowdedTournamentSelector original, Cloner cloner) : base(original, cloner) { }
    6868    public CrowdedTournamentSelector()

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/EvolutionStrategyOffspringSelector.cs

    r16453 r16462  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Runtime.InteropServices;
    2524using HeuristicLab.Common;
    2625using HeuristicLab.Core;
    … …  
    2827using HeuristicLab.Operators;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3130
    3231namespace HeuristicLab.Selection {
    3332  [Item("EvolutionStrategyOffspringSelector", "Selects among the offspring population those that are designated successful and discards the unsuccessful offspring, except for some lucky losers. It expects the parent scopes to be below the first sub-scope, and offspring scopes to be below the second sub-scope separated again in two sub-scopes, the first with the failed offspring and the second with successful offspring.")]
    34   [StorableClass]
     33  [StorableType("CE585C3C-5139-44F0-9CB2-CC901A290831")]
    3534  public class EvolutionStrategyOffspringSelector : SingleSuccessorOperator {
    3635
    … …  
    113112
    114113    [StorableConstructor]
    115     protected EvolutionStrategyOffspringSelector(bool deserializing) : base(deserializing) { }
     114    protected EvolutionStrategyOffspringSelector(StorableConstructorFlag _) : base(_) { }
    116115    protected EvolutionStrategyOffspringSelector(EvolutionStrategyOffspringSelector original, Cloner cloner) : base(original, cloner) { }
    117116    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/GenderSpecificSelector.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Selection {
    3232  [Item("GenderSpecificSelection", "Brings two parents together by sampling each with a different selection scheme (Wagner, S. and Affenzeller, M. 2005. SexualGA: Gender-Specific Selection for Genetic Algorithms. Proceedings of the 9th World Multi-Conference on Systemics, Cybernetics and Informatics (WMSCI), pp. 76-81).")]
    33   [StorableClass]
     33  [StorableType("4707D6F3-A792-456A-87DB-0B1F82D5DBDC")]
    3434  public class GenderSpecificSelector : AlgorithmOperator, ISingleObjectiveSelector, IStochasticOperator {
    3535    #region Parameters
    … …  
    8181
    8282    [StorableConstructor]
    83     protected GenderSpecificSelector(bool deserializing) : base(deserializing) { }
     83    protected GenderSpecificSelector(StorableConstructorFlag _) : base(_) { }
    8484    protected GenderSpecificSelector(GenderSpecificSelector original, Cloner cloner)
    8585      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/GeneralizedRankSelector.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Selection {
    … …  
    3535  /// </summary>
    3636  [Item("GeneralizedRankSelector", "The generalized rank selection operator selects qualities by rank with a varying focus on better qualities. It is implemented as described in Tate, D. M. and Smith, A. E. 1995. A genetic approach to the quadratic assignment problem. Computers & Operations Research, vol. 22, pp. 73-83.")]
    37   [StorableClass]
     37  [StorableType("6423609D-9C11-4CC5-99A1-39257A306DF6")]
    3838  public sealed class GeneralizedRankSelector : StochasticSingleObjectiveSelector, ISelector {
    3939
    … …  
    4343
    4444    [StorableConstructor]
    45     private GeneralizedRankSelector(bool deserializing) : base(deserializing) { }
     45    private GeneralizedRankSelector(StorableConstructorFlag _) : base(_) { }
    4646    private GeneralizedRankSelector(GeneralizedRankSelector original, Cloner cloner) : base(original, cloner) { }
    4747    public GeneralizedRankSelector()

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/HeuristicLab.Selection-3.3.csproj

    r16454 r16462  
    109109      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    110110    </Reference>
    111     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     111    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    112112      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    113113    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/LeftReducer.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Selection {
    … …  
    3131  /// </summary>
    3232  [Item("LeftReducer", "An operator which reduces to the sub-scopes of the leftmost sub-scope of the current scope.")]
    33   [StorableClass]
     33  [StorableType("AFD2FF4E-2F84-491D-9ED2-540E94F8B6B3")]
    3434  public sealed class LeftReducer : Reducer, IReducer {
    3535    [StorableConstructor]
    36     private LeftReducer(bool deserializing) : base(deserializing) { }
     36    private LeftReducer(StorableConstructorFlag _) : base(_) { }
    3737    private LeftReducer(LeftReducer original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/LeftSelector.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    … …  
    3232  /// </summary>
    3333  [Item("LeftSelector", "An operator which selects sub-scopes from left to right.")]
    34   [StorableClass]
     34  [StorableType("7D249BF4-0D6A-4AED-9F1A-128F3BEF66B4")]
    3535  public sealed class LeftSelector : Selector {
    3636    private IValueParameter<BoolValue> CopySelectedParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     private LeftSelector(bool deserializing) : base(deserializing) { }
     49    private LeftSelector(StorableConstructorFlag _) : base(_) { }
    5050    private LeftSelector(LeftSelector original, Cloner cloner)
    5151      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/LinearRankSelector.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Selection {
    … …  
    3434  /// </summary>
    3535  [Item("LinearRankSelector", "A linear rank selection operator which considers the rank based on a single double quality value for selection.")]
    36   [StorableClass]
     36  [StorableType("A1DFD3CF-9CA2-452D-BCF4-D2B5316C1765")]
    3737  public sealed class LinearRankSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
    3838    [StorableConstructor]
    39     private LinearRankSelector(bool deserializing) : base(deserializing) { }
     39    private LinearRankSelector(StorableConstructorFlag _) : base(_) { }
    4040    private LinearRankSelector(LinearRankSelector original, Cloner cloner)
    4141      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/MergingReducer.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Selection {
    … …  
    3131  /// </summary>
    3232  [Item("MergingReducer", "An operator which reduces to the sub-scopes of all sub-scopes of the current scope.")]
    33   [StorableClass]
     33  [StorableType("409FC265-3622-43E0-8314-5D23DED4B381")]
    3434  public sealed class MergingReducer : Reducer, IReducer {
    3535    [StorableConstructor]
    36     private MergingReducer(bool deserializing) : base(deserializing) { }
     36    private MergingReducer(StorableConstructorFlag _) : base(_) { }
    3737    private MergingReducer(MergingReducer original, Cloner cloner)
    3838      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/NoSameMatesSelector.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Selection {
    … …  
    3838  /// </summary>
    3939  [Item("NoSameMatesSelector", "A selector which tries to select two parents which differ in quality as described in: \"S. Gustafson, E. K. Burke, N. Krasnogor, On improving genetic programming for symbolic regression, The 2005 IEEE Congress on Evolutionary Computation, pp. 912-919, 2005.\"")]
    40   [StorableClass]
     40  [StorableType("51C70E5F-0CF4-4BE6-9454-AEAF9D13485A")]
    4141  public class NoSameMatesSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
    4242    private const string SelectorParameterName = "Selector";
    … …  
    7777
    7878    [StorableConstructor]
    79     protected NoSameMatesSelector(bool deserializing) : base(deserializing) { }
     79    protected NoSameMatesSelector(StorableConstructorFlag _) : base(_) { }
    8080    protected NoSameMatesSelector(NoSameMatesSelector original, Cloner cloner)
    8181      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/OffspringSelector.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Selection {
    3131  [Item("OffspringSelector", "Selects among the offspring population those that are designated successful and discards the unsuccessful offspring, except for some lucky losers. It expects the parent scopes to be below the first sub-scope, and offspring scopes to be below the second sub-scope separated again in two sub-scopes, the first with the failed offspring and the second with successful offspring.")]
    32   [StorableClass]
     32  [StorableType("20283BB2-C41B-404B-BDE2-4117D9719C45")]
    3333  public class OffspringSelector : SingleSuccessorOperator {
    3434    public ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
    … …  
    6767
    6868    [StorableConstructor]
    69     protected OffspringSelector(bool deserializing) : base(deserializing) { }
     69    protected OffspringSelector(StorableConstructorFlag _) : base(_) { }
    7070    [StorableHook(HookType.AfterDeserialization)]
    7171    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/ProportionalSelector.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Selection {
    … …  
    3535  /// </summary>
    3636  [Item("ProportionalSelector", "A quality proportional selection operator which considers a single double quality value for selection.")]
    37   [StorableClass]
     37  [StorableType("82E6E547-4B36-4873-B9B9-E155EE913228")]
    3838  public sealed class ProportionalSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
    3939    private ValueParameter<BoolValue> WindowingParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     private ProportionalSelector(bool deserializing) : base(deserializing) { }
     49    private ProportionalSelector(StorableConstructorFlag _) : base(_) { }
    5050    private ProportionalSelector(ProportionalSelector original, Cloner cloner)
    5151      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/RandomReplacer.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    3030  [Item("RandomReplacer", "Replaces some randomly selected sub-scopes of the remaining scope with all those (or the best if there are more) from the selected scope.")]
    31   [StorableClass]
     31  [StorableType("526A1887-C636-4702-8041-36EE0C2F1DA0")]
    3232  public sealed class RandomReplacer : Replacer, IStochasticOperator, ISingleObjectiveReplacer {
    3333    public override bool CanChangeName {
    … …  
    4949
    5050    [StorableConstructor]
    51     private RandomReplacer(bool deserializing) : base(deserializing) { }
     51    private RandomReplacer(StorableConstructorFlag _) : base(_) { }
    5252    private RandomReplacer(RandomReplacer original, Cloner cloner)
    5353      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/RandomSelector.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Selection {
    … …  
    3333  /// </summary>
    3434  [Item("RandomSelector", "A random selection operator.")]
    35   [StorableClass]
     35  [StorableType("4F442F5F-CCE7-4DC3-9C88-5B719A011C88")]
    3636  public sealed class RandomSelector : StochasticSelector, ISelector {
    3737    private IValueParameter<BoolValue> CopySelectedParameter {
    … …  
    4848
    4949    [StorableConstructor]
    50     private RandomSelector(bool deserializing) : base(deserializing) { }
     50    private RandomSelector(StorableConstructorFlag _) : base(_) { }
    5151    private RandomSelector(RandomSelector original, Cloner cloner)
    5252      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/Reducer.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    … …  
    3232  /// </summary>
    3333  [Item("Reducer", "A base class for reduction operators.")]
    34   [StorableClass]
     34  [StorableType("ADEA7125-A5E1-4A26-AE05-9DE900B9BE5C")]
    3535  public abstract class Reducer : SingleSuccessorOperator {
    3636    protected ScopeParameter CurrentScopeParameter {
    … …  
    4343
    4444    [StorableConstructor]
    45     protected Reducer(bool deserializing) : base(deserializing) { }
     45    protected Reducer(StorableConstructorFlag _) : base(_) { }
    4646    protected Reducer(Reducer original, Cloner cloner)
    4747      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/Replacer.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Selection {
    3232  [Item("Replacer", "Generic replacer that replaces sub-scopes of the remaining scope with those from the selected scope.")]
    33   [StorableClass]
     33  [StorableType("E92517F6-5936-4143-B07A-E76BC7A508F3")]
    3434  public class Replacer : AlgorithmOperator, IReplacer {
    3535    public IValueLookupParameter<ISelector> ReplacedSelectorParameter {
    … …  
    4141
    4242    [StorableConstructor]
    43     protected Replacer(bool deserializing) : base(deserializing) { }
     43    protected Replacer(StorableConstructorFlag _) : base(_) { }
    4444    protected Replacer(Replacer original, Cloner cloner) : base(original, cloner) { }
    4545    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/RightChildReducer.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Selection {
    … …  
    4141  /// </summary>
    4242  [Item("RightChildReducer", "Merges all sub-scopes generated by successively selecting sub-scopes of the remaining part.")]
    43   [StorableClass]
     43  [StorableType("D1857728-A661-46BE-AA08-CDF830DD81A8")]
    4444  public class RightChildReducer : Reducer, IReducer {
    4545    [StorableConstructor]
    46     protected RightChildReducer(bool deserializing) : base(deserializing) { }
     46    protected RightChildReducer(StorableConstructorFlag _) : base(_) { }
    4747    protected RightChildReducer(RightChildReducer original, Cloner cloner) : base(original, cloner) { }
    4848    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/RightReducer.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Selection {
    … …  
    3131  /// </summary>
    3232  [Item("RightReducer", "An operator which reduces to the sub-scopes of the rightmost sub-scope of the current scope.")]
    33   [StorableClass]
     33  [StorableType("D06F6701-B166-4AF1-9EB7-BA6C187DFBB1")]
    3434  public sealed class RightReducer : Reducer, IReducer {
    3535    [StorableConstructor]
    36     private RightReducer(bool deserializing) : base(deserializing) { }
     36    private RightReducer(StorableConstructorFlag _) : base(_) { }
    3737    private RightReducer(RightReducer original, Cloner cloner) : base(original, cloner) { }
    3838    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/RightSelector.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    … …  
    3232  /// </summary>
    3333  [Item("RightSelector", "An operator which selects sub-scopes from right to left.")]
    34   [StorableClass]
     34  [StorableType("D34AB8F1-5F8E-4265-9607-D5EE26DA75D0")]
    3535  public sealed class RightSelector : Selector {
    3636    private IValueParameter<BoolValue> CopySelectedParameter {
    … …  
    4646    }
    4747    [StorableConstructor]
    48     private RightSelector(bool deserializing) : base(deserializing) { }
     48    private RightSelector(StorableConstructorFlag _) : base(_) { }
    4949    private RightSelector(RightSelector original, Cloner cloner) : base(original, cloner) { }
    5050    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/Selector.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    … …  
    3232  /// </summary>
    3333  [Item("Selector", "A base class for selection operators.")]
    34   [StorableClass]
     34  [StorableType("88363FF9-09A4-4A31-A099-D3C86E84947D")]
    3535  public abstract class Selector : InstrumentedOperator {
    3636    public override bool CanChangeName {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected Selector(bool deserializing) : base(deserializing) { }
     48    protected Selector(StorableConstructorFlag _) : base(_) { }
    4949    protected Selector(Selector original, Cloner cloner) : base(original, cloner) { }
    5050

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/SingleObjectiveSelector.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    … …  
    3232  /// </summary>
    3333  [Item("SingleObjectiveSelector", "A base class for selection operators which consider a single double quality value for selection.")]
    34   [StorableClass]
     34  [StorableType("50A55690-CD32-4675-B74F-E6B6D860587E")]
    3535  public abstract class SingleObjectiveSelector : Selector, ISingleObjectiveOperator {
    3636    protected IValueParameter<BoolValue> CopySelectedParameter {
    … …  
    5353
    5454    [StorableConstructor]
    55     protected SingleObjectiveSelector(bool deserializing) : base(deserializing) { }
     55    protected SingleObjectiveSelector(StorableConstructorFlag _) : base(_) { }
    5656    protected SingleObjectiveSelector(SingleObjectiveSelector original, Cloner cloner) : base(original, cloner) { }
    5757

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/StochasticSelector.cs

    r16453 r16462  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Selection {
    … …  
    3131  /// </summary>
    3232  [Item("StochasticSelector", "A base class for stochastic selection operators.")]
    33   [StorableClass]
     33  [StorableType("311180FE-97EE-48FF-A4C0-40982D6B862A")]
    3434  public abstract class StochasticSelector : Selector, IStochasticOperator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3838
    3939    [StorableConstructor]
    40     protected StochasticSelector(bool deserializing) : base(deserializing) { }
     40    protected StochasticSelector(StorableConstructorFlag _) : base(_) { }
    4141    protected StochasticSelector(StochasticSelector original, Cloner cloner) : base(original, cloner) { }
    4242    protected StochasticSelector()

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/StochasticSingleObjectiveSelector.cs

    r16453 r16462  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Selection {
    … …  
    3131  /// </summary>
    3232  [Item("StochasticSingleObjectiveSelector", "A base class for stochastic selection operators which consider a single double quality value for selection.")]
    33   [StorableClass]
     33  [StorableType("566030A6-F1F8-4F45-A768-4D2BD236D39E")]
    3434  public abstract class StochasticSingleObjectiveSelector : SingleObjectiveSelector, IStochasticOperator {
    3535    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3737    }
    3838    [StorableConstructor]
    39     protected StochasticSingleObjectiveSelector(bool deserializing) : base(deserializing) { }
     39    protected StochasticSingleObjectiveSelector(StorableConstructorFlag _) : base(_) { }
    4040    protected StochasticSingleObjectiveSelector(StochasticSingleObjectiveSelector original, Cloner cloner) : base(original, cloner) { }
    4141    protected StochasticSingleObjectiveSelector()

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/TournamentSelector.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Selection {
    … …  
    3535  /// </summary>
    3636  [Item("TournamentSelector", "A tournament selection operator which considers a single double quality value for selection.")]
    37   [StorableClass]
     37  [StorableType("84B5B6EA-A3A0-4E06-B663-DE451306A1CE")]
    3838  public sealed class TournamentSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
    3939    public ValueLookupParameter<IntValue> GroupSizeParameter {
    … …  
    4242
    4343    [StorableConstructor]
    44     private TournamentSelector(bool deserializing) : base(deserializing) { }
     44    private TournamentSelector(StorableConstructorFlag _) : base(_) { }
    4545    private TournamentSelector(TournamentSelector original, Cloner cloner) : base(original, cloner) { }
    4646    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/WorstReplacer.cs

    r16453 r16462  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Selection {
    3030  [Item("WorstReplacer", "Replaces the worst sub-scopes of the remaining scope with all those (or the best if there are more) from the selected scope.")]
    31   [StorableClass]
     31  [StorableType("9B56E562-0E21-4FED-AB2F-553D49AEC47D")]
    3232  public sealed class WorstReplacer : Replacer, ISingleObjectiveReplacer {
    3333    public override bool CanChangeName {
    … …  
    4646
    4747    [StorableConstructor]
    48     private WorstReplacer(bool deserializing) : base(deserializing) { }
     48    private WorstReplacer(StorableConstructorFlag _) : base(_) { }
    4949    private WorstReplacer(WorstReplacer original, Cloner cloner) : base(original, cloner) { }
    5050    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Selection/3.3/WorstSelector.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Selection {
    … …  
    3434  /// </summary>
    3535  [Item("WorstSelector", "A selection operator which considers a single double quality value and selects the worst.")]
    36   [StorableClass]
     36  [StorableType("FD37F242-2CB7-4528-9047-4011A61CE24F")]
    3737  public sealed class WorstSelector : SingleObjectiveSelector, ISingleObjectiveSelector {
    3838    [StorableConstructor]
    39     private WorstSelector(bool deserializing) : base(deserializing) { }
     39    private WorstSelector(StorableConstructorFlag _) : base(_) { }
    4040    private WorstSelector(WorstSelector original, Cloner cloner) : base(original, cloner) { }
    4141    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.