Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/28/19 16:54:20 (6 years ago)
Author:
abeham
Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

  • it doesn't build
Location:
branches/2521_ProblemRefactoring
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • branches/2521_ProblemRefactoring

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ChildrenCopyCreator.cs

    r16692 r16723  
    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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    … …  
    3535  /// </remarks>
    3636  [Item("ChildrenCopyCreator", "Creates a copy of every sub-scope in the current scope and adds it as a child to the sub-scope.")]
    37   [StorableClass]
     37  [StorableType("10AEEFF9-A713-41B5-8551-DD2331E069F2")]
    3838  public sealed class ChildrenCopyCreator : SingleSuccessorOperator {
    3939    private ScopeParameter CurrentScopeParameter {
    … …  
    4545
    4646    [StorableConstructor]
    47     private ChildrenCopyCreator(bool deserializing) : base(deserializing) { }
     47    private ChildrenCopyCreator(StorableConstructorFlag _) : base(_) { }
    4848    private ChildrenCopyCreator(ChildrenCopyCreator original, Cloner cloner) : base(original, cloner) { }
    4949    public ChildrenCopyCreator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ChildrenCreator.cs

    r16692 r16723  
    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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    … …  
    3838  /// </remarks>
    3939  [Item("ChildrenCreator", "An operator which is used to prepare crossover. The sub-scopes of the current scope the operator is applied on represent the parents. The operator creates new and empty scopes for each child, adds the scopes that represent the child's parents as sub-scopes to the child and adds the child as sub-scope to the current scope.")]
    40   [StorableClass]
     40  [StorableType("C9D3181F-B3ED-4953-B0B4-1A307069F11D")]
    4141  public sealed class ChildrenCreator : SingleSuccessorOperator {
    4242    private ScopeParameter CurrentScopeParameter {
    … …  
    5555
    5656    [StorableConstructor]
    57     private ChildrenCreator(bool deserializing) : base(deserializing) { }
     57    private ChildrenCreator(StorableConstructorFlag _) : base(_) { }
    5858    private ChildrenCreator(ChildrenCreator original, Cloner cloner) : base(original, cloner) { }
    5959    public ChildrenCreator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/DiscreteDoubleValueModifier.cs

    r16692 r16723  
    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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    … …  
    3232  /// </summary>
    3333  [Item("DiscreteDoubleValueModifier", "Base class for modifying a double value according to a certain function in discrete intervalls.")]
    34   [StorableClass]
     34  [StorableType("C1FCC849-93B7-49FA-A5B4-D1F24031A795")]
    3535  public abstract class DiscreteDoubleValueModifier : SingleSuccessorOperator, IDiscreteDoubleValueModifier {
    3636    #region parameter properties
    … …  
    7373    #endregion
    7474    [StorableConstructor]
    75     protected DiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }
     75    protected DiscreteDoubleValueModifier(StorableConstructorFlag _) : base(_) { }
    7676    protected DiscreteDoubleValueModifier(DiscreteDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
    7777    /// <summary>

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ExponentialDiscreteDoubleValueModifier.cs

    r16692 r16723  
    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;
    2626
    2727namespace HeuristicLab.Optimization.Operators {
    … …  
    3232@"Modifies the value by exponential fall (steep fall initially, slow fall to the end) or rise (slow rise initially, fast rise to the end).
    3333This uses a standard exponential distribution and yields a base which is implicitly derived by start and end indices and values.")]
    34   [StorableClass]
     34  [StorableType("9DEDC020-F9A5-4067-AC23-7A29B656E818")]
    3535  public class ExponentialDiscreteDoubleValueModifier : DiscreteDoubleValueModifier {
    3636    [StorableConstructor]
    37     protected ExponentialDiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }
     37    protected ExponentialDiscreteDoubleValueModifier(StorableConstructorFlag _) : base(_) { }
    3838    protected ExponentialDiscreteDoubleValueModifier(ExponentialDiscreteDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
    3939    public ExponentialDiscreteDoubleValueModifier() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ExpressionCalculator.cs

    r16692 r16723  
    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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    … …  
    3333  /// </summary>
    3434  [Item("ExpressionCalculator", "An operator that evaluates an expression.")]
    35   [StorableClass]
     35  [StorableType("04FAB284-D11A-4EFF-86C2-B13C1D3D22CE")]
    3636  public class ExpressionCalculator : ValuesCollector {
    3737    [Storable]
    … …  
    5757
    5858    [StorableConstructor]
    59     protected ExpressionCalculator(bool deserializing) : base(deserializing) { }
     59    protected ExpressionCalculator(StorableConstructorFlag _) : base(_) { }
    6060    protected ExpressionCalculator(ExpressionCalculator original, Cloner cloner)
    6161      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/GeneralizedExponentialDiscreteDoubleValueModifier.cs

    r16692 r16723  
    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.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    … …  
    4040Negative slopes are automatically generated if the start value is greater than the end value.
    4141If you use `base`=1 you will get a linear interpolation.")]
    42   [StorableClass]
     42  [StorableType("349D17F2-44D8-46EB-813F-E6D6E73B007F")]
    4343  public class GeneralizedExponentialDiscreteDoubleValueModifier : DiscreteDoubleValueModifier {
    4444
    … …  
    4949
    5050    [StorableConstructor]
    51     protected GeneralizedExponentialDiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }
     51    protected GeneralizedExponentialDiscreteDoubleValueModifier(StorableConstructorFlag _) : base(_) { }
    5252    protected GeneralizedExponentialDiscreteDoubleValueModifier(GeneralizedExponentialDiscreteDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
    5353    public GeneralizedExponentialDiscreteDoubleValueModifier() {

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

    r13164 r16723  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2121    <TargetFrameworkProfile>
    2222    </TargetFrameworkProfile>
    … …  
    231231    </BootstrapperPackage>
    232232  </ItemGroup>
     233  <ItemGroup>
     234    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     235      <SpecificVersion>False</SpecificVersion>
     236      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
     237      <Private>False</Private>
     238    </Reference>
     239  </ItemGroup>
    233240  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    234241  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/LinearDiscreteDoubleValueModifier.cs

    r16692 r16723  
    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 HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Optimization.Operators {
    … …  
    2929  /// </summary>
    3030  [Item("LinearDiscreteDoubleValueModifier", "Modifies the value by linear (constant) fall or rise.")]
    31   [StorableClass]
     31  [StorableType("B0EFCF88-9463-43BA-A0E6-0E0ACB0E4793")]
    3232  public class LinearDiscreteDoubleValueModifier : DiscreteDoubleValueModifier {
    3333    [StorableConstructor]
    34     protected LinearDiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }
     34    protected LinearDiscreteDoubleValueModifier(StorableConstructorFlag _) : base(_) { }
    3535    protected LinearDiscreteDoubleValueModifier(LinearDiscreteDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
    3636    public LinearDiscreteDoubleValueModifier() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/MultiObjective/CrowdedComparisonSorter.cs

    r16692 r16723  
    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.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Optimization.Operators {
    … …  
    3737  [Item("CrowdedComparisonSorter", @"CrowdedComparisonSorter as described in: Deb, Pratap, Agrawal and Meyarivan, ""A Fast and Elitist Multiobjective
    3838Genetic Algorithm: NSGA-II"", IEEE Transactions On Evolutionary Computation, Vol. 6, No. 2, April 2002.")]
    39   [StorableClass]
     39  [StorableType("48F09742-454D-4BAB-A057-96BDF4ACDCE9")]
    4040  public class CrowdedComparisonSorter : SingleSuccessorOperator {
    4141
    … …  
    4949
    5050    [StorableConstructor]
    51     protected CrowdedComparisonSorter(bool deserializing) : base(deserializing) { }
     51    protected CrowdedComparisonSorter(StorableConstructorFlag _) : base(_) { }
    5252    protected CrowdedComparisonSorter(CrowdedComparisonSorter original, Cloner cloner) : base(original, cloner) { }
    5353    public CrowdedComparisonSorter() {
    … …  
    6969    }
    7070
     71    [StorableType("c16dd393-bd08-4a81-abb5-1b7e918a1038")]
    7172    private class CustomComparer : IComparer<int> {
    7273      ItemArray<IntValue> ranks;

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/MultiObjective/CrowdingDistanceAssignment.cs

    r16692 r16723  
    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.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Optimization.Operators {
    3333  [Item("CrowdingDistanceAssignment", "Calculates the crowding distances for each sub-scope as described in Deb et al. 2002. A Fast and Elitist Multiobjective Genetic Algorithm: NSGA-II. IEEE Transactions on Evolutionary Computation, 6(2), pp. 182-197.")]
    34   [StorableClass]
     34  [StorableType("F7DF8B74-F1E6-45D6-A1A8-5D381F20B382")]
    3535  public class CrowdingDistanceAssignment : SingleSuccessorOperator, IMultiObjectiveOperator {
    3636
    … …  
    4848
    4949    [StorableConstructor]
    50     protected CrowdingDistanceAssignment(bool deserializing) : base(deserializing) { }
     50    protected CrowdingDistanceAssignment(StorableConstructorFlag _) : base(_) { }
    5151    protected CrowdingDistanceAssignment(CrowdingDistanceAssignment original, Cloner cloner) : base(original, cloner) { }
    5252    public CrowdingDistanceAssignment() {
    … …  
    103103    }
    104104
     105    [StorableType("30fd1927-b268-4ce7-8960-b04bfa83f1e6")]
    105106    private class QualitiesComparer : IComparer<DoubleArray> {
    106107      private int index;

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/MultiObjective/FastNonDominatedSort.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Linq;
    2524using HeuristicLab.Common;
    … …  
    2827using HeuristicLab.Operators;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3130
    3231namespace HeuristicLab.Optimization.Operators {
    … …  
    3736  [Item("FastNonDominatedSort", @"FastNonDominatedSort as described in: Deb, Pratap, Agrawal and Meyarivan, ""A Fast and Elitist Multiobjective
    3837Genetic Algorithm: NSGA-II"", IEEE Transactions On Evolutionary Computation, Vol. 6, No. 2, April 2002")]
    39   [StorableClass]
     38  [StorableType("0D1919E6-FCDE-4216-831A-E6427C3D986E")]
    4039  public class FastNonDominatedSort : SingleSuccessorOperator, IMultiObjectiveOperator {
    4140
    … …  
    5655
    5756    [StorableConstructor]
    58     protected FastNonDominatedSort(bool deserializing) : base(deserializing) { }
     57    protected FastNonDominatedSort(StorableConstructorFlag _) : base(_) { }
    5958    protected FastNonDominatedSort(FastNonDominatedSort original, Cloner cloner) : base(original, cloner) { }
    6059    public FastNonDominatedSort() {

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/MultiObjective/RankAndCrowdingSorter.cs

    r16692 r16723  
    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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Selection;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    31   [StorableClass]
     31  [StorableType("CC2A5B04-361C-451B-87A4-524895748E79")]
    3232  public class RankAndCrowdingSorter : AlgorithmOperator, IMultiObjectiveOperator {
    3333    #region Parameter properties
    … …  
    5050
    5151    [StorableConstructor]
    52     protected RankAndCrowdingSorter(bool deserializing) : base(deserializing) { }
     52    protected RankAndCrowdingSorter(StorableConstructorFlag _) : base(_) { }
    5353    protected RankAndCrowdingSorter(RankAndCrowdingSorter original, Cloner cloner) : base(original, cloner) { }
    5454    public RankAndCrowdingSorter()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/NoSimilarityCalculator.cs

    r16692 r16723  
    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.
    … …  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    … …  
    3132  /// </remarks>
    3233  [Item("NoSimilarityCalculator", "An item that performs similarity calculation between two solutions. The item always considers two solutions to be distinct.")]
     34  [StorableType("dd0dc63b-f691-4132-963e-eab3e1bc366a")]
    3335  public sealed class NoSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    3436    protected override bool IsCommutative { get { return true; } }
    3537
    36     private NoSimilarityCalculator(bool deserializing) : base(deserializing) { }
     38    [StorableConstructor]
     39    private NoSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    3740    private NoSimilarityCalculator(NoSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
    3841    public NoSimilarityCalculator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ParentCopyCrossover.cs

    r16692 r16723  
    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.Optimization.Operators {
    2929  [Item("ParentCopyCrossover", "This operator creates an offspring by creating a clone of a randomly chosen parent. It can be used in situations where no crossover should occur after selection.")]
    30   [StorableClass]
     30  [StorableType("B97DCEBA-B631-4D12-997A-665C33B86C70")]
    3131  public class ParentCopyCrossover : InstrumentedOperator, ICrossover, IStochasticOperator {
    3232    public ILookupParameter<IRandom> RandomParameter {
    … …  
    3636
    3737    [StorableConstructor]
    38     protected ParentCopyCrossover(bool deserializing) : base(deserializing) { }
     38    protected ParentCopyCrossover(StorableConstructorFlag _) : base(_) { }
    3939    protected ParentCopyCrossover(ParentCopyCrossover original, Cloner cloner) : base(original, cloner) { }
    4040    public ParentCopyCrossover()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/Plugin.cs.frame

    r16692 r16723  
    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.
    … …  
    3636  [PluginDependency("HeuristicLab.Optimization","3.3")]
    3737  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    38   [PluginDependency("HeuristicLab.Persistence", "3.3")]
     38  [PluginDependency("HeuristicLab.Attic", "1.0")]
    3939  [PluginDependency("HeuristicLab.Selection", "3.3")]
    4040  public class HeuristicLabOptimizationOperatorsPlugin : PluginBase {

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ProbabilisticQualityComparator.cs

    r16692 r16723  
    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.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    … …  
    3737  /// </remarks>
    3838  [Item("ProbabilisticQualityComparator", "Compares two qualities and creates a boolean flag that indicates if the left side is better than the right side or if the difference in quality is acceptable given a certain probability.")]
    39   [StorableClass]
     39  [StorableType("E8467C96-D88F-4EFA-B3BF-78DBFA63B36A")]
    4040  public class ProbabilisticQualityComparator : QualityComparator, IStochasticOperator {
    4141    public ILookupParameter<DoubleValue> DampeningParameter {
    … …  
    4747
    4848    [StorableConstructor]
    49     protected ProbabilisticQualityComparator(bool deserializing) : base(deserializing) { }
     49    protected ProbabilisticQualityComparator(StorableConstructorFlag _) : base(_) { }
    5050    protected ProbabilisticQualityComparator(ProbabilisticQualityComparator original, Cloner cloner) : base(original, cloner) { }
    5151    public ProbabilisticQualityComparator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ProgrammableAnalyzer.cs

    r16692 r16723  
    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.Operators.Programmable;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    3030
    3131  [Item("ProgrammableAnalyzer", "An analyzer that can be programmed for arbitrary needs.")]
    32   [StorableClass]
     32  [StorableType("6C821E9E-098E-409B-B281-9B530C1F5835")]
    3333  public class ProgrammableAnalyzer : ProgrammableSingleSuccessorOperator, IAnalyzer {
    3434    public virtual bool EnabledByDefault {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected ProgrammableAnalyzer(bool deserializing) : base(deserializing) { }
     39    protected ProgrammableAnalyzer(StorableConstructorFlag _) : base(_) { }
    4040    protected ProgrammableAnalyzer(ProgrammableAnalyzer original, Cloner cloner)
    4141      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/Properties/AssemblyInfo.cs.frame

    r16692 r16723  
    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.

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/QuadraticDiscreteDoubleValueModifier.cs

    r16692 r16723  
    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 HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Optimization.Operators {
    … …  
    2929  /// </summary>
    3030  [Item("QuadraticDiscreteDoubleValueModifier", "Modifies the value by quadratic fall (slow fall initially, fast fall to the end) or rise (slow rise initally, fast rise to the end).")]
    31   [StorableClass]
     31  [StorableType("49CADD22-7074-4ADB-AA7B-36D03115FB1A")]
    3232  public class QuadraticDiscreteDoubleValueModifier : DiscreteDoubleValueModifier {
    3333    [StorableConstructor]
    34     protected QuadraticDiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }
     34    protected QuadraticDiscreteDoubleValueModifier(StorableConstructorFlag _) : base(_) { }
    3535    protected QuadraticDiscreteDoubleValueModifier(QuadraticDiscreteDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
    3636    public QuadraticDiscreteDoubleValueModifier() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/QualityComparator.cs

    r16692 r16723  
    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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    3030  [Item("QualityComparator", "Compares two qualities and creates a boolean flag that indicates if the left side is better than the right side.")]
    31   [StorableClass]
     31  [StorableType("ACCB56BB-699C-493D-8832-2E3B1D6AEE97")]
    3232  public class QualityComparator : SingleSuccessorOperator, IQualityComparator {
    3333    public ILookupParameter<DoubleValue> LeftSideParameter {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected QualityComparator(bool deserializing) : base(deserializing) { }
     47    protected QualityComparator(StorableConstructorFlag _) : base(_) { }
    4848    protected QualityComparator(QualityComparator original, Cloner cloner) : base(original, cloner) { }
    4949    public QualityComparator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/QualitySimilarityCalculator.cs

    r16692 r16723  
    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.
    … …  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    … …  
    3334  /// </remarks>
    3435  [Item("QualitySimilarityCalculator", "An item that performs similarity calculation between two solutions. The item only considers the qualities of the two solutions.")]
     36  [StorableType("b5ef2b97-4a4a-43cd-aeae-7f951b49cdc1")]
    3537  public sealed class QualitySimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    3638    protected override bool IsCommutative { get { return true; } }
    3739
    38     private QualitySimilarityCalculator(bool deserializing) : base(deserializing) { }
     40    [StorableConstructor]
     41    private QualitySimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    3942    private QualitySimilarityCalculator(QualitySimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
    4043    public QualitySimilarityCalculator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ResultsCollector.cs

    r16692 r16723  
    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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    … …  
    3333  /// </summary>
    3434  [Item("ResultsCollector", "An operator which collects the actual values of parameters and adds them to a collection of results.")]
    35   [StorableClass]
     35  [StorableType("AAC0CE73-E492-48FB-9645-7AC282ECD860")]
    3636  public class ResultsCollector : ValuesCollector {
    3737    public ValueLookupParameter<ResultCollection> ResultsParameter {
    … …  
    4848
    4949    [StorableConstructor]
    50     protected ResultsCollector(bool deserializing) : base(deserializing) { }
     50    protected ResultsCollector(StorableConstructorFlag _) : base(_) { }
    5151    protected ResultsCollector(ResultsCollector original, Cloner cloner) : base(original, cloner) { }
    5252    public ResultsCollector()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/SASEGASAReunificator.cs

    r16692 r16723  
    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.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Optimization.Operators {
    … …  
    3535  /// </summary>
    3636  [Item("SASEGASAReunificator", "This operator merges the villages (sub-scopes) and redistributes the individuals. It is implemented as described in Affenzeller, M. et al. 2009. Genetic Algorithms and Genetic Programming - Modern Concepts and Practical Applications, CRC Press.")]
    37   [StorableClass]
     37  [StorableType("09433AE4-A51B-40F5-967D-3A2A83EE8814")]
    3838  public class SASEGASAReunificator : SingleSuccessorOperator {
    3939
    … …  
    4343
    4444    [StorableConstructor]
    45     protected SASEGASAReunificator(bool deserializing) : base(deserializing) { }
     45    protected SASEGASAReunificator(StorableConstructorFlag _) : base(_) { }
    4646    protected SASEGASAReunificator(SASEGASAReunificator original, Cloner cloner) : base(original, cloner) { }
    4747    public SASEGASAReunificator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/ShakingOperator.cs

    r16692 r16723  
    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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    … …  
    3333  /// </summary>
    3434  [Item("ShakingOperator", "A shaking operator for VNS that can be filled with arbitrary manipulation operators.")]
    35   [StorableClass]
     35  [StorableType("38CE1371-38BB-40F7-A4FC-0B8049D3BE2E")]
    3636  public class ShakingOperator<T> : CheckedMultiOperator<T>, IMultiNeighborhoodShakingOperator where T : class, IManipulator {
    3737
    … …  
    4545
    4646    [StorableConstructor]
    47     protected ShakingOperator(bool deserializing) : base(deserializing) { }
     47    protected ShakingOperator(StorableConstructorFlag _) : base(_) { }
    4848    protected ShakingOperator(ShakingOperator<T> original, Cloner cloner) : base(original, cloner) { }
    4949    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/SingleObjectivePathRelinker.cs

    r16692 r16723  
    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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    … …  
    3232  /// </summary>
    3333  [Item("SingleObjectivePathRelinker", "A base class for operators that perform path relinking between single objective solutions.")]
    34   [StorableClass]
     34  [StorableType("364CE8A7-0258-4EC1-BBDB-E40C944BD196")]
    3535  public abstract class SingleObjectivePathRelinker : SingleSuccessorOperator, ISingleObjectivePathRelinker {
    3636    #region Parameter properties
    … …  
    5959
    6060    [StorableConstructor]
    61     protected SingleObjectivePathRelinker(bool deserializing) : base(deserializing) { }
     61    protected SingleObjectivePathRelinker(StorableConstructorFlag _) : base(_) { }
    6262    protected SingleObjectivePathRelinker(SingleObjectivePathRelinker original, Cloner cloner) : base(original, cloner) { }
    6363    protected SingleObjectivePathRelinker()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/SingleObjectiveSolutionSimilarityCalculator.cs

    r16692 r16723  
    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.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Optimization.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("SimilarityCalculator", "A base class for items that perform similarity calculation between two solutions.")]
    32   [StorableClass]
     32  [StorableType("16E69099-B75B-467B-ADAC-8CA64796F389")]
    3333#pragma warning disable 0618
    3434  public abstract class SingleObjectiveSolutionSimilarityCalculator : SolutionSimilarityCalculator, ISingleObjectiveSolutionSimilarityCalculator {
    3535#pragma warning restore 0618
    3636    [StorableConstructor]
    37     protected SingleObjectiveSolutionSimilarityCalculator(bool deserializing) : base(deserializing) { }
     37    protected SingleObjectiveSolutionSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    3838    protected SingleObjectiveSolutionSimilarityCalculator(SingleObjectiveSolutionSimilarityCalculator original, Cloner cloner)
    3939      : base(original, cloner) {

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/SolutionSimilarityCalculator.cs

    r16692 r16723  
    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.Core;
    2727using HeuristicLab.Data;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    … …  
    3333  /// </summary>
    3434  [Item("SimilarityCalculator", "A base class for items that perform similarity calculation between two solutions.")]
    35   [StorableClass]
     35  [StorableType("ACDF2895-0C4E-4C34-A091-F41EF5C78241")]
    3636  public abstract class SolutionSimilarityCalculator : Item, ISolutionSimilarityCalculator {
    3737    protected abstract bool IsCommutative { get; }
    … …  
    4949
    5050    [StorableConstructor]
    51     protected SolutionSimilarityCalculator(bool deserializing) : base(deserializing) { }
     51    protected SolutionSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    5252
    5353    protected SolutionSimilarityCalculator(SolutionSimilarityCalculator original, Cloner cloner)

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs

    r16692 r16723  
    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.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Optimization.Operators {
    … …  
    3232  /// </summary>
    3333  [Item("SolutionsCreator", "An operator which creates new solutions. Evaluation of the new solutions is executed in parallel, if an engine is used which supports parallelization.")]
    34   [StorableClass]
     34  [StorableType("3EE12E32-F8AF-4C7E-A9C9-B5DC5561CFE2")]
    3535  public sealed class SolutionsCreator : SingleSuccessorOperator {
    3636    public ValueLookupParameter<IntValue> NumberOfSolutionsParameter {
    … …  
    5858
    5959    [StorableConstructor]
    60     private SolutionsCreator(bool deserializing) : base(deserializing) { }
     60    private SolutionsCreator(StorableConstructorFlag _) : base(_) { }
    6161    private SolutionsCreator(SolutionsCreator original, Cloner cloner) : base(original, cloner) { }
    6262    public SolutionsCreator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/SquareRootDiscreteDoubleValueModifier.cs

    r16692 r16723  
    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;
    2626
    2727namespace HeuristicLab.Optimization.Operators {
    … …  
    3030  /// </summary>
    3131  [Item("SquareRootDiscreteDoubleValueModifier", "Modifies the value by square rooted fall (fast fall initially, slow fall to the end) or rise (fast rise initially, slow rise to the end).")]
    32   [StorableClass]
     32  [StorableType("0D62E89E-87D9-4F4F-889E-D64CB4CCBF6E")]
    3333  public class SquareRootDiscreteDoubleValueModifier : DiscreteDoubleValueModifier {
    3434    [StorableConstructor]
    35     protected SquareRootDiscreteDoubleValueModifier(bool deserializing) : base(deserializing) { }
     35    protected SquareRootDiscreteDoubleValueModifier(StorableConstructorFlag _) : base(_) { }
    3636    protected SquareRootDiscreteDoubleValueModifier(SquareRootDiscreteDoubleValueModifier original, Cloner cloner) : base(original, cloner) { }
    3737    public SquareRootDiscreteDoubleValueModifier() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/TabuMaker.cs

    r16692 r16723  
    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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    3131  [Item("TabuMaker", "Base class for all operators that set a move tabu.")]
    32   [StorableClass]
     32  [StorableType("1124A697-DDF1-442E-8CBB-FA0D51B4C736")]
    3333  public abstract class TabuMaker : SingleSuccessorOperator, ITabuMaker, ISingleObjectiveOperator {
    3434    public override bool CanChangeName {
    … …  
    5252
    5353    [StorableConstructor]
    54     protected TabuMaker(bool deserializing) : base(deserializing) { }
     54    protected TabuMaker(StorableConstructorFlag _) : base(_) { }
    5555    protected TabuMaker(TabuMaker original, Cloner cloner) : base(original, cloner) { }
    5656    protected TabuMaker()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/UnidirectionalRingMigrator.cs

    r16692 r16723  
    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.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Optimization.Operators {
    … …  
    3333  /// </summary>
    3434  [Item("UnidirectionalRingMigrator", "Migrates the selected sub scopes in each subscope in an unidirectional ring.")]
    35   [StorableClass]
     35  [StorableType("A6642E0A-2FA1-49F3-9BA8-94EA370FE2CF")]
    3636  public class UnidirectionalRingMigrator : SingleSuccessorOperator, IMigrator {
    3737    public IValueLookupParameter<BoolValue> ClockwiseMigrationParameter {
    … …  
    4040
    4141    [StorableConstructor]
    42     protected UnidirectionalRingMigrator(bool deserializing) : base(deserializing) { }
     42    protected UnidirectionalRingMigrator(StorableConstructorFlag _) : base(_) { }
    4343    protected UnidirectionalRingMigrator(UnidirectionalRingMigrator original, Cloner cloner) : base(original, cloner) { }
    4444

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/UserDefinedCrossover.cs

    r16692 r16723  
    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 HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Optimization.Operators {
    2727  [Item("UserDefinedCrossover", "A crossover that can be customized with operators which it will execute one after another.")]
    28   [StorableClass]
     28  [StorableType("93EE357C-60D8-492B-AC69-F5D48370CAE1")]
    2929  public class UserDefinedCrossover : UserDefinedOperator, ICrossover {
    3030    [StorableConstructor]
    31     protected UserDefinedCrossover(bool deserializing) : base(deserializing) { }
     31    protected UserDefinedCrossover(StorableConstructorFlag _) : base(_) { }
    3232    protected UserDefinedCrossover(UserDefinedCrossover original, Cloner cloner) : base(original, cloner) { }
    3333    public UserDefinedCrossover() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/UserDefinedEvaluator.cs

    r16692 r16723  
    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.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Optimization.Operators {
    2929  [Item("UserDefinedEvaluator", "An evaluator that can be customized with operators which it will execute one after another.")]
    30   [StorableClass]
     30  [StorableType("BE378550-EAD2-4D4B-A2FD-3CBC563B2C2B")]
    3131  public class UserDefinedEvaluator : UserDefinedOperator, ISingleObjectiveEvaluator {
    3232    public ILookupParameter<DoubleValue> QualityParameter {
    … …  
    3535
    3636    [StorableConstructor]
    37     protected UserDefinedEvaluator(bool deserializing) : base(deserializing) { }
     37    protected UserDefinedEvaluator(StorableConstructorFlag _) : base(_) { }
    3838    protected UserDefinedEvaluator(UserDefinedEvaluator original, Cloner cloner) : base(original, cloner) { }
    3939    public UserDefinedEvaluator()

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/UserDefinedManipulator.cs

    r16692 r16723  
    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 HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Optimization.Operators {
    2727  [Item("UserDefinedManipulator", "A manipulator that can be customized with operators which it will execute one after another.")]
    28   [StorableClass]
     28  [StorableType("B64E8AF0-990A-4E4F-BE1A-1194E0A6CA4E")]
    2929  public class UserDefinedManipulator : UserDefinedOperator, IManipulator {
    3030    [StorableConstructor]
    31     protected UserDefinedManipulator(bool deserializing) : base(deserializing) { }
     31    protected UserDefinedManipulator(StorableConstructorFlag _) : base(_) { }
    3232    protected UserDefinedManipulator(UserDefinedManipulator original, Cloner cloner) : base(original, cloner) { }
    3333    public UserDefinedManipulator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/UserDefinedOperator.cs

    r16692 r16723  
    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.Core;
    2525using HeuristicLab.Operators;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Optimization.Operators {
    2929  [Item("UserDefinedOperator", "An operator that can be parameterized with multiple operators which will be executed one after another.")]
    30   [StorableClass]
     30  [StorableType("2B0E574C-AAD7-4A0B-A4F2-A80F9C428A11")]
    3131  public abstract class UserDefinedOperator : CheckedMultiOperator<IOperator> {
    3232    [StorableConstructor]
    33     protected UserDefinedOperator(bool deserializing) : base(deserializing) { }
     33    protected UserDefinedOperator(StorableConstructorFlag _) : base(_) { }
    3434    protected UserDefinedOperator(UserDefinedOperator original, Cloner cloner) : base(original, cloner) { }
    3535    public UserDefinedOperator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/UserDefinedSolutionCreator.cs

    r16692 r16723  
    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 HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Optimization.Operators {
    2727  [Item("UserDefinedSolutionCreator", "A solution creator that can be customized with operators which it will execute one after another.")]
    28   [StorableClass]
     28  [StorableType("E6B305A2-A5E5-4DAC-933D-1DC1AA50ED7B")]
    2929  public class UserDefinedSolutionCreator : UserDefinedOperator, ISolutionCreator {
    3030    [StorableConstructor]
    31     protected UserDefinedSolutionCreator(bool deserializing) : base(deserializing) { }
     31    protected UserDefinedSolutionCreator(StorableConstructorFlag _) : base(_) { }
    3232    protected UserDefinedSolutionCreator(UserDefinedSolutionCreator original, Cloner cloner) : base(original, cloner) { }
    3333    public UserDefinedSolutionCreator() : base() { }

  • branches/2521_ProblemRefactoring/HeuristicLab.Optimization.Operators/3.3/WeightedParentsQualityComparator.cs

    r16692 r16723  
    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.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Optimization.Operators {
    3333  [Item("WeightedParentsQualityComparator", "Compares the quality against that of its parents (assumes the parents are subscopes to the child scope). This operator works with any number of subscopes > 0.")]
    34   [StorableClass]
     34  [StorableType("82DA6E16-049F-4BF5-B900-FF11B01FA866")]
    3535  public class WeightedParentsQualityComparator : SingleSuccessorOperator, ISubScopesQualityComparator {
    3636    public IValueLookupParameter<BoolValue> MaximizationParameter {
    … …  
    5151
    5252    [StorableConstructor]
    53     protected WeightedParentsQualityComparator(bool deserializing) : base(deserializing) { }
     53    protected WeightedParentsQualityComparator(StorableConstructorFlag _) : base(_) { }
    5454    protected WeightedParentsQualityComparator(WeightedParentsQualityComparator original, Cloner cloner) : base(original, cloner) { }
    5555    public WeightedParentsQualityComparator()
Note: See TracChangeset for help on using the changeset viewer.