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.Optimization/3.3
Files:
59 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/Algorithm.cs

    r16453 r16462  
    3030using HeuristicLab.Core;
    3131using HeuristicLab.Data;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333
    3434namespace HeuristicLab.Optimization {
    … …  
    3737  /// </summary>
    3838  [Item("Algorithm", "A base class for algorithms.")]
    39   [StorableClass]
     39  [StorableType("7879C550-E8C2-4121-84C3-DADB06BD5C96")]
    4040  public abstract class Algorithm : ParameterizedNamedItem, IAlgorithm {
    4141    public static new Image StaticItemImage {
    … …  
    171171    }
    172172    [StorableConstructor]
    173     protected Algorithm(bool deserializing) : base(deserializing) { }
     173    protected Algorithm(StorableConstructorFlag _) : base(_) { }
    174174    [StorableHook(HookType.AfterDeserialization)]
    175175    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/BasicAlgorithm.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Optimization {
    29   [StorableClass]
     29  [StorableType("EFBEE5EB-B15B-4FBB-A210-C4E36898B89D")]
    3030  public abstract class BasicAlgorithm : Algorithm, IStorableContent {
    3131
    … …  
    5252
    5353    [StorableConstructor]
    54     protected BasicAlgorithm(bool deserializing) : base(deserializing) { }
     54    protected BasicAlgorithm(StorableConstructorFlag _) : base(_) { }
    5555    protected BasicAlgorithm(BasicAlgorithm original, Cloner cloner)
    5656      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/EngineAlgorithm.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    … …  
    3232  /// </summary>
    3333  [Item("EngineAlgorithm", "A base class for algorithms which use an engine for execution.")]
    34   [StorableClass]
     34  [StorableType("C3D2307F-9B15-4D3B-900E-616B58268ED6")]
    3535  public abstract class EngineAlgorithm : Algorithm {
    3636    [Storable]
    … …  
    113113    }
    114114    [StorableConstructor]
    115     protected EngineAlgorithm(bool deserializing) : base(deserializing) { }
     115    protected EngineAlgorithm(StorableConstructorFlag _) : base(_) { }
    116116    [StorableHook(HookType.AfterDeserialization)]
    117117    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationAlgorithm.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Optimization {
    … …  
    3030  /// </summary>
    3131  [Item("Heuristic Optimization Algorithm", "A base class for heuristic optimization algorithms.")]
    32   [StorableClass]
     32  [StorableType("13388EBE-E463-4A64-BCE4-77A631CB5DA0")]
    3333  public abstract class HeuristicOptimizationAlgorithm : Algorithm {
    3434    public new IHeuristicOptimizationProblem Problem {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected HeuristicOptimizationAlgorithm(bool deserializing) : base(deserializing) { }
     46    protected HeuristicOptimizationAlgorithm(StorableConstructorFlag _) : base(_) { }
    4747    protected HeuristicOptimizationAlgorithm(HeuristicOptimizationAlgorithm original, Cloner cloner) : base(original, cloner) { }
    4848

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/HeuristicOptimizationEngineAlgorithm.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Optimization {
    … …  
    3030  /// </summary>
    3131  [Item("Heuristic Optimization Enigne Algorithm", "A base class for heuristic optimization algorithms using an execution engine.")]
    32   [StorableClass]
     32  [StorableType("A741CA8C-D4DC-4917-8F71-95EA31C97890")]
    3333  public abstract class HeuristicOptimizationEngineAlgorithm : EngineAlgorithm {
    3434    public new IHeuristicOptimizationProblem Problem {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected HeuristicOptimizationEngineAlgorithm(bool deserializing) : base(deserializing) { }
     46    protected HeuristicOptimizationEngineAlgorithm(StorableConstructorFlag _) : base(_) { }
    4747    protected HeuristicOptimizationEngineAlgorithm(HeuristicOptimizationEngineAlgorithm original, Cloner cloner) : base(original, cloner) { }
    4848

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Algorithms/UserDefinedAlgorithm.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Optimization {
    … …  
    3131  [Item("User-Defined Algorithm", "An algorithm which can be defined by the user.")]
    3232  [Creatable(CreatableAttribute.Categories.Algorithms, Priority = 100)]
    33   [StorableClass]
     33  [StorableType("8D1C0ED9-F732-4DE3-8F6C-125DFF9E8D5E")]
    3434  public sealed class UserDefinedAlgorithm : EngineAlgorithm, IParameterizedItem, IStorableContent {
    3535    public string Filename { get; set; }
    … …  
    7171    public UserDefinedAlgorithm(string name, string description) : base(name, description) { }
    7272    [StorableConstructor]
    73     private UserDefinedAlgorithm(bool deserializing) : base(deserializing) { }
     73    private UserDefinedAlgorithm(StorableConstructorFlag _) : base(_) { }
    7474    private UserDefinedAlgorithm(UserDefinedAlgorithm original, Cloner cloner)
    7575      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    31   [StorableClass]
     31  [StorableType("D877082E-9E77-4CB1-ABDB-35F63878E116")]
    3232  public abstract class BasicProblem<TEncoding, TEvaluator> : HeuristicOptimizationProblem<TEvaluator, ISolutionCreator>, IProblemDefinition, IStorableContent
    3333    where TEncoding : class, IEncoding
    … …  
    7878
    7979    [StorableConstructor]
    80     protected BasicProblem(bool deserializing) : base(deserializing) { }
     80    protected BasicProblem(StorableConstructorFlag _) : base(_) { }
    8181    [StorableHook(HookType.AfterDeserialization)]
    8282    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("Encoding", "Base class for describing different encodings.")]
    32   [StorableClass]
     32  [StorableType("395B1372-FA54-4649-9EBE-5402A0AA9494")]
    3333  public abstract class Encoding<T> : ParameterizedNamedItem, IEncoding
    3434    where T : class,ISolutionCreator {
    … …  
    8484
    8585    [StorableConstructor]
    86     protected Encoding(bool deserializing) : base(deserializing) { }
     86    protected Encoding(StorableConstructorFlag _) : base(_) { }
    8787    protected Encoding(Encoding<T> original, Cloner cloner)
    8888      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Individuals/MultiEncodingIndividual.cs

    r16453 r16462  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Linq;
    2524using HeuristicLab.Common;

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/MultiEncoding.cs

    r16453 r16462  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.PluginInfrastructure;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("MultiEncoding", "Describes a combined encoding consisting of multiple simpler encodings.")]
    32   [StorableClass]
     32  [StorableType("359E2173-4D0C-40E5-A2F3-E42E59840345")]
    3333  public sealed class MultiEncoding : Encoding<MultiEncodingCreator> {
    3434
    … …  
    4141
    4242    [StorableConstructor]
    43     private MultiEncoding(bool deserializing)
    44       : base(deserializing) {
     43    private MultiEncoding(StorableConstructorFlag _) : base(_) {
    4544      encodings = new List<IEncoding>();
    4645    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.Linq;
    2523using HeuristicLab.Common;
    … …  
    2725using HeuristicLab.Data;
    2826using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    3028
    3129namespace HeuristicLab.Optimization {
    32   [StorableClass]
     30  [StorableType("6F2EC371-0309-4848-B7B1-C9B9C7E3436F")]
    3331  public abstract class MultiObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, MultiObjectiveEvaluator>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition
    3432  where TEncoding : class, IEncoding {
    3533    [StorableConstructor]
    36     protected MultiObjectiveBasicProblem(bool deserializing) : base(deserializing) { }
     34    protected MultiObjectiveBasicProblem(StorableConstructorFlag _) : base(_) { }
    3735
    3836    protected MultiObjectiveBasicProblem(MultiObjectiveBasicProblem<TEncoding> original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCreator.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Optimization {
    2929  [Item("MultiEncodingCreator", "Contains solution creators that together create a multi-encoding.")]
    30   [StorableClass]
     30  [StorableType("E261B506-6F74-4BC4-8164-5ACE20FBC319")]
    3131  public sealed class MultiEncodingCreator : MultiEncodingOperator<ISolutionCreator>, ISolutionCreator {
    3232    [StorableConstructor]
    33     private MultiEncodingCreator(bool deserializing) : base(deserializing) { }
     33    private MultiEncodingCreator(StorableConstructorFlag _) : base(_) { }
    3434
    3535    private MultiEncodingCreator(MultiEncodingCreator original, Cloner cloner) : base(original, cloner) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingCrossover.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Optimization {
    2727  [Item("MultiEncoding Crossover", "Applies different crossovers to cross a multi-encoding.")]
    28   [StorableClass]
     28  [StorableType("BB0A04E2-899D-460C-82A2-5E4CEEDE8996")]
    2929  public sealed class MultiEncodingCrossover : MultiEncodingOperator<ICrossover>, ICrossover {
    3030    [StorableConstructor]
    31     private MultiEncodingCrossover(bool deserializing) : base(deserializing) { }
     31    private MultiEncodingCrossover(StorableConstructorFlag _) : base(_) { }
    3232    private MultiEncodingCrossover(MultiEncodingCrossover original, Cloner cloner) : base(original, cloner) { }
    3333    public MultiEncodingCrossover() { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingManipulator.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Optimization {
    2727  [Item("MultiEncoding Manipulator", "Applies different manipulators to change a multi-encoding.")]
    28   [StorableClass]
     28  [StorableType("574D0530-47E8-4FD9-8AC8-B8EA2DE3C203")]
    2929  public sealed class MultiEncodingManipulator : MultiEncodingOperator<IManipulator>, IManipulator {
    3030    [StorableConstructor]
    31     private MultiEncodingManipulator(bool deserializing) : base(deserializing) { }
     31    private MultiEncodingManipulator(StorableConstructorFlag _) : base(_) { }
    3232    private MultiEncodingManipulator(MultiEncodingManipulator original, Cloner cloner)
    3333      : base(original, cloner) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingOperator.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Optimization {
    32   [StorableClass]
     32  [StorableType("43619638-9D00-4951-8138-8CCD0786E784")]
    3333  public abstract class MultiEncodingOperator<T> : Operator, IMultiEncodingOperator where T : class,IOperator {
    3434    private List<IEncoding> encodings = new List<IEncoding>();
    … …  
    4040
    4141    [StorableConstructor]
    42     protected MultiEncodingOperator(bool deserializing)
    43       : base(deserializing) {
     42    protected MultiEncodingOperator(StorableConstructorFlag _) : base(_) {
    4443    }
    4544

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Optimization {
    3333  [Item("Multi-objective Analyzer", "Calls the Analyze method of the problem definition.")]
    34   [StorableClass]
     34  [StorableType("903FE3D1-3179-4EA5-A7E1-63DE26239F9B")]
    3535  public class MultiObjectiveAnalyzer : SingleSuccessorOperator, IMultiObjectiveAnalysisOperator, IStochasticOperator {
    3636    public bool EnabledByDefault { get { return true; } }
    … …  
    5555
    5656    [StorableConstructor]
    57     protected MultiObjectiveAnalyzer(bool deserializing) : base(deserializing) { }
     57    protected MultiObjectiveAnalyzer(StorableConstructorFlag _) : base(_) { }
    5858    protected MultiObjectiveAnalyzer(MultiObjectiveAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5959    public MultiObjectiveAnalyzer() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiObjectiveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("Multi-objective Evaluator", "Calls the Evaluate method of the problem definition and writes the return value into the scope.")]
    32   [StorableClass]
     32  [StorableType("C5605ED8-0ED2-4C7B-97A1-E7EB68A4FDBF")]
    3333  public class MultiObjectiveEvaluator : InstrumentedOperator, IMultiObjectiveEvaluationOperator, IStochasticOperator {
    3434
    … …  
    4848
    4949    [StorableConstructor]
    50     protected MultiObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     50    protected MultiObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    5151    protected MultiObjectiveEvaluator(MultiObjectiveEvaluator original, Cloner cloner) : base(original, cloner) { }
    5252    public MultiObjectiveEvaluator() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Optimization {
    3333  [Item("Single-objective Analyzer", "Calls the script's Analyze method to be able to write into the results collection.")]
    34   [StorableClass]
     34  [StorableType("3D20F8E2-CE11-4021-A05B-CFCB02C0FD6F")]
    3535  public sealed class SingleObjectiveAnalyzer : SingleSuccessorOperator, ISingleObjectiveAnalysisOperator, IAnalyzer, IStochasticOperator {
    3636    public bool EnabledByDefault { get { return true; } }
    … …  
    5555
    5656    [StorableConstructor]
    57     private SingleObjectiveAnalyzer(bool deserializing) : base(deserializing) { }
     57    private SingleObjectiveAnalyzer(StorableConstructorFlag _) : base(_) { }
    5858    private SingleObjectiveAnalyzer(SingleObjectiveAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5959    public SingleObjectiveAnalyzer() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("Single-objective Evaluator", "Calls the script's Evaluate method to get the quality value of the parameter vector.")]
    32   [StorableClass]
     32  [StorableType("E8914B68-D0D7-407F-8D58-002FDF2F45CF")]
    3333  public sealed class SingleObjectiveEvaluator : InstrumentedOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
    3434
    … …  
    4848
    4949    [StorableConstructor]
    50     private SingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     50    private SingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    5151    private SingleObjectiveEvaluator(SingleObjectiveEvaluator original, Cloner cloner) : base(original, cloner) { }
    5252    public SingleObjectiveEvaluator() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveImprover.cs

    r16453 r16462  
    2828using HeuristicLab.Operators;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Optimization {
    3333  [Item("Single-objective Improver", "Improves a solution by calling GetNeighbors and Evaluate of the corresponding problem definition.")]
    34   [StorableClass]
     34  [StorableType("7A917E09-920C-4B47-9599-67371101B35F")]
    3535  public sealed class SingleObjectiveImprover : SingleSuccessorOperator, INeighborBasedOperator, IImprovementOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
    3636    public ILookupParameter<IRandom> RandomParameter {
    … …  
    6666
    6767    [StorableConstructor]
    68     private SingleObjectiveImprover(bool deserializing) : base(deserializing) { }
     68    private SingleObjectiveImprover(StorableConstructorFlag _) : base(_) { }
    6969    private SingleObjectiveImprover(SingleObjectiveImprover original, Cloner cloner) : base(original, cloner) { }
    7070    public SingleObjectiveImprover() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("Single-objective MoveEvaluator", "Evaluates a parameter vector that results from a move.")]
    32   [StorableClass]
     32  [StorableType("EE4B1EBA-50BF-40C7-B338-F4A9D9CC554E")]
    3333  public class SingleObjectiveMoveEvaluator : SingleSuccessorOperator, ISingleObjectiveEvaluationOperator, ISingleObjectiveMoveEvaluator, IStochasticOperator, ISingleObjectiveMoveOperator {
    3434
    … …  
    5252
    5353    [StorableConstructor]
    54     protected SingleObjectiveMoveEvaluator(bool deserializing) : base(deserializing) { }
     54    protected SingleObjectiveMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    5555    protected SingleObjectiveMoveEvaluator(SingleObjectiveMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    5656    public SingleObjectiveMoveEvaluator() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveGenerator.cs

    r16453 r16462  
    2929using HeuristicLab.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Optimization {
    3434  [Item("Single-objective MoveGenerator", "Calls the GetNeighbors method of the problem definition to obtain the moves.")]
    35   [StorableClass]
     35  [StorableType("CB37E7D8-EAC3-4061-9D39-20538CD1064D")]
    3636  public class SingleObjectiveMoveGenerator : SingleSuccessorOperator, INeighborBasedOperator, IMultiMoveGenerator, IStochasticOperator, ISingleObjectiveMoveOperator {
    3737    public ILookupParameter<IRandom> RandomParameter {
    … …  
    5050
    5151    [StorableConstructor]
    52     protected SingleObjectiveMoveGenerator(bool deserializing) : base(deserializing) { }
     52    protected SingleObjectiveMoveGenerator(StorableConstructorFlag _) : base(_) { }
    5353    protected SingleObjectiveMoveGenerator(SingleObjectiveMoveGenerator original, Cloner cloner)
    5454      : base(original, cloner) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveMoveMaker.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("Single-objective MoveMaker", "Applies a move.")]
    32   [StorableClass]
     32  [StorableType("C0ABF392-C825-4B98-8FB9-5749A9091FD6")]
    3333  public class SingleObjectiveMoveMaker : InstrumentedOperator, IMoveMaker, ISingleObjectiveMoveOperator {
    3434    public ILookupParameter<IEncoding> EncodingParameter {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected SingleObjectiveMoveMaker(bool deserializing) : base(deserializing) { }
     47    protected SingleObjectiveMoveMaker(StorableConstructorFlag _) : base(_) { }
    4848    protected SingleObjectiveMoveMaker(SingleObjectiveMoveMaker original, Cloner cloner) : base(original, cloner) { }
    4949    public SingleObjectiveMoveMaker() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs

    r16453 r16462  
    2727using HeuristicLab.Data;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Optimization {
    32   [StorableClass]
     32  [StorableType("2697320D-0259-44BB-BD71-7EE1B10F664C")]
    3333  public abstract class SingleObjectiveBasicProblem<TEncoding> : BasicProblem<TEncoding, SingleObjectiveEvaluator>,
    3434    ISingleObjectiveProblemDefinition, ISingleObjectiveHeuristicOptimizationProblem
    … …  
    5151
    5252    [StorableConstructor]
    53     protected SingleObjectiveBasicProblem(bool deserializing) : base(deserializing) { }
     53    protected SingleObjectiveBasicProblem(StorableConstructorFlag _) : base(_) { }
    5454
    5555    protected SingleObjectiveBasicProblem(SingleObjectiveBasicProblem<TEncoding> original, Cloner cloner)

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

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

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Interfaces/IRunCollectionModifier.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2623using HeuristicLab.Core;
    2724

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

    r16453 r16462  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Optimization {
    … …  
    3939  [Item("Batch Run", "A run in which an optimizer is executed a given number of times.")]
    4040  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 110)]
    41   [StorableClass]
     41  [StorableType("E85407E0-18EC-4198-8321-9CF030FDF6D7")]
    4242  public sealed class BatchRun : NamedItem, IOptimizer, IStorableContent {
    4343    public string Filename { get; set; }
    … …  
    199199    }
    200200    [StorableConstructor]
    201     private BatchRun(bool deserializing) : base(deserializing) { }
     201    private BatchRun(StorableConstructorFlag _) : base(_) { }
    202202    [StorableHook(HookType.AfterDeserialization)]
    203203    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/Experiment.cs

    r16453 r16462  
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Core;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Optimization {
    … …  
    3737  [Item("Experiment", "An experiment which contains multiple algorithms, batch runs or other experiments.")]
    3838  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 100)]
    39   [StorableClass]
     39  [StorableType("A8A4536B-54C1-4A17-AB58-A6006F7F394B")]
    4040  public sealed class Experiment : NamedItem, IOptimizer, IStorableContent {
    4141    public string Filename { get; set; }
    … …  
    161161    }
    162162    [StorableConstructor]
    163     private Experiment(bool deserializing) : base(deserializing) { }
     163    private Experiment(StorableConstructorFlag _) : base(_) { }
    164164    [StorableHook(HookType.AfterDeserialization)]
    165165    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

    r16453 r16462  
    3131using HeuristicLab.Common.Resources;
    3232using HeuristicLab.Core;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Fossil;
    3434
    3535namespace HeuristicLab.Optimization {
    … …  
    3939  [Item("Timelimit Run", "A run in which an optimizer is executed a certain maximum time.")]
    4040  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 115)]
    41   [StorableClass]
     41  [StorableType("85A1AB82-689F-4925-B888-B3886707BE88")]
    4242  public sealed class TimeLimitRun : NamedItem, IOptimizer, IStorableContent, INotifyPropertyChanged {
    4343    public string Filename { get; set; }
    … …  
    152152
    153153    [StorableConstructor]
    154     private TimeLimitRun(bool deserializing) : base(deserializing) { }
     154    private TimeLimitRun(StorableConstructorFlag _) : base(_) { }
    155155    private TimeLimitRun(TimeLimitRun original, Cloner cloner)
    156156      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/OptimizerList.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Optimization {
    2828  [Item("Optimizer List", "Represents a list of optimizers.")]
    29   [StorableClass]
     29  [StorableType("7C68A9CF-5FC6-46BF-BB75-B9CB8102539E")]
    3030  public class OptimizerList : ItemList<IOptimizer> {
    3131    public OptimizerList() : base() { }
    … …  
    3333    public OptimizerList(IEnumerable<IOptimizer> collection) : base(collection) { }
    3434    [StorableConstructor]
    35     protected OptimizerList(bool deserializing) : base(deserializing) { }
     35    protected OptimizerList(StorableConstructorFlag _) : base(_) { }
    3636    protected OptimizerList(OptimizerList original, Cloner cloner)
    3737      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Problems/HeuristicOptimizationProblem.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Optimization {
    2929  [Item("Heuristic Optimization Problem", "Represents the base class for a heuristic optimization problem.")]
    30   [StorableClass]
     30  [StorableType("DE0478BA-3797-4AC3-9A89-3734D2643823")]
    3131  public abstract class HeuristicOptimizationProblem<T, U> : Problem, IHeuristicOptimizationProblem
    3232    where T : class,IEvaluator
    … …  
    3636
    3737    [StorableConstructor]
    38     protected HeuristicOptimizationProblem(bool deserializing) : base(deserializing) { }
     38    protected HeuristicOptimizationProblem(StorableConstructorFlag _) : base(_) { }
    3939    protected HeuristicOptimizationProblem(HeuristicOptimizationProblem<T, U> original, Cloner cloner)
    4040      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Problems/MultiObjectiveHeuristicOptimizationProblem.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Optimization {
    2929  [Item("Multi-Objective Heuristic Optimization Problem", "A base class for multi-objective heuristic optimization problems.")]
    30   [StorableClass]
     30  [StorableType("C46643E3-7144-4884-A30A-5329BD80DC4E")]
    3131  public abstract class MultiObjectiveHeuristicOptimizationProblem<T, U> : HeuristicOptimizationProblem<T, U>, IMultiObjectiveHeuristicOptimizationProblem
    3232    where T : class, IMultiObjectiveEvaluator
    … …  
    3535
    3636    [StorableConstructor]
    37     protected MultiObjectiveHeuristicOptimizationProblem(bool deserializing) : base(deserializing) { }
     37    protected MultiObjectiveHeuristicOptimizationProblem(StorableConstructorFlag _) : base(_) { }
    3838    protected MultiObjectiveHeuristicOptimizationProblem(MultiObjectiveHeuristicOptimizationProblem<T, U> original, Cloner cloner) : base(original, cloner) { }
    3939    protected MultiObjectiveHeuristicOptimizationProblem()

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Problems/Problem.cs

    r16453 r16462  
    2828using HeuristicLab.Data;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Optimization {
    3333  [Item("Problem", "Represents the base class for a problem.")]
    34   [StorableClass]
     34  [StorableType("6DC97432-9BD1-4304-802A-1FC48A0E0468")]
    3535  public abstract class Problem : ParameterizedNamedItem, IProblem {
    3636    private const string OperatorsParameterName = "Operators";
    … …  
    4444
    4545    [StorableConstructor]
    46     protected Problem(bool deserializing) : base(deserializing) { }
     46    protected Problem(StorableConstructorFlag _) : base(_) { }
    4747    protected Problem(Problem original, Cloner cloner)
    4848      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs

    r16453 r16462  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Optimization {
    2929  [Item("Single-Objective Heuristic OptimizationProblem", "A base class for single-objective heuristic optimization problems.")]
    30   [StorableClass]
     30  [StorableType("DFD5588E-6AB2-4712-9083-A405EF21226F")]
    3131  public abstract class SingleObjectiveHeuristicOptimizationProblem<T, U> : HeuristicOptimizationProblem<T, U>, ISingleObjectiveHeuristicOptimizationProblem
    3232    where T : class, ISingleObjectiveEvaluator
    … …  
    3636
    3737    [StorableConstructor]
    38     protected SingleObjectiveHeuristicOptimizationProblem(bool deserializing) : base(deserializing) { }
     38    protected SingleObjectiveHeuristicOptimizationProblem(StorableConstructorFlag _) : base(_) { }
    3939    protected SingleObjectiveHeuristicOptimizationProblem(SingleObjectiveHeuristicOptimizationProblem<T, U> original, Cloner cloner) : base(original, cloner) { }
    4040    protected SingleObjectiveHeuristicOptimizationProblem()

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Problems/UserDefinedProblem.cs

    r16453 r16462  
    3030using HeuristicLab.Data;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.PluginInfrastructure;
    3434
    … …  
    3939  [Item("User-Defined Problem", "A problem which can be defined by the user.")]
    4040  [Creatable(CreatableAttribute.Categories.Problems, Priority = 120)]
    41   [StorableClass]
     41  [StorableType("9F18A098-A8B8-4F70-93CF-79FF1496AC8A")]
    4242  public sealed class UserDefinedProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
    4343    public string Filename { get; set; }
    … …  
    122122
    123123    [StorableConstructor]
    124     private UserDefinedProblem(bool deserializing) : base(deserializing) { }
     124    private UserDefinedProblem(StorableConstructorFlag _) : base(_) { }
    125125    [StorableHook(HookType.AfterDeserialization)]
    126126    private void AfterDeserialization() {
    … …  
    235235
    236236    [Item("EmptyUserDefinedProblemEvaluator", "A dummy evaluator that will throw an exception when executed.")]
    237     [StorableClass]
     237    [StorableType("E27E4145-6D44-4A9D-B15A-B0E0528ECD0D")]
    238238    [NonDiscoverableType]
    239239    private sealed class EmptyUserDefinedProblemEvaluator : ParameterizedNamedItem, ISingleObjectiveEvaluator {
    240240
    241241      [StorableConstructor]
    242       private EmptyUserDefinedProblemEvaluator(bool deserializing) : base(deserializing) { }
     242      private EmptyUserDefinedProblemEvaluator(StorableConstructorFlag _) : base(_) { }
    243243      private EmptyUserDefinedProblemEvaluator(EmptyUserDefinedProblemEvaluator original, Cloner cloner)
    244244        : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Results/Result.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Optimization {
    … …  
    3131  /// </summary>
    3232  [Item("Result", "A result which has a name and a data type and holds an IItem.")]
    33   [StorableClass]
     33  [StorableType("219051C0-9D62-4CDE-9BA1-32233C81B678")]
    3434  public sealed class Result : NamedItem, IResult, IStorableContent {
    3535    public string Filename { get; set; }
    … …  
    7676
    7777    [StorableConstructor]
    78     private Result(bool deserializing) : base(deserializing) { }
     78    private Result(StorableConstructorFlag _) : base(_) { }
    7979    private Result(Result original, Cloner cloner)
    8080      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Results/ResultCollection.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Optimization {
    28   [StorableClass]
     28  [StorableType("959230E3-C51B-4EC0-BDB2-0B0D71F5A6E3")]
    2929  [Item("ResultCollection", "Represents a collection of results.")]
    3030  public class ResultCollection : NamedItemCollection<IResult> {
    … …  
    3333    public ResultCollection(IEnumerable<IResult> collection) : base(collection) { }
    3434    [StorableConstructor]
    35     protected ResultCollection(bool deserializing) : base(deserializing) { }
     35    protected ResultCollection(StorableConstructorFlag _) : base(_) { }
    3636    protected ResultCollection(ResultCollection original, Cloner cloner)
    3737      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Results/ResultParameter.cs

    r16453 r16462  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("ResultParameter", "A parameter whose value is written to a result collection.")]
    32   [StorableClass]
     32  [StorableType("CF10EF50-82B6-4A98-82C0-3C5ECED48904")]
    3333  public sealed class ResultParameter<T> : LookupParameter<T>, IResultParameter<T> where T : class, IItem {
    3434    public override Image ItemImage { get { return VSImageLibrary.Exception; } }
    … …  
    6161
    6262    [StorableConstructor]
    63     private ResultParameter(bool deserializing) : base(deserializing) { }
     63    private ResultParameter(StorableConstructorFlag _) : base(_) { }
    6464    private ResultParameter(ResultParameter<T> original, Cloner cloner)
    6565      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Run.cs

    r16453 r16462  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Optimization {
    … …  
    3434  /// </summary>
    3535  [Item("Run", "The parameters and results of an algorithm run.")]
    36   [StorableClass]
     36  [StorableType("C06974F6-2516-492F-9AE9-517AED845260")]
    3737  public sealed class Run : NamedItem, IRun, IStorableContent {
    3838    public string Filename { get; set; }
    3939
    4040    [StorableConstructor]
    41     private Run(bool deserializing) : base(deserializing) { }
     41    private Run(StorableConstructorFlag _) : base(_) { }
    4242    private Run(Run original, Cloner cloner)
    4343      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollection.cs

    r16453 r16462  
    2828using HeuristicLab.Core;
    2929using HeuristicLab.Data;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Optimization {
    3333  [Item("Run Collection", "Represents a collection of runs.")]
    3434  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 120)]
    35   [StorableClass]
     35  [StorableType("6A9E959B-62DB-4998-BFC6-BF3BAE66BED4")]
    3636  public class RunCollection : ItemCollection<IRun>, IStringConvertibleMatrix, IStorableContent {
    3737    public string Filename { get; set; }
    3838
    3939    [StorableConstructor]
    40     protected RunCollection(bool deserializing)
    41       : base(deserializing) {
     40    protected RunCollection(StorableConstructorFlag _) : base(_) {
    4241      updateOfRunsInProgress = false;
    4342    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Optimization {
    30   [StorableClass]
     30  [StorableType("655E544A-F75E-4020-BA97-F511CB4D059F")]
    3131  [Item("RunCollectionComparisonConstraint", "A constraint which compares the members of the contained runs with the constraint data.")]
    3232  public class RunCollectionComparisonConstraint : ComparisonConstraint, IRunCollectionColumnConstraint {
    3333    [StorableConstructor]
    34     protected RunCollectionComparisonConstraint(bool deserializing) : base(deserializing) { }
     34    protected RunCollectionComparisonConstraint(StorableConstructorFlag _) : base(_) { }
    3535
    3636    protected RunCollectionComparisonConstraint(RunCollectionComparisonConstraint original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionConstraintCollection.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Optimization {
    27   [StorableClass]
     27  [StorableType("39066245-2B02-4B41-BEA3-158A4E21FCC1")]
    2828  [Item("RunCollectionConstraintCollection", "Represents a collection of constraints.")]
    2929  public class RunCollectionConstraintCollection : ItemCollection<IRunCollectionConstraint> {
    … …  
    3232    public RunCollectionConstraintCollection(IEnumerable<IRunCollectionConstraint> collection) : base(collection) { }
    3333    [StorableConstructor]
    34     protected RunCollectionConstraintCollection(bool deserializing) : base(deserializing) { }
     34    protected RunCollectionConstraintCollection(StorableConstructorFlag _) : base(_) { }
    3535    protected RunCollectionConstraintCollection(RunCollectionConstraintCollection original, Cloner cloner)
    3636      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionContentConstraint.cs

    r16453 r16462  
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Optimization {
    30   [StorableClass]
     30  [StorableType("E155F5BA-C93F-43F2-A513-A79AEF8F0043")]
    3131  public class RunCollectionContentConstraint : Constraint, IRunCollectionConstraint {
    3232    public new RunCollection ConstrainedValue {
    … …  
    4545
    4646    [StorableConstructor]
    47     protected RunCollectionContentConstraint(bool deserializing) : base(deserializing) { }
     47    protected RunCollectionContentConstraint(StorableConstructorFlag _) : base(_) { }
    4848    [StorableHook(HookType.AfterDeserialization)]
    4949    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Optimization {
    30   [StorableClass]
     30  [StorableType("FF40D38E-3F80-4448-A1AE-94B556EF2B9D")]
    3131  [Item("RunCollectionEqualityConstraint", "A constraint which checks the members of the contained runs for equality to the constraint data.")]
    3232  public class RunCollectionEqualityConstraint : EqualityConstraint, IRunCollectionColumnConstraint {
    3333    [StorableConstructor]
    34     protected RunCollectionEqualityConstraint(bool deserializing) : base(deserializing) { }
     34    protected RunCollectionEqualityConstraint(StorableConstructorFlag _) : base(_) { }
    3535
    3636    protected RunCollectionEqualityConstraint(RunCollectionEqualityConstraint original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Optimization {
    30   [StorableClass]
     30  [StorableType("3B3B486C-0552-4B0D-978D-813E71E21B79")]
    3131  [Item("RunCollectionTypeCompatibilityConstraint", "A constraint which checks the members of the contained runs for type compabitiliby to the constraint data.")]
    3232  public class RunCollectionTypeCompatibilityConstraint : TypeCompatibilityConstraint, IRunCollectionColumnConstraint {
    3333    [StorableConstructor]
    34     protected RunCollectionTypeCompatibilityConstraint(bool deserializing) {
     34    protected RunCollectionTypeCompatibilityConstraint(StorableConstructorFlag _) : base(_) {
    3535    }
    3636    protected RunCollectionTypeCompatibilityConstraint(RunCollectionTypeCompatibilityConstraint original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/Calculator.cs

    r16453 r16462  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.Data;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Optimization {
    3434
    35   [StorableClass]
     35  [StorableType("6C41AF6F-5F02-4510-B1B5-222651C4021B")]
    3636  public class Calculator : IDeepCloneable {
    3737
    … …  
    5454
    5555    [StorableConstructor]
    56     protected Calculator(bool deserializing) { }
     56    protected Calculator(StorableConstructorFlag _) { }
    5757    public Calculator() { }
    5858    protected Calculator(Calculator original, Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionDiscretizer.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Core;
    2827using HeuristicLab.Data;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3130
    3231namespace HeuristicLab.Optimization {
    … …  
    3433    "Creates several levels from the distribution of a certain result accross a run collection and " +
    3534    "assigns a discretized value. Non-existing numbers as well as NaN and infinities are excluded from the caluclation.")]
    36   [StorableClass]
     35  [StorableType("6EFD185F-FE23-4E23-90F0-63CB9D38E57D")]
    3736  public class RunCollectionDiscretizer : ParameterizedNamedItem, IRunCollectionModifier {
    3837
    … …  
    6968      #region Construction & Cloning
    7069    [StorableConstructor]
    71     protected RunCollectionDiscretizer(bool deserializing) : base(deserializing) { }
     70    protected RunCollectionDiscretizer(StorableConstructorFlag _) : base(_) { }
    7271    protected RunCollectionDiscretizer(RunCollectionDiscretizer original, Cloner cloner)
    7372      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionFormulaModifer.cs

    r16453 r16462  
    2222using System;
    2323using System.Collections.Generic;
    24 using System.Linq;
    25 using System.Text;
    2624using HeuristicLab.Common;
    2725using HeuristicLab.Core;
    2826using HeuristicLab.Data;
    2927using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    3129
    3230namespace HeuristicLab.Optimization {
    3331
    3432  [Item("RunCollection Formula Modifier", "Modifies a RunCollection by adding results using the given formula.")]
    35   [StorableClass]
     33  [StorableType("EEE365F2-8BEB-41C6-9DE6-94CA8FAC5108")]
    3634  public class RunCollectionFormulaModifer : ParameterizedNamedItem, IRunCollectionModifier {
    3735
    … …  
    5250    #region Construction & Cloning
    5351    [StorableConstructor]
    54     protected RunCollectionFormulaModifer(bool deserializing) : base(deserializing) { }
     52    protected RunCollectionFormulaModifer(StorableConstructorFlag _) : base(_) { }
    5553    protected RunCollectionFormulaModifer(RunCollectionFormulaModifer original, Cloner cloner)
    5654      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionGroupCreater.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    … …  
    2726using HeuristicLab.Data;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    3029
    3130namespace HeuristicLab.Optimization {
    3231
    3332  [Item("RunCollection Group Creater", "Regroups existing runs according to equal values in GroupBy and prefixes them according to their value in Prefix.")]
    34   [StorableClass]
     33  [StorableType("5D3A55DE-DC75-4932-B3D2-2C59810143A5")]
    3534  public class RunCollectionGroupCreater : ParameterizedNamedItem, IRunCollectionModifier {
    3635   
    … …  
    4847    #region Construction & Cloning
    4948    [StorableConstructor]
    50     protected RunCollectionGroupCreater(bool deserializing) : base(deserializing) { }
     49    protected RunCollectionGroupCreater(StorableConstructorFlag _) : base(_) { }
    5150    protected RunCollectionGroupCreater(RunCollectionGroupCreater original, Cloner cloner) : base(original, cloner) { }
    5251    public RunCollectionGroupCreater() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionRunRemover.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Optimization {
    2828  [Item("RunCollection Run Remover", "Removes all currently visible runs. Use the filtering tab to selectively remove runs.")]
    29   [StorableClass]
     29  [StorableType("F66D03A7-6BF8-4DB5-9341-B1BFAA8AA023")]
    3030  public class RunCollectionRunRemover : ParameterizedNamedItem, IRunCollectionModifier {
    3131
    3232    #region Construction & Cloning
    3333    [StorableConstructor]
    34     protected RunCollectionRunRemover(bool deserializing) : base(deserializing) { }
     34    protected RunCollectionRunRemover(StorableConstructorFlag _) : base(_) { }
    3535    protected RunCollectionRunRemover(RunCollectionRunRemover original, Cloner cloner) : base(original, cloner) {}
    3636    public RunCollectionRunRemover() {}

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionSorter.cs

    r16453 r16462  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using System.Text;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Core;
    2827using HeuristicLab.Data;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3130
    3231namespace HeuristicLab.Optimization {
    3332  [Item("RunCollection Sorter", "Sorts a run collection according the specified key variable.")]
    34   [StorableClass]
     33  [StorableType("0F64D1D2-8934-4697-B997-A8072ADB4CF3")]
    3534  public class RunCollectionSorter : ParameterizedNamedItem, IRunCollectionModifier {
    3635
    … …  
    4847    #region Construction & Cloning
    4948    [StorableConstructor]
    50     protected RunCollectionSorter(bool deserializing) : base(deserializing) { }
     49    protected RunCollectionSorter(StorableConstructorFlag _) : base(_) { }
    5150    protected RunCollectionSorter(RunCollectionSorter original, Cloner cloner)
    5251      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/RunCollectionModification/RunCollectionValueRemover.cs

    r16453 r16462  
    2020#endregion
    2121
    22 using System;
    2322using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Text;
    2624using HeuristicLab.Common;
    2725using HeuristicLab.Core;
    2826using HeuristicLab.Data;
    2927using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    3129
    3230namespace HeuristicLab.Optimization {
    3331
    3432  [Item("RunCollection Value Remover", "Modifies a RunCollection by removing results or parameters.")]
    35   [StorableClass]
     33  [StorableType("300726A9-3E81-4F8E-A11F-4A5B3CDCA796")]
    3634  public class RunCollectionValueRemover : ParameterizedNamedItem, IRunCollectionModifier {
    3735   
    … …  
    4644    #region Construction & Cloning   
    4745    [StorableConstructor]
    48     protected RunCollectionValueRemover(bool deserializing) : base(deserializing) { }
     46    protected RunCollectionValueRemover(StorableConstructorFlag _) : base(_) { }
    4947    protected RunCollectionValueRemover(RunCollectionValueRemover original, Cloner cloner)
    5048      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Termination/ComparisonTerminator.cs

    r16453 r16462  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Optimization {
    3131  [Item("ComparisonTerminator", "An termination criterion which compares two values.")]
    32   [StorableClass]
     32  [StorableType("4059C985-CA18-4C95-AC1C-BA8AAE64AD98")]
    3333  public class ComparisonTerminator<T> : ThresholdTerminator<T> where T : class, IItem, IComparable, IStringConvertibleValue, new() {
    3434    public ILookupParameter<T> ComparisonValueParameter {
    … …  
    4646
    4747    [StorableConstructor]
    48     protected ComparisonTerminator(bool deserializing) : base(deserializing) { }
     48    protected ComparisonTerminator(StorableConstructorFlag _) : base(_) { }
    4949    [StorableHook(HookType.AfterDeserialization)]
    5050    private void AfterDeserialization() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Termination/ExecutionTimeTerminator.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Optimization {
    2929  [Item("ExecutionTimeTerminator", "A termination criterion based on execution time of an algorithm.")]
    30   [StorableClass]
     30  [StorableType("7BBF7D6F-C41C-4826-963B-5ED9544F8391")]
    3131  public class ExecutionTimeTerminator : ThresholdTerminator<TimeSpanValue> {
    3232
    … …  
    3535
    3636    [StorableConstructor]
    37     protected ExecutionTimeTerminator(bool deserializing) : base(deserializing) { }
     37    protected ExecutionTimeTerminator(StorableConstructorFlag _) : base(_) { }
    3838    protected ExecutionTimeTerminator(ExecutionTimeTerminator original, Cloner cloner)
    3939      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Termination/MultiTerminator.cs

    r16453 r16462  
    2929using HeuristicLab.Operators;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Optimization {
    3434  [Item("MultiTerminator", "A multi operator, containing termination criteria.")]
    35   [StorableClass]
     35  [StorableType("E03CCB0D-C76C-4DBC-94C5-8FED50E25D26")]
    3636  public sealed class MultiTerminator : CheckedMultiOperator<ITerminator>, ITerminator {
    3737    public static new Image StaticItemImage {
    … …  
    4444
    4545    [StorableConstructor]
    46     private MultiTerminator(bool deserializing) : base(deserializing) { }
     46    private MultiTerminator(StorableConstructorFlag _) : base(_) { }
    4747    private MultiTerminator(MultiTerminator original, Cloner cloner) : base(original, cloner) { }
    4848    public override IDeepCloneable Clone(Cloner cloner) { return new MultiTerminator(this, cloner); }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Termination/SingleObjectiveQualityTerminator.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Optimization {
    2828  [Item("SingleObjectiveQualityTerminator", "A termination criterion which uses a quality parameter (eg. current best quality) for termination.")]
    29   [StorableClass]
     29  [StorableType("A32469FB-7370-46E3-AB7F-EAF8053AF105")]
    3030  public class SingleObjectiveQualityTerminator : ComparisonTerminator<DoubleValue> {
    3131    [StorableConstructor]
    32     protected SingleObjectiveQualityTerminator(bool deserializing) : base(deserializing) { }
     32    protected SingleObjectiveQualityTerminator(StorableConstructorFlag _) : base(_) { }
    3333    protected SingleObjectiveQualityTerminator(SingleObjectiveQualityTerminator original, Cloner cloner)
    3434      : base(original, cloner) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Termination/TerminationOperator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Optimization {
    3030  [Item("TerminationOperator", "An operator which either calls the terminate- or the continue branch.")]
    31   [StorableClass]
     31  [StorableType("FD4B77FF-4C9D-45D9-8CDF-F5F5EE2664F7")]
    3232  public sealed class TerminationOperator : InstrumentedOperator, ITerminationBasedOperator {
    3333    public ILookupParameter<ITerminator> TerminatorParameter {
    … …  
    5454
    5555    [StorableConstructor]
    56     private TerminationOperator(bool deserializing) : base(deserializing) { }
     56    private TerminationOperator(StorableConstructorFlag _) : base(_) { }
    5757    private TerminationOperator(TerminationOperator original, Cloner cloner)
    5858      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Termination/Terminator.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Optimization {
    3232  [Item("Terminator", "A base class for all termination criteria.")]
    33   [StorableClass]
     33  [StorableType("E5DC984C-95B3-40F1-9D35-7B6E90A26B8A")]
    3434  public abstract class Terminator : SingleSuccessorOperator, ITerminator {
    3535    public static new Image StaticItemImage {
    … …  
    4242
    4343    [StorableConstructor]
    44     protected Terminator(bool deserializing) : base(deserializing) { }
     44    protected Terminator(StorableConstructorFlag _) : base(_) { }
    4545    protected Terminator(Terminator original, Cloner cloner) : base(original, cloner) { }
    4646

  • branches/2520_PersistenceReintegration/HeuristicLab.Optimization/3.3/Termination/ThresholdTerminator.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Optimization {
    3030  [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
    31   [StorableClass]
     31  [StorableType("E5D99104-54B2-471D-B27A-07CC737804A6")]
    3232  public abstract class ThresholdTerminator<T> : Terminator where T : class, IItem, IStringConvertibleValue, new() {
    3333    [Storable]
    … …  
    5252
    5353    [StorableConstructor]
    54     protected ThresholdTerminator(bool deserializing) : base(deserializing) { }
     54    protected ThresholdTerminator(StorableConstructorFlag _) : base(_) { }
    5555    [StorableHook(HookType.AfterDeserialization)]
    5656    private void AfterDeserialization() {
Note: See TracChangeset for help on using the changeset viewer.