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

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

Location:
trunk
Files:
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

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

    r11623 r16565  
    1111    <RootNamespace>HeuristicLab.Algorithms.SimulatedAnnealing</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.SimulatedAnnealing-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
     
    9999  </PropertyGroup>
    100100  <ItemGroup>
     101    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     102      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     103    </Reference>
     104    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     105      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     106    </Reference>
    101107    <Reference Include="System" />
    102108    <Reference Include="System.Core">
     
    104110    </Reference>
    105111    <Reference Include="System.Drawing" />
     112    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     113      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     114    </Reference>
    106115    <Reference Include="System.Xml.Linq">
    107116      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    122131  <ItemGroup>
    123132    <None Include="HeuristicLab.snk" />
     133    <None Include="packages.config" />
    124134    <None Include="Plugin.cs.frame" />
    125135    <None Include="Properties\AssemblyInfo.cs.frame" />
  • trunk/HeuristicLab.Algorithms.SimulatedAnnealing/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.SimulatedAnnealing/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.SimulatedAnnealing/3.3/SimulatedAnnealing.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.
     
    3131using HeuristicLab.Optimization.Operators;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3434using HeuristicLab.PluginInfrastructure;
    3535using HeuristicLab.Random;
     
    3838  [Item("Simulated Annealing (SA)", "A simulated annealing algorithm.")]
    3939  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 140)]
    40   [StorableClass]
     40  [StorableType("CE2B6164-C541-4E87-ABF6-FDE6CA6401BF")]
    4141  public sealed class SimulatedAnnealing : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4242    public string Filename { get; set; }
     
    149149
    150150    [StorableConstructor]
    151     private SimulatedAnnealing(bool deserializing) : base(deserializing) { }
     151    private SimulatedAnnealing(StorableConstructorFlag _) : base(_) { }
    152152    [StorableHook(HookType.AfterDeserialization)]
    153153    private void AfterDeserialization() {
  • trunk/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.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.
     
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3232using HeuristicLab.PluginInfrastructure;
    3333
     
    3737  /// </summary>
    3838  [Item("SimulatedAnnealingImprovementOperator", "A simulated annealing improvement operator.")]
    39   [StorableClass]
     39  [StorableType("838ADB03-1D6F-4795-B955-10C8B05B2EC4")]
    4040  public sealed class SimulatedAnnealingImprovementOperator : SingleSuccessorOperator, ILocalImprovementAlgorithmOperator, IStochasticOperator, ISingleObjectiveOperator {
    4141    #region IGenericLocalImprovementOperator Properties
     
    131131
    132132    [StorableConstructor]
    133     private SimulatedAnnealingImprovementOperator(bool deserializing) : base(deserializing) { }
     133    private SimulatedAnnealingImprovementOperator(StorableConstructorFlag _) : base(_) { }
    134134    private SimulatedAnnealingImprovementOperator(SimulatedAnnealingImprovementOperator original, Cloner cloner)
    135135      : base(original, cloner) {
  • trunk/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.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.Optimization.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Algorithms.SimulatedAnnealing {
     
    3333  /// </summary>
    3434  [Item("SimulatedAnnealingMainLoop", "An operator which represents the main loop of a simulated annealing algorithm.")]
    35   [StorableClass]
     35  [StorableType("ADDF6A58-21CD-4224-94BF-FE6AE5CBEE3A")]
    3636  public sealed class SimulatedAnnealingMainLoop : AlgorithmOperator {
    3737    #region Parameter properties
     
    9393
    9494    [StorableConstructor]
    95     private SimulatedAnnealingMainLoop(bool deserializing) : base(deserializing) { }
     95    private SimulatedAnnealingMainLoop(StorableConstructorFlag _) : base(_) { }
    9696    private SimulatedAnnealingMainLoop(SimulatedAnnealingMainLoop original, Cloner cloner)
    9797      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.