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:
11 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/Analyzers/BestLAPSolutionAnalyzer.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.LinearAssignment {
    3333  [Item("BestLAPSolutionAnalyzer", "Analyzes the best solution found.")]
    34   [StorableClass]
     34  [StorableType("7C4B1DB3-E351-4C6C-899B-801303DFCE61")]
    3535  public class BestLAPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3636    public bool EnabledByDefault { get { return true; } }
    … …  
    7171
    7272    [StorableConstructor]
    73     protected BestLAPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     73    protected BestLAPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7474    protected BestLAPSolutionAnalyzer(BestLAPSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7575    public BestLAPSolutionAnalyzer()

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/HeuristicLab.Problems.LinearAssignment-3.3.csproj

    r15069 r16565  
    1111    <RootNamespace>HeuristicLab.Problems.LinearAssignment</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.LinearAssignment-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    109109  </PropertyGroup>
    110110  <ItemGroup>
     111    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     112      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath>
     116    </Reference>
    111117    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    112118      <HintPath>..\..\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    … …  
    117123    <Reference Include="System.Data" />
    118124    <Reference Include="System.Drawing" />
     125    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     126      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     127    </Reference>
    119128  </ItemGroup>
    120129  <ItemGroup>
    121130    <Compile Include="HungarianAlgorithm.cs" />
    122131    <Compile Include="LAPAssignment.cs" />
     132    <None Include="packages.config" />
    123133    <None Include="Plugin.cs.frame" />
    124134    <Compile Include="Analyzers\BestLAPSolutionAnalyzer.cs" />

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/HungarianAlgorithm.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.LinearAssignment {
    … …  
    3636  [Item("Hungarian Algorithm", "The Hungarian algorithm can be used to solve the linear assignment problem in O(n^3). It is also known as the Kuhn–Munkres algorithm or Munkres assignment algorithm.")]
    3737  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 170)]
    38   [StorableClass]
     38  [StorableType("2A2C1C1B-E0C3-4757-873B-C3F7C6D11A01")]
    3939  public sealed class HungarianAlgorithm : EngineAlgorithm, IStorableContent {
    4040    public string Filename { get; set; }
    … …  
    6767
    6868    [StorableConstructor]
    69     private HungarianAlgorithm(bool deserializing) : base(deserializing) { }
     69    private HungarianAlgorithm(StorableConstructorFlag _) : base(_) { }
    7070    private HungarianAlgorithm(HungarianAlgorithm original, Cloner cloner)
    7171      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/Interfaces/ILAPEvaluator.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.Encodings.PermutationEncoding;
    2525using HeuristicLab.Optimization;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.LinearAssignment {
     29  [StorableType("4B73438E-511A-4AF0-B7F1-B357F6092604")]
    2830  public interface ILAPEvaluator : ISingleObjectiveEvaluator {
    2931    ILookupParameter<DoubleMatrix> CostsParameter { get; }

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/LAPAssignment.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.Data;
    2626using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.LinearAssignment {
    3030  [Item("LAP Assignment", "Represents a solution to the LAP.")]
    31   [StorableClass]
     31  [StorableType("8F255E15-291B-44D5-BF8B-AC79264274C0")]
    3232  public sealed class LAPAssignment : Item, INotifyPropertyChanged, IStorableContent {
    3333    public string Filename { get; set; }
    … …  
    8989
    9090    [StorableConstructor]
    91     private LAPAssignment(bool deserializing) : base(deserializing) { }
     91    private LAPAssignment(StorableConstructorFlag _) : base(_) { }
    9292    private LAPAssignment(LAPAssignment original, Cloner cloner)
    9393      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/LAPEvaluator.cs

    r15583 r16565  
    22#region License Information
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
    … …  
    2222
    2323using HeuristicLab.Operators;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     24using HEAL.Attic;
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Common;
    … …  
    3131namespace HeuristicLab.Problems.LinearAssignment {
    3232  [Item("LAPEvaluator", "Evaluates a solution to the linear assignment problem.")]
    33   [StorableClass]
     33  [StorableType("DB86EA88-EE30-4E57-8447-D24B7B6ACB8A")]
    3434  public class LAPEvaluator : InstrumentedOperator, ILAPEvaluator {
    3535
    … …  
    4545
    4646    [StorableConstructor]
    47     protected LAPEvaluator(bool deserializing) : base(deserializing) { }
     47    protected LAPEvaluator(StorableConstructorFlag _) : base(_) { }
    4848    protected LAPEvaluator(LAPEvaluator original, Cloner cloner) : base(original, cloner) { }
    4949    public LAPEvaluator()

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.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("Linear Assignment Problem (LAP)", "In the linear assignment problem (LAP) an assignment of workers to jobs has to be found such that each worker is assigned to exactly one job, each job is assigned to exactly one worker and the sum of the resulting costs is minimal (or maximal).")]
    3838  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 130)]
    39   [StorableClass]
     39  [StorableType("7766E004-A93D-4CA6-8012-AE5E8F4C4D85")]
    4040  public sealed class LinearAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<ILAPEvaluator, IPermutationCreator>, IStorableContent {
    4141    public static readonly string CostsDescription = "The cost matrix that describes the assignment of rows to columns.";
    … …  
    9494
    9595    [StorableConstructor]
    96     private LinearAssignmentProblem(bool deserializing) : base(deserializing) { }
     96    private LinearAssignmentProblem(StorableConstructorFlag _) : base(_) { }
    9797    private LinearAssignmentProblem(LinearAssignmentProblem original, Cloner cloner)
    9898      : base(original, cloner) {

  • trunk/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblemSolver.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.Problems.LinearAssignment {
    3232  [Item("LinearAssignmentProblemSolver", "Uses the hungarian algorithm to solve linear assignment problems.")]
    33   [StorableClass]
     33  [StorableType("ABF202CC-44E4-4208-9EBF-1A104806358F")]
    3434  public sealed class LinearAssignmentProblemSolver : SingleSuccessorOperator, ISingleObjectiveOperator {
    3535    private const int UNASSIGNED = -1;
    … …  
    4949
    5050    [StorableConstructor]
    51     private LinearAssignmentProblemSolver(bool deserializing) : base(deserializing) { }
     51    private LinearAssignmentProblemSolver(StorableConstructorFlag _) : base(_) { }
    5252    private LinearAssignmentProblemSolver(LinearAssignmentProblemSolver original, Cloner cloner) : base(original, cloner) { }
    5353    public LinearAssignmentProblemSolver()

  • trunk/HeuristicLab.Problems.LinearAssignment/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.LinearAssignment/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.