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.ScatterSearch/3.3/HeuristicLab.Algorithms.ScatterSearch-3.3.csproj

    r11623 r16565  
    1111    <RootNamespace>HeuristicLab.Algorithms.ScatterSearch</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.ScatterSearch-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    8383  </PropertyGroup>
    8484  <ItemGroup>
     85    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     86      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     87    </Reference>
     88    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     89      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     90    </Reference>
    8591    <Reference Include="System" />
    8692    <Reference Include="System.Core" />
    8793    <Reference Include="System.Drawing" />
     94    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     95      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     96    </Reference>
    8897    <Reference Include="System.Xml.Linq" />
    8998    <Reference Include="System.Data.DataSetExtensions" />
    … …  
    95104    <Compile Include="OffspringProcessor.cs" />
    96105    <None Include="HeuristicLab.snk" />
     106    <None Include="packages.config" />
    97107    <None Include="Plugin.cs.frame" />
    98108    <Compile Include="Plugin.cs" />

  • trunk/HeuristicLab.Algorithms.ScatterSearch/3.3/OffspringProcessor.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.Operators;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Algorithms.ScatterSearch {
    … …  
    3131  /// </summary>
    3232  [Item("OffspringProcessor", "An operator that creates a subscope with subscopes for every variable in the current scope.")]
    33   [StorableClass]
     33  [StorableType("A89D522A-CAFF-4899-A24D-5EB463EEB03F")]
    3434  public sealed class OffspringProcessor : SingleSuccessorOperator {
    3535    #region Parameter properties
    … …  
    4646
    4747    [StorableConstructor]
    48     private OffspringProcessor(bool deserializing) : base(deserializing) { }
     48    private OffspringProcessor(StorableConstructorFlag _) : base(_) { }
    4949    private OffspringProcessor(OffspringProcessor original, Cloner cloner) : base(original, cloner) { }
    5050    public OffspringProcessor()

  • trunk/HeuristicLab.Algorithms.ScatterSearch/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.ScatterSearch/3.3/PopulationRebuildMethod.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.Optimization;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.ScatterSearch {
    … …  
    3434  /// </summary>
    3535  [Item("PopulationRebuildMethod", "An operator that updates the reference set and rebuilds the population.")]
    36   [StorableClass]
     36  [StorableType("B993B7E3-E510-4211-AD13-90517C810E34")]
    3737  public sealed class PopulationRebuildMethod : SingleSuccessorOperator, ISingleObjectiveOperator {
    3838    #region Parameter properties
    … …  
    7676
    7777    [StorableConstructor]
    78     private PopulationRebuildMethod(bool deserializing) : base(deserializing) { }
     78    private PopulationRebuildMethod(StorableConstructorFlag _) : base(_) { }
    7979    private PopulationRebuildMethod(PopulationRebuildMethod original, Cloner cloner) : base(original, cloner) { }
    8080    public PopulationRebuildMethod()

  • trunk/HeuristicLab.Algorithms.ScatterSearch/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.ScatterSearch/3.3/ReferenceSetUpdateMethod.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Algorithms.ScatterSearch {
    … …  
    3535  /// </summary>
    3636  [Item("ReferenceSetUpdateMethod", "An operator that updates the reference set.")]
    37   [StorableClass]
     37  [StorableType("478625DC-87BD-4111-98D1-45A9939198C8")]
    3838  public sealed class ReferenceSetUpdateMethod : SingleSuccessorOperator {
    3939    #region Parameter properties
    … …  
    5959
    6060    [StorableConstructor]
    61     private ReferenceSetUpdateMethod(bool deserializing) : base(deserializing) { }
     61    private ReferenceSetUpdateMethod(StorableConstructorFlag _) : base(_) { }
    6262    private ReferenceSetUpdateMethod(ReferenceSetUpdateMethod original, Cloner cloner) : base(original, cloner) { }
    6363    public ReferenceSetUpdateMethod()

  • trunk/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.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.
    … …  
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.Random;
    3434using HeuristicLab.Selection;
    … …  
    4040  [Item("Scatter Search (SS)", "A scatter search algorithm.")]
    4141  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 500)]
    42   [StorableClass]
     42  [StorableType("B0A218C1-8D92-4BDF-AAB7-C6396612C26B")]
    4343  public sealed class ScatterSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4444    public string Filename { get; set; }
    … …  
    157157
    158158    [StorableConstructor]
    159     private ScatterSearch(bool deserializing) : base(deserializing) { }
     159    private ScatterSearch(StorableConstructorFlag _) : base(_) { }
    160160    [StorableHook(HookType.AfterDeserialization)]
    161161    private void AfterDeserialization() {

  • trunk/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.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.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Selection;
    3131
    … …  
    3535  /// </summary>
    3636  [Item("ScatterSearchMainLoop", "An operator which represents a scatter search.")]
    37   [StorableClass]
     37  [StorableType("CDEB69B9-A0D9-4E84-80FD-347E16A1A8FE")]
    3838  public sealed class ScatterSearchMainLoop : AlgorithmOperator {
    3939    #region Parameter properties
    … …  
    170170
    171171    [StorableConstructor]
    172     private ScatterSearchMainLoop(bool deserializing) : base(deserializing) { }
     172    private ScatterSearchMainLoop(StorableConstructorFlag _) : base(_) { }
    173173    private ScatterSearchMainLoop(ScatterSearchMainLoop original, Cloner cloner) : base(original, cloner) { }
    174174    public ScatterSearchMainLoop() : base() { Initialize(); }

  • trunk/HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Algorithms.ScatterSearch {
    … …  
    3535  /// </summary>
    3636  [Item("SolutionPoolUpdateMethod", "An operator that updates the solution pool.")]
    37   [StorableClass]
     37  [StorableType("F295B5C8-8551-4DFC-A38C-354E14CED2E3")]
    3838  public sealed class SolutionPoolUpdateMethod : SingleSuccessorOperator, ISingleObjectiveOperator {
    3939    #region Parameter properties
    … …  
    7979
    8080    [StorableConstructor]
    81     private SolutionPoolUpdateMethod(bool deserializing) : base(deserializing) { }
     81    private SolutionPoolUpdateMethod(StorableConstructorFlag _) : base(_) { }
    8282    private SolutionPoolUpdateMethod(SolutionPoolUpdateMethod original, Cloner cloner) : base(original, cloner) { }
    8383    public SolutionPoolUpdateMethod()
Note: See TracChangeset for help on using the changeset viewer.