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.Operators.Views.GraphVisualization/3.3
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs

    r16453 r16462  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Fossil;
    2525
    2626namespace HeuristicLab.Operators.Views.GraphVisualization {
    27   [StorableClass]
     27  [StorableType("1416F47D-BEFC-4127-AC55-971099AAD93D")]
    2828  internal class BidirectionalLookup<TFirst, TSecond> {
    2929    [Storable]
    … …  
    3333
    3434    [StorableConstructor]
    35     protected BidirectionalLookup(bool deserializing) : base() { }
     35    protected BidirectionalLookup(StorableConstructorFlag _) { }
    3636
    3737    public BidirectionalLookup() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.cs

    r16453 r16462  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Operators.Views.GraphVisualization {
    28   [StorableClass]
     28  [StorableType("92043EDD-87B0-42E9-A66F-230CC955C6D3")]
    2929  public class ConnectionInfo : DeepCloneable, IConnectionInfo {
    3030    [StorableConstructor]
    31     protected ConnectionInfo(bool deserializing) : base() { }
     31    protected ConnectionInfo(StorableConstructorFlag _) { }
    3232    protected ConnectionInfo(ConnectionInfo original, Cloner cloner)
    3333      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs

    r16453 r16462  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Operators.Views.GraphVisualization {
    30   [StorableClass]
     30  [StorableType("85B8035F-C25D-4C75-A2A2-21230A08E9B2")]
    3131  public class GraphVisualizationInfo : DeepCloneable, IGraphVisualizationInfo {
    3232    [StorableConstructor]
    33     protected GraphVisualizationInfo(bool deserializing) : base() { }
     33    protected GraphVisualizationInfo(StorableConstructorFlag _) { }
    3434    protected GraphVisualizationInfo(GraphVisualizationInfo original, Cloner cloner)
    3535      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs

    r16453 r16462  
    2424using System.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Fossil;
    2727
    2828namespace HeuristicLab.Operators.Views.GraphVisualization {
    29   [StorableClass]
     29  [StorableType("330945A7-D7AF-42B9-91D2-06C1B00BC078")]
    3030  public abstract class ShapeInfo : DeepCloneable, IShapeInfo {
    3131    [StorableConstructor]
    32     protected ShapeInfo(bool deserializing) : base() { }
     32    protected ShapeInfo(StorableConstructorFlag _) { }
    3333    protected ShapeInfo(ShapeInfo original, Cloner cloner)
    3434      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-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.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs

    r16453 r16462  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Operators.Views.GraphVisualization {
    32   [StorableClass]
     32  [StorableType("24376FA2-D635-4E10-85CC-FFE57C0788F9")]
    3333  public sealed class OperatorGraphVisualizationInfo : GraphVisualizationInfo {
    3434    [Storable]
    … …  
    4545
    4646    [StorableConstructor]
    47     private OperatorGraphVisualizationInfo(bool deserializing)
    48       : base(deserializing) {
     47    private OperatorGraphVisualizationInfo(StorableConstructorFlag _) : base(_) {
    4948      this.operatorParameterCollectionMapping = new BidirectionalLookup<IOperator, IKeyedItemCollection<string, IParameter>>();
    5049      this.parameterOperatorMapping = new Dictionary<IParameter, IOperator>();

  • branches/2520_PersistenceReintegration/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

    r16453 r16462  
    2323using System.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Fossil;
    2626
    2727namespace HeuristicLab.Operators.Views.GraphVisualization {
    28   [StorableClass]
     28  [StorableType("354155F1-6C42-42D3-99CB-9290CD11649B")]
    2929  public class OperatorShapeInfo : ShapeInfo, IOperatorShapeInfo {
    3030    [Storable]
    … …  
    3737
    3838    [StorableConstructor]
    39     protected OperatorShapeInfo(bool deserializing) : base(deserializing) { }
     39    protected OperatorShapeInfo(StorableConstructorFlag _) : base(_) { }
    4040
    4141    protected OperatorShapeInfo(OperatorShapeInfo original, Cloner cloner)
Note: See TracChangeset for help on using the changeset viewer.