Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/28/19 13:41:42 (6 years ago)
Author:
gkronber
Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:
trunk
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/BidirectionalLookup.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System;
    2323using System.Collections.Generic;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    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() {

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ConnectionInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using System.Linq;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/GraphVisualizationInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2525using HeuristicLab.Collections;
    2626using HeuristicLab.Common;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IConnectionInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System;
    2323using HeuristicLab.Common;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Operators.Views.GraphVisualization {
     27  [StorableType("3cdcae5a-9f9f-4b99-bcd7-cc9619a547d8")]
    2628  public interface IConnectionInfo : IDeepCloneable {
    2729    IShapeInfo From { get; }

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IGraphVisualizationInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Collections;
    2525using HeuristicLab.Common;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Operators.Views.GraphVisualization {
     29  [StorableType("d6df3b9d-453c-4f85-ae4b-76c3cbcc304c")]
    2830  public interface IGraphVisualizationInfo : IDeepCloneable, IContent {
    2931    IShapeInfo InitialShape { get; set; }

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/IShapeInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using System.Drawing;
    2525using HeuristicLab.Common;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Operators.Views.GraphVisualization {
     29  [StorableType("a4ab29fa-705b-4a49-8ca2-86a18b40de12")]
    2830  public interface IShapeInfo : IDeepCloneable {
    2931    Point Location { get; set; }

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/General/ShapeInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using System.Drawing;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    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) {

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/HeuristicLab.Operators.Views.GraphVisualization-3.3.csproj

    r11623 r16565  
    1111    <RootNamespace>HeuristicLab.Operators.Views.GraphVisualization</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Operators.Views.GraphVisualization-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    105105  </PropertyGroup>
    106106  <ItemGroup>
     107    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     108      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     112    </Reference>
    107113    <Reference Include="System" />
    108114    <Reference Include="System.Core">
    … …  
    110116    </Reference>
    111117    <Reference Include="System.Drawing" />
     118    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     119      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     120    </Reference>
    112121    <Reference Include="System.Windows.Forms" />
    113122    <Reference Include="System.Xml.Linq">
    … …  
    128137  <ItemGroup>
    129138    <None Include="HeuristicLab.snk" />
     139    <None Include="packages.config" />
    130140    <None Include="Plugin.cs.frame" />
    131141    <None Include="Properties\AssemblyInfo.cs.frame" />

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/IOperatorShapeInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2222using System.Collections.Generic;
    2323using System.Drawing;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Operators.Views.GraphVisualization {
     27  [StorableType("d6ae073c-ddf7-4923-abed-1b3c864ac492")]
    2628  public interface IOperatorShapeInfo : IShapeInfo {
    2729    bool Collapsed { get; set; }

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorGraphVisualizationInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Common;
    2828using HeuristicLab.Core;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    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>();

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShape.cs

    r15583 r16565  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    45 *
    56 * This file is part of HeuristicLab.
    … …  
    2324
    2425namespace HeuristicLab.Operators.Views.GraphVisualization {
     26  [StorableType("5a5d76a6-607b-418b-9de1-e30ea3e85f58")]
    2527  internal class OperatorShape {
    2628    //21.04.2011 mkommend

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfo.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2323using System.Drawing;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    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)

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/OperatorGraphVisualization/OperatorShapeInfoFactory.cs

    r15583 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/Plugin.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • trunk/HeuristicLab.Operators.Views.GraphVisualization/3.3/Properties/AssemblyInfo.cs.frame

    r15589 r16565  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.