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.Clients.OKB/3.3
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

    r16454 r16462  
    9292      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    9393    </Reference>
    94     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     94    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    9595      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    9696    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptyAlgorithm.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Clients.OKB.RunCreation {
    3030  [Item("Empty Algorithm", "A dummy algorithm which serves as a placeholder and cannot be executed.")]
    31   [StorableClass]
     31  [StorableType("C98C8322-5A78-4518-A94D-FA20F12AB8D3")]
    3232  [NonDiscoverableType]
    3333  public sealed class EmptyAlgorithm : HeuristicLab.Optimization.Algorithm {
    … …  
    5555
    5656    [StorableConstructor]
    57     private EmptyAlgorithm(bool deserializing)
    58       : base(deserializing) {
     57    private EmptyAlgorithm(StorableConstructorFlag _) : base(_) {
    5958      this.results = new ResultCollection();
    6059    }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptyEvaluator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.PluginInfrastructure;
    2929
    3030namespace HeuristicLab.Clients.OKB.RunCreation {
    3131  [Item("EmptyEvaluator", "A dummy evaluator which throws an exception when executed.")]
    32   [StorableClass]
     32  [StorableType("0AC24AEA-8CBF-4F93-AE7A-02113344FAD8")]
    3333  [NonDiscoverableType]
    3434  public sealed class EmptyEvaluator : Operator, IEvaluator {
    … …  
    5151
    5252    [StorableConstructor]
    53     private EmptyEvaluator(bool deserializing) : base(deserializing) { }
     53    private EmptyEvaluator(StorableConstructorFlag _) : base(_) { }
    5454    private EmptyEvaluator(EmptyEvaluator original, Cloner cloner)
    5555      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptyMultiObjectiveEvaluator.cs

    r16453 r16462  
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.PluginInfrastructure;
    3131
    3232namespace HeuristicLab.Clients.OKB.RunCreation {
    3333  [Item("EmptyMultiObjectiveEvaluator", "A dummy multi-objective evaluator which throws an exception when executed.")]
    34   [StorableClass]
     34  [StorableType("5E0EF79B-C771-4B6A-AAFD-598A1FF2D3AA")]
    3535  [NonDiscoverableType]
    3636  public sealed class EmptyMultiObjectiveEvaluator : Operator, IMultiObjectiveEvaluator {
    … …  
    5757
    5858    [StorableConstructor]
    59     private EmptyMultiObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     59    private EmptyMultiObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    6060    private EmptyMultiObjectiveEvaluator(EmptyMultiObjectiveEvaluator original, Cloner cloner)
    6161      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptyMultiObjectiveProblem.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
    2929  [Item("Empty Multi-Objective Problem", "A dummy multi-objective problem which serves as a placeholder and cannot be solved.")]
    30   [StorableClass]
     30  [StorableType("1AD8A6B9-1B3E-40BA-BAE2-8EAD31793B7D")]
    3131  [NonDiscoverableType]
    3232  public sealed class EmptyMultiObjectiveProblem : MultiObjectiveHeuristicOptimizationProblem<EmptyMultiObjectiveEvaluator, EmptySolutionCreator> {
    … …  
    3939
    4040    [StorableConstructor]
    41     private EmptyMultiObjectiveProblem(bool deserializing) : base(deserializing) { }
     41    private EmptyMultiObjectiveProblem(StorableConstructorFlag _) : base(_) { }
    4242    private EmptyMultiObjectiveProblem(EmptyMultiObjectiveProblem original, Cloner cloner) : base(original, cloner) { }
    4343    public EmptyMultiObjectiveProblem() : base(new EmptyMultiObjectiveEvaluator(), new EmptySolutionCreator()) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptyProblem.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
    2929  [Item("Empty Problem", "A dummy problem which serves as a placeholder and cannot be solved.")]
    30   [StorableClass]
     30  [StorableType("10132D57-7177-42A2-97B9-B77D89AADE6A")]
    3131  [NonDiscoverableType]
    3232  public sealed class EmptyProblem : HeuristicOptimizationProblem<EmptyEvaluator, EmptySolutionCreator> {
    … …  
    3939
    4040    [StorableConstructor]
    41     private EmptyProblem(bool deserializing) : base(deserializing) { }
     41    private EmptyProblem(StorableConstructorFlag _) : base(_) { }
    4242    private EmptyProblem(EmptyProblem original, Cloner cloner) : base(original, cloner) { }
    4343    public EmptyProblem()

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptySingleObjectiveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Optimization;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929using HeuristicLab.PluginInfrastructure;
    3030
    3131namespace HeuristicLab.Clients.OKB.RunCreation {
    3232  [Item("EmptySingleObjectiveEvaluator", "A dummy single-objective evaluator which throws an exception when executed.")]
    33   [StorableClass]
     33  [StorableType("EBA99DEF-5A98-49AA-B0F6-401886774335")]
    3434  [NonDiscoverableType]
    3535  public sealed class EmptySingleObjectiveEvaluator : Operator, ISingleObjectiveEvaluator {
    … …  
    5656
    5757    [StorableConstructor]
    58     private EmptySingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     58    private EmptySingleObjectiveEvaluator(StorableConstructorFlag _) : base(_) { }
    5959    private EmptySingleObjectiveEvaluator(EmptySingleObjectiveEvaluator original, Cloner cloner)
    6060      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptySingleObjectiveProblem.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
    2929  [Item("Empty Single-Objective Problem", "A dummy single-objective problem which serves as a placeholder and cannot be solved.")]
    30   [StorableClass]
     30  [StorableType("12D022A4-6DC4-4840-9EE7-F1EEB7A408F6")]
    3131  [NonDiscoverableType]
    3232  public sealed class EmptySingleObjectiveProblem : SingleObjectiveHeuristicOptimizationProblem<EmptySingleObjectiveEvaluator, EmptySolutionCreator> {
    … …  
    3939
    4040    [StorableConstructor]
    41     private EmptySingleObjectiveProblem(bool deserializing) : base(deserializing) { }
     41    private EmptySingleObjectiveProblem(StorableConstructorFlag _) : base(_) { }
    4242    private EmptySingleObjectiveProblem(EmptySingleObjectiveProblem original, Cloner cloner) : base(original, cloner) { }
    4343    public EmptySingleObjectiveProblem() : base(new EmptySingleObjectiveEvaluator(), new EmptySolutionCreator()) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/EmptySolutionCreator.cs

    r16453 r16462  
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Optimization;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828using HeuristicLab.PluginInfrastructure;
    2929
    3030namespace HeuristicLab.Clients.OKB.RunCreation {
    3131  [Item("EmptySolutionCreator", "A dummy solution creator which throws an exception when executed.")]
    32   [StorableClass]
     32  [StorableType("A3793B3B-A85B-47D3-A3DB-D35565518598")]
    3333  [NonDiscoverableType]
    3434  public sealed class EmptySolutionCreator : Operator, ISolutionCreator {
    … …  
    5151
    5252    [StorableConstructor]
    53     private EmptySolutionCreator(bool deserializing) : base(deserializing) { }
     53    private EmptySolutionCreator(StorableConstructorFlag _) : base(_) { }
    5454    private EmptySolutionCreator(EmptySolutionCreator original, Cloner cloner)
    5555      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/ItemWrapper.cs

    r16453 r16462  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727using HeuristicLab.PluginInfrastructure;
    2828
    2929namespace HeuristicLab.Clients.OKB.RunCreation {
    3030  [Item("ItemWrapper", "A wrapper which wraps an IItem.")]
    31   [StorableClass]
     31  [StorableType("27F3E8E3-AC7D-415E-BF16-7E05EF6E1549")]
    3232  [NonDiscoverableType]
    3333  public class ItemWrapper<T> : IItem where T : class, IItem {
    … …  
    7474
    7575    [StorableConstructor]
    76     protected ItemWrapper(bool deserializing) { }
     76    protected ItemWrapper(StorableConstructorFlag _) { }
    7777    protected ItemWrapper(ItemWrapper<T> original, Cloner cloner) {
    7878      cloner.RegisterClonedObject(original, this);

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/MultiObjectiveOKBProblem.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
    2929  [Item("OKB Problem (multi-objective)", "Represents a multi-objective problem which is stored in the OKB.")]
    3030  [Creatable(CreatableAttribute.Categories.TestingAndAnalysisOKB, Priority = 120)]
    31   [StorableClass]
     31  [StorableType("BB74E220-F721-4129-9A50-374647B16B97")]
    3232  public sealed class MultiObjectiveOKBProblem : OKBProblem, IMultiObjectiveHeuristicOptimizationProblem, IStorableContent {
    3333    public string Filename { get; set; }
    … …  
    4747
    4848    [StorableConstructor]
    49     private MultiObjectiveOKBProblem(bool deserializing) : base(deserializing) { }
     49    private MultiObjectiveOKBProblem(StorableConstructorFlag _) : base(_) { }
    5050    private MultiObjectiveOKBProblem(MultiObjectiveOKBProblem original, Cloner cloner) : base(original, cloner) { }
    5151    public MultiObjectiveOKBProblem() : base(new EmptyMultiObjectiveProblem("No problem selected. Please choose a multi-objective problem instance from the OKB.")) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/NamedItemWrapper.cs

    r16453 r16462  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.PluginInfrastructure;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
    2929  [Item("NamedItemWrapper", "A wrapper which wraps an INamedItem.")]
    30   [StorableClass]
     30  [StorableType("F6834425-A9E1-41B9-A354-66062DC4FBA9")]
    3131  [NonDiscoverableType]
    3232  public class NamedItemWrapper<T> : ItemWrapper<T>, INamedItem where T : class, INamedItem {
    … …  
    5959
    6060    [StorableConstructor]
    61     protected NamedItemWrapper(bool deserializing) : base(deserializing) { }
     61    protected NamedItemWrapper(StorableConstructorFlag _) : base(_) { }
    6262    protected NamedItemWrapper(NamedItemWrapper<T> original, Cloner cloner) : base(original, cloner) { }
    6363    public NamedItemWrapper(T item) : base(item) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBAlgorithm.cs

    r16453 r16462  
    2727using HeuristicLab.Core;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.Persistence.Default.Xml;
    3131using System;
    … …  
    3838  [Item("OKB Algorithm", "An algorithm which is stored in the OKB.")]
    3939  [Creatable(CreatableAttribute.Categories.TestingAndAnalysisOKB, Priority = 100)]
    40   [StorableClass]
     40  [StorableType("159620CA-BC90-48D9-8868-5D8940016BA0")]
    4141  public sealed class OKBAlgorithm : Item, IAlgorithm, IStorableContent {
    4242    public string Filename { get; set; }
    … …  
    183183
    184184    [StorableConstructor]
    185     private OKBAlgorithm(bool deserializing) : base(deserializing) { }
     185    private OKBAlgorithm(StorableConstructorFlag _) : base(_) { }
    186186    private OKBAlgorithm(OKBAlgorithm original, Cloner cloner)
    187187      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBProblem.cs

    r16453 r16462  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Optimization;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626using HeuristicLab.Persistence.Default.Xml;
    2727using System;
    … …  
    3333namespace HeuristicLab.Clients.OKB.RunCreation {
    3434  [Item("OKB Problem", "A base class for problems which are stored in the OKB.")]
    35   [StorableClass]
     35  [StorableType("041DC8A8-2987-4045-B24A-CBA7EAD47316")]
    3636  public abstract class OKBProblem : Item, IHeuristicOptimizationProblem {
    3737    public virtual Type ProblemType {
    … …  
    139139
    140140    [StorableConstructor]
    141     protected OKBProblem(bool deserializing) : base(deserializing) { }
     141    protected OKBProblem(StorableConstructorFlag _) : base(_) { }
    142142    protected OKBProblem(OKBProblem original, Cloner cloner)
    143143      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBRun.cs

    r16453 r16462  
    3030using HeuristicLab.Core;
    3131using HeuristicLab.Optimization;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Fossil;
    3333using HeuristicLab.Persistence.Default.Xml;
    3434
    3535namespace HeuristicLab.Clients.OKB.RunCreation {
    3636  [Item("OKB Run", "The parameters and results of an algorithm run which are stored in the OKB.")]
    37   [StorableClass]
     37  [StorableType("357B418B-4384-48EC-AAB3-F3008A7CD961")]
    3838  public sealed class OKBRun : NamedItemWrapper<IRun>, IRun, IStorableContent {
    3939    public string Filename { get; set; }
    … …  
    111111
    112112    [StorableConstructor]
    113     private OKBRun(bool deserializing) : base(deserializing) { }
     113    private OKBRun(StorableConstructorFlag _) : base(_) { }
    114114    private OKBRun(OKBRun original, Cloner cloner)
    115115      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBSolution.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using System;
    2626
    2727namespace HeuristicLab.Clients.OKB.RunCreation {
    2828  [Item("OKB Solution", "")]
    29   [StorableClass]
     29  [StorableType("5B06773F-20A4-41C3-AEE1-62084E2F5E71")]
    3030  public abstract class OKBSolution : Item {
    3131    [Storable]
    … …  
    5555
    5656    [StorableConstructor]
    57     protected OKBSolution(bool deserializing) : base(deserializing) { }
     57    protected OKBSolution(StorableConstructorFlag _) : base(_) { }
    5858    protected OKBSolution(OKBSolution original, Cloner cloner)
    5959      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/SingleObjectiveOKBProblem.cs

    r16453 r16462  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Clients.OKB.RunCreation {
    2929  [Item("OKB Problem (single-objective)", "Represents a single-objective problem which is stored in the OKB.")]
    3030  [Creatable(CreatableAttribute.Categories.TestingAndAnalysisOKB, Priority = 110)]
    31   [StorableClass]
     31  [StorableType("1A1DF6E8-4A3F-4D91-9B1D-6FF6EC8D1055")]
    3232  public sealed class SingleObjectiveOKBProblem : OKBProblem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
    3333    public string Filename { get; set; }
    … …  
    5050
    5151    [StorableConstructor]
    52     private SingleObjectiveOKBProblem(bool deserializing) : base(deserializing) { }
     52    private SingleObjectiveOKBProblem(StorableConstructorFlag _) : base(_) { }
    5353    private SingleObjectiveOKBProblem(SingleObjectiveOKBProblem original, Cloner cloner) : base(original, cloner) { }
    5454    public SingleObjectiveOKBProblem() : base(new EmptySingleObjectiveProblem("No problem selected. Please choose a single-objective problem instance from the OKB.")) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Clients.OKB/3.3/RunCreation/SingleObjectiveOKBSolution.cs

    r16453 r16462  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525using HeuristicLab.Persistence.Default.Xml;
    2626using System;
    … …  
    2929namespace HeuristicLab.Clients.OKB.RunCreation {
    3030  [Item("OKB Solution (single-objective)", "")]
    31   [StorableClass]
     31  [StorableType("55C3DE30-17C6-4327-8C33-7CF62201E78E")]
    3232  public sealed class SingleObjectiveOKBSolution : OKBSolution {
    3333    [Storable]
    … …  
    4343
    4444    [StorableConstructor]
    45     private SingleObjectiveOKBSolution(bool deserializing) : base(deserializing) { }
     45    private SingleObjectiveOKBSolution(StorableConstructorFlag _) : base(_) { }
    4646    private SingleObjectiveOKBSolution(SingleObjectiveOKBSolution original, Cloner cloner)
    4747      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.