Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/25/19 17:26:02 (5 years ago)
Author:
gkronber
Message:

#2936: adapted branch to new persistence (works with HL trunk r16711)

Location:
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs

    r16077 r16712  
    3030using HeuristicLab.Parameters;
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3233
    3334namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    … …  
    4142  [Item("GRASP+PR (GQAP)", "The algorithm implements the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking as described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
    4243  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
    43   [StorableClass]
     44  [StorableType("1FF6B7FC-58CA-4F89-BCAF-31CFC0B0546C")]
    4445  public sealed class GRASP : StochasticAlgorithm<GRASPContext, IntegerVectorEncoding> {
    4546
    … …  
    123124
    124125    [StorableConstructor]
    125     private GRASP(bool deserializing) : base(deserializing) { }
     126    private GRASP(StorableConstructorFlag _) : base(_) { }
    126127    private GRASP(GRASP original, Cloner cloner)
    127128      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASPContext.cs

    r16077 r16712  
    2525using HeuristicLab.Parameters;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2930  [Item("GRASP+PR (GQAP) Context", "Context for GRASP+PR (GQAP).")]
    30   [StorableClass]
     31  [StorableType("40C0A979-FFDB-43E0-89A0-6553BD3EB9DB")]
    3132  public sealed class GRASPContext : PopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3233   
    … …  
    5051   
    5152    [StorableConstructor]
    52     private GRASPContext(bool deserializing) : base(deserializing) { }
     53    private GRASPContext(StorableConstructorFlag _) : base(_) { }
    5354    private GRASPContext(GRASPContext original, Cloner cloner)
    5455      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj

    r16077 r16712  
    1010    <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
    … …  
    4242  </PropertyGroup>
    4343  <ItemGroup>
     44    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     45      <SpecificVersion>False</SpecificVersion>
     46      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     47      <Private>False</Private>
     48    </Reference>
    4449    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    4550      <SpecificVersion>False</SpecificVersion>

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/ContextAlgorithm.cs

    r15718 r16712  
    3131using HeuristicLab.Parameters;
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3536  [Item("Context-based Algorithm", "Algorithms that make use of contexts to facilitate applying operators.")]
    36   [StorableClass]
     37  [StorableType("F4D85B12-B512-4CC5-B220-69C01E2C8DBB")]
    3738  public abstract class ContextAlgorithm<TContext, TEncoding> : BasicAlgorithm
    3839    where TContext : class, IContext, new()
    … …  
    110111
    111112    [StorableConstructor]
    112     protected ContextAlgorithm(bool deserializing) : base(deserializing) { }
     113    protected ContextAlgorithm(StorableConstructorFlag _) : base(_) { }
    113114    protected ContextAlgorithm(ContextAlgorithm<TContext, TEncoding> original, Cloner cloner)
    114115      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/StochasticAlgorithm.cs

    r15572 r16712  
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929using HeuristicLab.Random;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3233  [Item("Stochastic Algorithm", "Stochastic context-based algorithms to facilitate applying operators.")]
    33   [StorableClass]
     34  [StorableType("75B72520-ECBC-42F7-8560-448940825847")]
    3435  public abstract class StochasticAlgorithm<TContext, TEncoding> : ContextAlgorithm<TContext, TEncoding>
    3536    where TContext : class, IStochasticContext, new()
    … …  
    5758
    5859    [StorableConstructor]
    59     protected StochasticAlgorithm(bool deserializing) : base(deserializing) { }
     60    protected StochasticAlgorithm(StorableConstructorFlag _) : base(_) { }
    6061    protected StochasticAlgorithm(StochasticAlgorithm<TContext, TEncoding> original, Cloner cloner)
    6162      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/BasicContext.cs

    r15700 r16712  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3233  [Item("Basic Context", "A base class for algorithms' contexts.")]
    33   [StorableClass]
     34  [StorableType("32A031BB-19B1-4792-B3C0-673FF52A75E1")]
    3435  public class BasicContext : ParameterizedNamedItem, IContext {
    3536
    … …  
    7778
    7879    [StorableConstructor]
    79     protected BasicContext(bool deserializing) : base(deserializing) { }
     80    protected BasicContext(StorableConstructorFlag _) : base(_) { }
    8081    protected BasicContext(BasicContext original, Cloner cloner)
    8182    : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/PopulationContext.cs

    r15616 r16712  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2930  [Item("Population Context", "A context for population-based algorithms.")]
    30   [StorableClass]
     31  [StorableType("328AF409-9ECE-4E59-A842-ABBD98CBE386")]
    3132  public abstract class PopulationContext<TSolutionScope> : StochasticContext
    3233    where TSolutionScope: class, IScope {
    … …  
    5657
    5758    [StorableConstructor]
    58     protected PopulationContext(bool deserializing) : base(deserializing) { }
     59    protected PopulationContext(StorableConstructorFlag _) : base(_) { }
    5960    protected PopulationContext(PopulationContext<TSolutionScope> original, Cloner cloner)
    6061      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/SingleSolutionContext.cs

    r15616 r16712  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2728  [Item("Single Solution Context", "A context for single solution algorithms.")]
    28   [StorableClass]
     29  [StorableType("C894BD11-05CE-44E2-B25D-606071B78757")]
    2930  public abstract class SingleSolutionContext<TSolutionScope> : StochasticContext
    3031    where TSolutionScope: class, IScope {
    … …  
    4445
    4546    [StorableConstructor]
    46     protected SingleSolutionContext(bool deserializing) : base(deserializing) { }
     47    protected SingleSolutionContext(StorableConstructorFlag _) : base(_) { }
    4748    protected SingleSolutionContext(SingleSolutionContext<TSolutionScope> original, Cloner cloner)
    4849      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/StochasticContext.cs

    r15616 r16712  
    2424using HeuristicLab.Parameters;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2829  [Item("Stochastic Context", "A base class for stochastic algorithms' contexts.")]
    29   [StorableClass]
     30  [StorableType("AF5AA1FB-F4C2-450C-A760-C7B1EDBAFCB7")]
    3031  public class StochasticContext : BasicContext, IStochasticContext {
    3132   
    … …  
    3839
    3940    [StorableConstructor]
    40     protected StochasticContext(bool deserializing) : base(deserializing) { }
     41    protected StochasticContext(StorableConstructorFlag _) : base(_) { }
    4142    protected StochasticContext(StochasticContext original, Cloner cloner)
    4243    : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Interfaces.cs

    r15700 r16712  
    2222using System;
    2323using HeuristicLab.Core;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
     27  [StorableType("8AE6AC8A-7F9A-44C7-911A-4E618D1CC928")]
    2628  public interface ISingleObjectiveSolutionScope<TSolution> : IScope {
    2729    TSolution Solution { get; set; }
    … …  
    2931  }
    3032
     33  [StorableType("F007BD11-9CF1-418E-A113-BA68EFD0BC73")]
    3134  public interface IContext : IExecutionContext {
    3235    new IExecutionContext Parent { get; set; }
    … …  
    3841  }
    3942
     43  [StorableType("5723FC2A-39F7-4C7D-88D8-944C347B52D8")]
    4044  public interface IStochasticContext : IContext {
    4145    IRandom Random { get; set; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/SingleObjectiveSolutionScope.cs

    r15572 r16712  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3030  [Item("Solution Scope", "Scope for an individual/solution of a single-objective single-encoded problem.")]
    31   [StorableClass]
     31  [StorableType("C9026A26-C121-4F2E-88F8-2AA1ABF4D142")]
    3232  public sealed class SingleObjectiveSolutionScope<T> : NamedItem, ISingleObjectiveSolutionScope<T> where T : class, IItem {
    3333    public new static Image StaticItemImage {
    … …  
    7373
    7474    [StorableConstructor]
    75     private SingleObjectiveSolutionScope(bool deserializing) : base(deserializing) { }
     75    private SingleObjectiveSolutionScope(StorableConstructorFlag _) : base(_) { }
    7676    private SingleObjectiveSolutionScope(SingleObjectiveSolutionScope<T> original, Cloner cloner)
    7777      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Plugin.cs

    r16077 r16712  
    2323
    2424namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    25   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.15.15890")]
     25  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.15.16077")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Attic", "1.0")]
    2728  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    2829  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Plugin.cs.frame

    r16077 r16712  
    2525  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.15.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)]
     27  [PluginDependency("HeuristicLab.Attic", "1.0")]
    2728  [PluginDependency("HeuristicLab.Analysis", "3.3")]
    2829  [PluginDependency("HeuristicLab.Collections", "3.3")]

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Properties/AssemblyInfo.cs

    r16077 r16712  
    5454// [assembly: AssemblyVersion("1.0.*")]
    5555[assembly: AssemblyVersion("3.3.0.0")]
    56 [assembly: AssemblyFileVersion("3.3.15.15890")]
     56[assembly: AssemblyFileVersion("3.3.15.16077")]
Note: See TracChangeset for help on using the changeset viewer.