Free cookie consent management tool by TermsFeed Policy Generator

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

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

Location:
trunk
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Algorithms.Benchmarks/3.3/Benchmark.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.
    … …  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Optimization;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.Benchmarks {
    3131  [Item("Benchmark", "Base class for benchmarks.")]
    32   [StorableClass]
     32  [StorableType("0715912F-4F40-40F6-AC08-677CC4F76819")]
    3333  public abstract class Benchmark : IBenchmark {
    3434    public virtual string ItemName {
    … …  
    6363
    6464    [StorableConstructor]
    65     protected Benchmark(bool deserializing) { }
     65    protected Benchmark(StorableConstructorFlag _) { }
    6666    protected Benchmark(Benchmark original, Cloner cloner) {
    6767      cloner.RegisterClonedObject(original, this);

  • trunk/HeuristicLab.Algorithms.Benchmarks/3.3/BenchmarkAlgorithm.cs

    r16430 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.
    … …  
    3232using HeuristicLab.Optimization;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Attic;
    3535using HeuristicLab.PluginInfrastructure;
    3636
    … …  
    3838  [Item("Benchmark Algorithm", "An algorithm to execute performance benchmarks (Linpack, Dhrystone, Whetstone, etc.).")]
    3939  [Creatable(CreatableAttribute.Categories.TestingAndAnalysis, Priority = 130)]
    40   [StorableClass]
     40  [StorableType("8E76490C-E5DA-4F09-8E94-10009FC4124D")]
    4141  public sealed class BenchmarkAlgorithm : IAlgorithm, IStorableContent {
    4242    private CancellationTokenSource cancellationTokenSource;
    … …  
    217217    #region Constructors
    218218    [StorableConstructor]
    219     private BenchmarkAlgorithm(bool deserializing) { }
     219    private BenchmarkAlgorithm(StorableConstructorFlag _) { }
    220220    private BenchmarkAlgorithm(BenchmarkAlgorithm original, Cloner cloner) {
    221221      if (original.ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));

  • trunk/HeuristicLab.Algorithms.Benchmarks/3.3/Dhrystone.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.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.Benchmarks {
    3232  [Item("Dhrystone", "Dhrystone performance benchmark.")]
    33   [StorableClass]
     33  [StorableType("277F595A-4309-4FA6-9C9D-CD0A140D7BAB")]
    3434  public sealed class Dhrystone : Benchmark {
    3535    private const int Ident_1 = 0;
    … …  
    5757
    5858    [StorableConstructor]
    59     private Dhrystone(bool deserializing) : base(deserializing) { }
     59    private Dhrystone(StorableConstructorFlag _) : base(_) { }
    6060    private Dhrystone(Dhrystone original, Cloner cloner) : base(original, cloner) { }
    6161    public Dhrystone() { }

  • trunk/HeuristicLab.Algorithms.Benchmarks/3.3/HeuristicLab.Algorithms.Benchmarks-3.3.csproj

    r11623 r16565  
    1111    <RootNamespace>HeuristicLab.Algorithms.Benchmarks</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.Benchmarks-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    8989  </PropertyGroup>
    9090  <ItemGroup>
     91    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     92      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     93    </Reference>
     94    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     95      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     96    </Reference>
    9197    <Reference Include="System" />
    9298    <Reference Include="System.Core" />
    9399    <Reference Include="System.Data" />
    94100    <Reference Include="System.Drawing" />
     101    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     102      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     103    </Reference>
    95104    <Reference Include="System.Xml" />
    96105  </ItemGroup>
    … …  
    107116  <ItemGroup>
    108117    <None Include="HeuristicLab.snk" />
     118    <None Include="packages.config" />
    109119    <None Include="Plugin.cs.frame" />
    110120    <None Include="Properties\AssemblyInfo.cs.frame" />

  • trunk/HeuristicLab.Algorithms.Benchmarks/3.3/IBenchmark.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.Core;
    2525using HeuristicLab.Optimization;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Algorithms.Benchmarks {
     29  [StorableType("FFCF9EC9-35CE-43C2-85CF-F90CEA6058BC")]
    2830  public interface IBenchmark : IItem {
    2931    byte[][] ChunkData { get; set; }

  • trunk/HeuristicLab.Algorithms.Benchmarks/3.3/Linpack.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.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.Benchmarks {
    3232  [Item("Linpack", "Linpack performance benchmark.")]
    33   [StorableClass]
     33  [StorableType("A480970C-E954-45F6-AFDE-BD99054E1BF7")]
    3434  public sealed class Linpack : Benchmark {
    3535    private const int DEFAULT_PSIZE = 1500;
    … …  
    4545
    4646    [StorableConstructor]
    47     private Linpack(bool deserializing) : base(deserializing) { }
     47    private Linpack(StorableConstructorFlag _) : base(_) { }
    4848    private Linpack(Linpack original, Cloner cloner) : base(original, cloner) { }
    4949    public Linpack() { }

  • trunk/HeuristicLab.Algorithms.Benchmarks/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.Algorithms.Benchmarks/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.

  • trunk/HeuristicLab.Algorithms.Benchmarks/3.3/Whetstone.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.Data;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.Benchmarks {
    3232  [Item("Whetstone", "Whetstone performance benchmark.")]
    33   [StorableClass]
     33  [StorableType("95D2274E-EFC7-444C-B5CF-F087B0A3C027")]
    3434  public sealed class Whetstone : Benchmark {
    3535    private long begin_time;
    … …  
    4545
    4646    [StorableConstructor]
    47     private Whetstone(bool deserializing) : base(deserializing) { }
     47    private Whetstone(StorableConstructorFlag _) : base(_) { }
    4848    private Whetstone(Whetstone original, Cloner cloner) : base(original, cloner) { }
    4949    public Whetstone() { }
Note: See TracChangeset for help on using the changeset viewer.