Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (5 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/BasicProblems
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • 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)
Note: See TracChangeset for help on using the changeset viewer.