Ignore:
Timestamp:
01/28/19 13:41:42 (9 months 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.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.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.Problems.Knapsack {
     
    3535  /// </summary>
    3636  [Item("BestKnapsackSolutionAnalyzer", "An operator for analyzing the best solution for a Knapsack problem.")]
    37   [StorableClass]
     37  [StorableType("40BCB11E-F9C9-4749-A4FF-831BD8342D1A")]
    3838  public class BestKnapsackSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    public virtual bool EnabledByDefault {
     
    7373
    7474    [StorableConstructor]
    75     protected BestKnapsackSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     75    protected BestKnapsackSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7676    protected BestKnapsackSolutionAnalyzer(BestKnapsackSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7777    public BestKnapsackSolutionAnalyzer()
  • trunk/HeuristicLab.Problems.Knapsack/3.3/Evaluators/KnapsackEvaluator.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.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Problems.Knapsack {
     
    3434  /// </summary>
    3535  [Item("KnapsackEvaluator", "Evaluates solutions for the Knapsack problem.")]
    36   [StorableClass]
     36  [StorableType("905F6A31-FDC1-48EA-9229-DA23956F1929")]
    3737  public class KnapsackEvaluator : InstrumentedOperator, IKnapsackEvaluator {
    3838    public ILookupParameter<DoubleValue> QualityParameter {
     
    7070
    7171    [StorableConstructor]
    72     protected KnapsackEvaluator(bool deserializing) : base(deserializing) { }
     72    protected KnapsackEvaluator(StorableConstructorFlag _) : base(_) { }
    7373    protected KnapsackEvaluator(KnapsackEvaluator original, Cloner cloner) : base(original, cloner) { }
    7474    public KnapsackEvaluator()
     
    8989    }
    9090
     91    [StorableType(StorableMemberSelection.AllFields, "0968A5F3-5E3A-4357-A042-06E4BDEAFA6C")]
    9192    public struct KnapsackEvaluation {
    9293      public DoubleValue Quality;
  • trunk/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj

    r11623 r16565  
    1111    <RootNamespace>HeuristicLab.Problems.Knapsack</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.Knapsack-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>
     
    131140  <ItemGroup>
    132141    <None Include="HeuristicLab.snk" />
     142    <None Include="packages.config" />
    133143    <None Include="Plugin.cs.frame" />
    134144    <None Include="Properties\AssemblyInfo.cs.frame" />
  • trunk/HeuristicLab.Problems.Knapsack/3.3/Improvers/KnapsackImprovementOperator.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;
    3232
    3333namespace HeuristicLab.Problems.Knapsack {
     
    4040  /// </remarks>
    4141  [Item("KnapsackImprovementOperator", "An operator that improves knapsack solutions. It is implemented as described in Laguna, M. and Martí, R. (2003). Scatter Search: Methodology and Implementations in C. Operations Research/Computer Science Interfaces Series, Vol. 24. Springer.")]
    42   [StorableClass]
     42  [StorableType("DD57DC5B-8874-49C8-B28F-89962FC11EB2")]
    4343  public sealed class KnapsackImprovementOperator : SingleSuccessorOperator, ISingleObjectiveImprovementOperator {
    4444    #region Parameter properties
     
    8686
    8787    [StorableConstructor]
    88     private KnapsackImprovementOperator(bool deserializing) : base(deserializing) { }
     88    private KnapsackImprovementOperator(StorableConstructorFlag _) : base(_) { }
    8989    private KnapsackImprovementOperator(KnapsackImprovementOperator original, Cloner cloner) : base(original, cloner) { }
    9090    public KnapsackImprovementOperator()
  • trunk/HeuristicLab.Problems.Knapsack/3.3/Interfaces/IKnapsackEvaluator.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.
     
    2121
    2222using HeuristicLab.Optimization;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.Knapsack {
     26  [StorableType("B7D22238-9840-4293-A12E-6EEF7D7298FD")]
    2527  /// <summary>
    2628  /// An interface which represents an evaluation operator for Knapsack Problems.
  • trunk/HeuristicLab.Problems.Knapsack/3.3/Interfaces/IKnapsackMoveEvaluator.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 HeuristicLab.Data;
    2424using HeuristicLab.Optimization;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.Knapsack {
     28  [StorableType("68FE6DEB-F190-446B-9877-7BE56FB08585")]
    2729  public interface IKnapsackMoveEvaluator : ISingleObjectiveMoveEvaluator, IMoveOperator {
    2830    ILookupParameter<IntValue> KnapsackCapacityParameter { get; }
  • trunk/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.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;
    3535
     
    3737  [Item("Knapsack Problem (KSP)", "Represents a Knapsack problem.")]
    3838  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 200)]
    39   [StorableClass]
     39  [StorableType("8CEDAFA2-6E0A-4D4B-B6C6-F85CC58B824E")]
    4040  public sealed class KnapsackProblem : SingleObjectiveHeuristicOptimizationProblem<IKnapsackEvaluator, IBinaryVectorCreator>, IStorableContent {
    4141    public string Filename { get; set; }
     
    9999
    100100    [StorableConstructor]
    101     private KnapsackProblem(bool deserializing) : base(deserializing) { }
     101    private KnapsackProblem(StorableConstructorFlag _) : base(_) { }
    102102    private KnapsackProblem(KnapsackProblem original, Cloner cloner)
    103103      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.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.Data;
    2727using HeuristicLab.Encodings.BinaryVectorEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929
    3030namespace HeuristicLab.Problems.Knapsack {
     
    3333  /// </summary>
    3434  [Item("KnapsackSolution", "Represents a Knapsack solution which can be visualized in the GUI.")]
    35   [StorableClass]
     35  [StorableType("C959079D-3D92-4C88-8734-9DADEE851169")]
    3636  public class KnapsackSolution : Item {
    3737    public static new Image StaticItemImage {
     
    110110
    111111    [StorableConstructor]
    112     protected KnapsackSolution(bool deserializing) : base(deserializing) { }
     112    protected KnapsackSolution(StorableConstructorFlag _) : base(_) { }
    113113    protected KnapsackSolution(KnapsackSolution original, Cloner cloner)
    114114      : base(original, cloner) {
  • trunk/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackMoveEvaluator.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.Encodings.BinaryVectorEncoding;
    2626using HeuristicLab.Operators;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    3029
    3130namespace HeuristicLab.Problems.Knapsack {
     
    3433  /// </summary>
    3534  [Item("KnapsackMoveEvaluator", "A base class for operators which evaluate Knapsack moves.")]
    36   [StorableClass]
     35  [StorableType("F953FC74-8688-48E5-856D-E9D8A2411CA0")]
    3736  public abstract class KnapsackMoveEvaluator : SingleSuccessorOperator, IKnapsackMoveEvaluator, IBinaryVectorMoveOperator {
    3837    public ILookupParameter<DoubleValue> QualityParameter {
     
    5958
    6059    [StorableConstructor]
    61     protected KnapsackMoveEvaluator(bool deserializing) : base(deserializing) { }
     60    protected KnapsackMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    6261    protected KnapsackMoveEvaluator(KnapsackMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    6362    protected KnapsackMoveEvaluator()
  • trunk/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackOneBitflipMoveEvaluator.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.Encodings.BinaryVectorEncoding;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.Knapsack {
     
    3232  /// </summary>
    3333  [Item("KnapsackOneBitflipMoveEvaluator", "Base class for evaluating one bitflip moves.")]
    34   [StorableClass]
     34  [StorableType("E1BB4CCB-E9C3-4A16-8F03-3F619D4A4B0A")]
    3535  public class KnapsackOneBitflipMoveEvaluator : KnapsackMoveEvaluator, IOneBitflipMoveOperator {
    3636    public ILookupParameter<OneBitflipMove> OneBitflipMoveParameter {
     
    3939
    4040    [StorableConstructor]
    41     protected KnapsackOneBitflipMoveEvaluator(bool deserializing) : base(deserializing) { }
     41    protected KnapsackOneBitflipMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4242    protected KnapsackOneBitflipMoveEvaluator(KnapsackOneBitflipMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    4343    public KnapsackOneBitflipMoveEvaluator()
  • trunk/HeuristicLab.Problems.Knapsack/3.3/PathRelinkers/KnapsackPathRelinker.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.Encodings.BinaryVectorEncoding;
    2929using HeuristicLab.Optimization.Operators;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.Knapsack {
     
    3838  /// </remarks>
    3939  [Item("KnapsackPathRelinker", "An operator that relinks paths between knapsack solutions. The operator incrementally assimilates the initiating solution into the guiding solution by adding and removing elements as needed.")]
    40   [StorableClass]
     40  [StorableType("3A528AB4-5552-4979-B443-2943A3496BC3")]
    4141  public sealed class KnapsackPathRelinker : SingleObjectivePathRelinker {
    4242    [StorableConstructor]
    43     private KnapsackPathRelinker(bool deserializing) : base(deserializing) { }
     43    private KnapsackPathRelinker(StorableConstructorFlag _) : base(_) { }
    4444    private KnapsackPathRelinker(KnapsackPathRelinker original, Cloner cloner) : base(original, cloner) { }
    4545    public KnapsackPathRelinker() : base() { }
  • trunk/HeuristicLab.Problems.Knapsack/3.3/PathRelinkers/KnapsackSimultaneousPathRelinker.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.Encodings.BinaryVectorEncoding;
    2929using HeuristicLab.Optimization.Operators;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.Knapsack {
     
    3838  /// </remarks>
    3939  [Item("KnapsackSimultaneousPathRelinker", "An operator that relinks paths between knapsack solutions starting from both ends. The operator incrementally assimilates the initiating solution into the guiding solution and vice versa by adding and removing elements as needed.")]
    40   [StorableClass]
     40  [StorableType("8D046D17-BA0F-4974-AF76-95B3F90FB7A4")]
    4141  public sealed class KnapsackSimultaneousPathRelinker : SingleObjectivePathRelinker {
    4242    [StorableConstructor]
    43     private KnapsackSimultaneousPathRelinker(bool deserializing) : base(deserializing) { }
     43    private KnapsackSimultaneousPathRelinker(StorableConstructorFlag _) : base(_) { }
    4444    private KnapsackSimultaneousPathRelinker(KnapsackSimultaneousPathRelinker original, Cloner cloner) : base(original, cloner) { }
    4545    public KnapsackSimultaneousPathRelinker() : base() { }
  • trunk/HeuristicLab.Problems.Knapsack/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.Problems.Knapsack/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.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.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.
     
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    3738  [NonDiscoverableType]
    3839  [Obsolete("Please use the HammingSimilarityCalculator in the HeuristicLab.Encodings.BinaryVector plugin.")]
     40  [StorableType("27FD4466-6FDC-4420-A606-100FC0CDABF6")]
    3941  internal sealed class KnapsackSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    4042    protected override bool IsCommutative { get { return true; } }
    4143
    42     private KnapsackSimilarityCalculator(bool deserializing) : base(deserializing) { }
     44    [StorableConstructor]
     45    private KnapsackSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    4346    private KnapsackSimilarityCalculator(KnapsackSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
    4447    public KnapsackSimilarityCalculator() : base() { }
Note: See TracChangeset for help on using the changeset viewer.