Free cookie consent management tool by TermsFeed Policy Generator

Changeset 16712


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

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

Location:
branches/2936_GQAPIntegration
Files:
73 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")]

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

    r15688 r16712  
    1010    <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />

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

    r16077 r16712  
    2323
    2424namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances {
    25   [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.15.15905")]
     25  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.15.16077")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]

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

    r16077 r16712  
    5353// [assembly: AssemblyVersion("1.0.*")]
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.15.15905")]
     55[assembly: AssemblyFileVersion("3.3.15.16077")]

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

    r16077 r16712  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    … …  
    1111    <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/Evaluation.cs

    r16077 r16712  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2930  [Item("GQAP Evaluation", "Class that contains the results of evaluating a solution to the GQAP.")]
    30   [StorableClass]
     31  [StorableType("765222A4-9184-42FF-9413-886BC9B2EF03")]
    3132  public class Evaluation : Item {
    3233
    … …  
    6465   
    6566    [StorableConstructor]
    66     protected Evaluation(bool deserializing) : base(deserializing) { }
     67    protected Evaluation(StorableConstructorFlag _) : base(_) { }
    6768    protected Evaluation(Evaluation original, Cloner cloner)
    6869      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/GQAPNMoveEvaluator.cs

    r16077 r16712  
    2929using HeuristicLab.Parameters;
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334  [Item("N-Move Evaluator", "Evaluates an N-Move.")]
    34   [StorableClass]
     35  [StorableType("EB4CCB5D-8FAC-4DFD-944E-1AC418AAE091")]
    3536  public class GQAPNMoveEvaluator : SingleSuccessorOperator, IGQAPNMoveEvaluator,
    3637    IQualityAwareGQAPOperator, IProblemInstanceAwareGQAPOperator, IAssignmentAwareGQAPOperator {
    … …  
    6667
    6768    [StorableConstructor]
    68     protected GQAPNMoveEvaluator(bool deserializing) : base(deserializing) { }
     69    protected GQAPNMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    6970    protected GQAPNMoveEvaluator(GQAPNMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    7071    public GQAPNMoveEvaluator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAP.cs

    r16077 r16712  
    3434using HeuristicLab.PluginInfrastructure;
    3535using HeuristicLab.Problems.Instances;
     36using HEAL.Attic;
    3637
    3738namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3839  [Item("Generalized Quadratic Assignment Problem (GQAP)", "The Generalized Quadratic Assignment Problem (GQAP) is a generalization of the QAP in that it allows to assign multiple facilities (here called equipment) to a single location. The problem is described in Lee, C.G., and Ma, Z. 2003. The Generalized Quadratic Assignment Problem. Technical Report M5S 3G8, University of Toronto, Canada.")]
    3940  [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
    40   [StorableClass]
     41  [StorableType("20DC9B2F-F667-425E-A235-B0192CCB1BF4")]
    4142  public sealed class GQAP : SingleObjectiveBasicProblem<IntegerVectorEncoding>,
    4243    IProblemInstanceConsumer<QAPData>,
    … …  
    8788
    8889    [StorableConstructor]
    89     private GQAP(bool deserializing) : base(deserializing) { }
     90    private GQAP(StorableConstructorFlag _) : base(_) { }
    9091    private GQAP(GQAP original, Cloner cloner)
    9192      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs

    r16077 r16712  
    2525using HeuristicLab.Encodings.IntegerVectorEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2930  [Item("Generalized QAP Assignment", "Represents the solution as well as the problem parameters of a GQAP instance.")]
    30   [StorableClass]
     31  [StorableType("8DAC9356-54EE-4EDC-9AB4-0DA47F111920")]
    3132  public sealed class GQAPAssignment : Item, INotifyPropertyChanged {
    3233
    … …  
    5455
    5556    [StorableConstructor]
    56     private GQAPAssignment(bool deserializing) : base(deserializing) { }
     57    private GQAPAssignment(StorableConstructorFlag _) : base(_) { }
    5758    private GQAPAssignment(GQAPAssignment original, Cloner cloner)
    5859      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignmentArchive.cs

    r16077 r16712  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2627
    2728namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2829  [Item("GQAPAssignmentArchive", "Stores the pareto front of assignments.")]
    29   [StorableClass]
     30  [StorableType("EA3C4BB4-322B-47EB-8A04-95DADA3D2C02")]
    3031  public sealed class GQAPAssignmentArchive : Item, INotifyPropertyChanged {
    3132
    … …  
    5354
    5455    [StorableConstructor]
    55     private GQAPAssignmentArchive(bool deserializing) : base(deserializing) { }
     56    private GQAPAssignmentArchive(StorableConstructorFlag _) : base(_) { }
    5657    private GQAPAssignmentArchive(GQAPAssignmentArchive original, Cloner cloner)
    5758      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPInstance.cs

    r16077 r16712  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132  [Item("GQAP Instance", "Instance of a generalized quadratic assignment problem.")]
    32   [StorableClass]
     33  [StorableType("54208525-4EF6-404F-AF4A-52927104C563")]
    3334  public class GQAPInstance : ParameterizedNamedItem {
    3435    public static readonly string WeightsDescription = "The weights matrix describes the flows between the equipments.";
    … …  
    131132
    132133    [StorableConstructor]
    133     protected GQAPInstance(bool deserializing) : base(deserializing) { }
     134    protected GQAPInstance(StorableConstructorFlag _) : base(_) { }
    134135    protected GQAPInstance(GQAPInstance original, Cloner cloner)
    135136      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPSolution.cs

    r16077 r16712  
    2525using HeuristicLab.Encodings.IntegerVectorEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2930  [Item("GQAPSolution", "A solution to the Generalized Quadratic Assignment Problem.")]
    30   [StorableClass]
     31  [StorableType("D4CC7924-87BF-4499-9149-D18000AD8151")]
    3132  public class GQAPSolution : Item, INotifyPropertyChanged {
    3233
    … …  
    5455
    5556    [StorableConstructor]
    56     protected GQAPSolution(bool deserializing) : base(deserializing) { }
     57    protected GQAPSolution(StorableConstructorFlag _) : base(_) { }
    5758    protected GQAPSolution(GQAPSolution original, Cloner cloner)
    5859      : base(original, cloner) {

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

    r16077 r16712  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup>
    44    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    … …  
    1111    <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    4141  </PropertyGroup>
    4242  <ItemGroup>
     43    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     44      <SpecificVersion>False</SpecificVersion>
     45      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
     46      <Private>False</Private>
     47    </Reference>
    4348    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    4449      <SpecificVersion>False</SpecificVersion>

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPCrossover.cs

    r16077 r16712  
    2323using HeuristicLab.Encodings.IntegerVectorEncoding;
    2424using HeuristicLab.Optimization;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     28  [StorableType("E2FD76F9-82CC-466A-AB42-5B31F02D45FC")]
    2729  public interface IGQAPCrossover : IGQAPOperator, ICrossover {
    2830    IScopeTreeLookupParameter<IntegerVector> ParentsParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPLocalImprovementOperator.cs

    r16077 r16712  
    2323using HeuristicLab.Encodings.IntegerVectorEncoding;
    2424using HeuristicLab.Optimization;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     28  [StorableType("D22AA954-0957-4F71-9D3C-A614F53A4821")]
    2729  public interface IGQAPLocalImprovementOperator : ILocalImprovementAlgorithmOperator {
    2830    ILookupParameter<IntegerVector> AssignmentParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPManipulator.cs

    r16077 r16712  
    2323using HeuristicLab.Encodings.IntegerVectorEncoding;
    2424using HeuristicLab.Optimization;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     28  [StorableType("A3C58BBD-1652-456B-AF71-D58F782A47D6")]
    2729  public interface IGQAPManipulator : IManipulator {
    2830    ILookupParameter<IntegerVector> AssignmentParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPMoveEvaluator.cs

    r16077 r16712  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Optimization;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     27  [StorableType("8DE86FE9-07B9-4550-B36C-4DC6B2F58272")]
    2628  public interface IGQAPMoveEvaluator : IGQAPMoveOperator, ISingleObjectiveMoveEvaluator {
    2729    ILookupParameter<Evaluation> MoveEvaluationParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPMoveOperator.cs

    r16077 r16712  
    2323using HeuristicLab.Encodings.IntegerVectorEncoding;
    2424using HeuristicLab.Optimization;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     28  [StorableType("BB1D416A-CFE4-4CEF-875F-905F38861087")]
    2729  public interface IGQAPMoveOperator : IMoveOperator {
    2830    ILookupParameter<IntegerVector> AssignmentParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPNMoveEvaluator.cs

    r16077 r16712  
    1 #region License Information
     1using HEAL.Attic;
     2#region License Information
    23/* HeuristicLab
    34 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    … …  
    2122
    2223namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     24  [StorableType("ACEEB42B-09AA-432C-98B4-2C6BBF0D38E5")]
    2325  public interface IGQAPNMoveEvaluator : IGQAPMoveEvaluator, IGQAPNMoveOperator { }
    2426}

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPNMoveOperator.cs

    r16077 r16712  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     26  [StorableType("4128D4FF-A36C-4D3F-ADE1-B63407D5C7DE")]
    2527  public interface IGQAPNMoveOperator : IGQAPMoveOperator {
    2628    ILookupParameter<NMove> MoveParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPOperator.cs

    r16077 r16712  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     26  [StorableType("521D5B7F-85A0-4BE9-89B2-CA0C3B5B9338")]
    2527  public interface IGQAPOperator : IOperator { }
    2628}

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPSolutionCreator.cs

    r16077 r16712  
    2121
    2222using HeuristicLab.Encodings.IntegerVectorEncoding;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    25   public interface IGQAPSolutionCreator : IIntegerVectorCreator {  }
     26  [StorableType("02E67D15-F15E-4255-855B-8BA2534E7B2E")]
     27  public interface IGQAPSolutionCreator : IIntegerVectorCreator { }
    2628}

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IAssignmentAwareGQAPOperator.cs

    r16077 r16712  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Encodings.IntegerVectorEncoding;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     27  [StorableType("1A005153-0B2E-4C8F-993A-F7B03438A359")]
    2628  public interface IAssignmentAwareGQAPOperator : IGQAPOperator {
    2729    ILookupParameter<IntegerVector> AssignmentParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownQualityAwareGQAPOperator.cs

    r16077 r16712  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     27  [StorableType("91E65BE8-8BFA-440B-A314-0494E70ED558")]
    2628  public interface IBestKnownQualityAwareGQAPOperator : IGQAPOperator {
    2729    ILookupParameter<DoubleValue> BestKnownQualityParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionAwareGQAPOperator.cs

    r16077 r16712  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     26  [StorableType("A90653A3-28DB-49AD-A7D5-07F689116BC6")]
    2527  public interface IBestKnownSolutionAwareGQAPOperator : IGQAPOperator {
    2628    ILookupParameter<GQAPAssignment> BestKnownSolutionParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionsAwareGQAPOperator.cs

    r16077 r16712  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     26  [StorableType("C8CCB98C-2792-427C-9C31-289364C4CFF7")]
    2527  public interface IBestKnownSolutionsAwareGQAPOperator : IGQAPOperator {
    2628    ILookupParameter<GQAPAssignmentArchive> BestKnownSolutionsParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IMoveQualityAwareGQAPOperator.cs

    r16077 r16712  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     27  [StorableType("9CFFCC2B-E7AC-4719-ABA8-4FAAD1EE106F")]
    2628  public interface IMoveQualityAwareGQAPOperator : IGQAPMoveOperator {
    2729    ILookupParameter<DoubleValue> MoveQualityParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IProblemInstanceAwareGQAPOperator.cs

    r16077 r16712  
    2121
    2222using HeuristicLab.Core;
     23using HEAL.Attic;
    2324
    2425namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     26  [StorableType("5780BD3B-C406-4C0E-96E9-52336301FFA2")]
    2527  public interface IProblemInstanceAwareGQAPOperator : IGQAPOperator {
    2628    ILookupParameter<GQAPInstance> ProblemInstanceParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualitiesAwareGQAPOperator.cs

    r16077 r16712  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     27  [StorableType("94E6E70C-6BF4-4F57-9D2E-8AC7E5716C34")]
    2628  public interface IQualitiesAwareGQAPOperator : IGQAPOperator {
    2729    IScopeTreeLookupParameter<DoubleValue> QualityParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualityAwareGQAPOperator.cs

    r16077 r16712  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
     24using HEAL.Attic;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
     27  [StorableType("903B1E5E-980E-440D-BFEF-C4EC8E3D01B4")]
    2628  public interface IQualityAwareGQAPOperator : IGQAPOperator {
    2729    ILookupParameter<DoubleValue> QualityParameter { get; }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/ExhaustiveOneMoveGenerator.cs

    r16077 r16712  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Random;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334  [Item("Exhaustive 1-Move MoveGenerator", "Exhaustively generates all possible 1-moves.")]
    34   [StorableClass]
     35  [StorableType("A200C3BE-D761-4F82-9CA9-44A7BB2AB0DD")]
    3536  public class ExhaustiveOneMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, IExhaustiveMoveGenerator {
    3637   
    … …  
    4041
    4142    [StorableConstructor]
    42     protected ExhaustiveOneMoveGenerator(bool deserializing) : base(deserializing) { }
     43    protected ExhaustiveOneMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4344    protected ExhaustiveOneMoveGenerator(ExhaustiveOneMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4445    public ExhaustiveOneMoveGenerator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPMoveGenerator.cs

    r16077 r16712  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132  [Item("GQAPMoveGenerator", "Base class for move generators for the Generalized Quadratic Assignment Problem.")]
    32   [StorableClass]
     33  [StorableType("4CB9C31B-4ACA-4ED6-8C7E-756319EFB8FF")]
    3334  public abstract class GQAPMoveGenerator : SingleSuccessorOperator, IMoveGenerator, IGQAPMoveOperator,
    3435    IProblemInstanceAwareGQAPOperator {
    … …  
    4445
    4546    [StorableConstructor]
    46     protected GQAPMoveGenerator(bool deserializing) : base(deserializing) { }
     47    protected GQAPMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4748    protected GQAPMoveGenerator(GQAPMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4849    public GQAPMoveGenerator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPNMoveGenerator.cs

    r16077 r16712  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3233  [Item("N-Move Generator", "Base class for move operators that generate N-Move moves.")]
    33   [StorableClass]
     34  [StorableType("AC6F4053-7EEF-4125-A6F7-C93A3DC7001A")]
    3435  public abstract class GQAPNMoveGenerator : GQAPMoveGenerator, IGQAPNMoveOperator {
    3536
    … …  
    4647
    4748    [StorableConstructor]
    48     protected GQAPNMoveGenerator(bool deserializing) : base(deserializing) { }
     49    protected GQAPNMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4950    protected GQAPNMoveGenerator(GQAPNMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    5051    public GQAPNMoveGenerator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMove.cs

    r16077 r16712  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2930  [Item("N-Move", "An N-Move describes the relocation of n equipments to n different locations.")]
    30   [StorableClass]
     31  [StorableType("A3E69FD9-B578-486C-81CE-D1CB65A250CE")]
    3132  public class NMove : Item {
    3233    [Storable]
    … …  
    5657
    5758    [StorableConstructor]
    58     protected NMove(bool deserializing) : base(deserializing) { }
     59    protected NMove(StorableConstructorFlag _) : base(_) { }
    5960    protected NMove(NMove original, Cloner cloner)
    6061      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveAbsoluteAttribute.cs

    r16077 r16712  
    2626using HeuristicLab.Encodings.IntegerVectorEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3031  [Item("N-Move Absolute TabuAttribute", "Attribute to determine whether a certain move is tabu.")]
    31   [StorableClass]
     32  [StorableType("39C4AE8F-9FEB-447A-878B-38796B7E8AAF")]
    3233  public class NMoveAbsoluteTabuAttribute : Item {
    3334
    … …  
    3839
    3940    [StorableConstructor]
    40     protected NMoveAbsoluteTabuAttribute(bool deserializing) : base(deserializing) { }
     41    protected NMoveAbsoluteTabuAttribute(StorableConstructorFlag _) : base(_) { }
    4142    protected NMoveAbsoluteTabuAttribute(NMoveAbsoluteTabuAttribute original, Cloner cloner) : base(original, cloner) { }
    4243    public NMoveAbsoluteTabuAttribute(NMove move, IntegerVector assignment, double moveQuality)

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveMaker.cs

    r16077 r16712  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3233  [Item("N-Move Maker", "Performs an N-Move.")]
    33   [StorableClass]
     34  [StorableType("9DAB4C4D-533A-4990-B591-A4C877F0CCE9")]
    3435  public class NMoveMaker : SingleSuccessorOperator, IQualityAwareGQAPOperator, IMoveQualityAwareGQAPOperator, IGQAPNMoveOperator, IMoveMaker {
    3536
    … …  
    5455
    5556    [StorableConstructor]
    56     protected NMoveMaker(bool deserializing) : base(deserializing) { }
     57    protected NMoveMaker(StorableConstructorFlag _) : base(_) { }
    5758    protected NMoveMaker(NMoveMaker original, Cloner cloner) : base(original, cloner) { }
    5859    public NMoveMaker()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuChecker.cs

    r16077 r16712  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Moves {
    3233  [Item("N-Move TabuChecker", "Checks if a certain N-Move is tabu.")]
    33   [StorableClass]
     34  [StorableType("8E122154-5BCE-404A-8AD4-6C30912B3E89")]
    3435  public class NMoveTabuChecker : SingleSuccessorOperator, ITabuChecker,
    3536    IGQAPNMoveOperator, IMoveQualityAwareGQAPOperator {
    … …  
    6869
    6970    [StorableConstructor]
    70     protected NMoveTabuChecker(bool deserializing) : base(deserializing) { }
     71    protected NMoveTabuChecker(StorableConstructorFlag _) : base(_) { }
    7172    protected NMoveTabuChecker(NMoveTabuChecker original, Cloner cloner) : base(original, cloner) { }
    7273    public NMoveTabuChecker()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuMaker.cs

    r16077 r16712  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Moves {
    3031  [Item("N-Move TabuMaker", "Declares an N-Move tabu.")]
    31   [StorableClass]
     32  [StorableType("BE81C264-2DD8-4A2C-8796-D0D1E121FF53")]
    3233  public class NMoveTabuMaker : TabuMaker, IGQAPNMoveOperator, IMoveQualityAwareGQAPOperator {
    3334
    … …  
    4344
    4445    [StorableConstructor]
    45     protected NMoveTabuMaker(bool deserializing) : base(deserializing) { }
     46    protected NMoveTabuMaker(StorableConstructorFlag _) : base(_) { }
    4647    protected NMoveTabuMaker(NMoveTabuMaker original, Cloner cloner) : base(original, cloner) { }
    4748    public NMoveTabuMaker()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveMultiMoveGenerator.cs

    r16077 r16712  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3233  [Item("Stochastic N-Move MultiMoveGenerator", "Randomly samples a number of N-Moves.")]
    33   [StorableClass]
     34  [StorableType("EEE53E16-0FB6-4041-A9AC-ECDA5E73A505")]
    3435  public class StochasticNMoveMultiMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, IMultiMoveGenerator {
    3536   
    … …  
    4243
    4344    [StorableConstructor]
    44     protected StochasticNMoveMultiMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected StochasticNMoveMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4546    protected StochasticNMoveMultiMoveGenerator(StochasticNMoveMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4647    public StochasticNMoveMultiMoveGenerator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs

    r16077 r16712  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.Random;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("Stochastic N-Move SingleMoveGenerator", "Randomly samples a single N-Move.")]
    36   [StorableClass]
     37  [StorableType("7CC8D0D6-C865-485F-A16A-C2ED764C6AC4")]
    3738  public class StochasticNMoveSingleMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, ISingleMoveGenerator {
    3839   
    … …  
    4243
    4344    [StorableConstructor]
    44     protected StochasticNMoveSingleMoveGenerator(bool deserializing) : base(deserializing) { }
     45    protected StochasticNMoveSingleMoveGenerator(StorableConstructorFlag _) : base(_) { }
    4546    protected StochasticNMoveSingleMoveGenerator(StochasticNMoveSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
    4647    public StochasticNMoveSingleMoveGenerator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs

    r16077 r16712  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Random;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334  [Item("CordeauCrossover", "The merge procedure that is described in Cordeau, J.-F., Gaudioso, M., Laporte, G., Moccia, L. 2006. A memetic heuristic for the generalized quadratic assignment problem. INFORMS Journal on Computing, 18, pp. 433–443.")]
    34   [StorableClass]
     35  [StorableType("05D7FC4C-EF71-4118-9FF1-B8B71B501A99")]
    3536  public class CordeauCrossover : GQAPCrossover,
    3637    IQualitiesAwareGQAPOperator, IProblemInstanceAwareGQAPOperator {
    … …  
    4748
    4849    [StorableConstructor]
    49     protected CordeauCrossover(bool deserializing) : base(deserializing) { }
     50    protected CordeauCrossover(StorableConstructorFlag _) : base(_) { }
    5051    protected CordeauCrossover(CordeauCrossover original, Cloner cloner)
    5152      : base(original, cloner) {

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/DiscreteLocationCrossover.cs

    r16077 r16712  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Random;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334  [Item("DiscreteLocationCrossover", "Combines the assignment to locations from various parents.")]
    34   [StorableClass]
     35  [StorableType("E001CEB3-DAA4-4AF4-843B-2DD951F0EAA6")]
    3536  public class DiscreteLocationCrossover : GQAPCrossover {
    3637
    3738    [StorableConstructor]
    38     protected DiscreteLocationCrossover(bool deserializing) : base(deserializing) { }
     39    protected DiscreteLocationCrossover(StorableConstructorFlag _) : base(_) { }
    3940    protected DiscreteLocationCrossover(DiscreteLocationCrossover original, Cloner cloner)
    4041      : base(original, cloner) { }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPCrossover.cs

    r16077 r16712  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132
    3233  [Item("GQAPCrossover", "A base class for operators that cross assignment vectors of the GeneralizedQuadraticAssignment problems.")]
    33   [StorableClass]
     34  [StorableType("DC860DB7-FC00-4374-ADC8-71BB4EDFC6E2")]
    3435  public abstract class GQAPCrossover : SingleSuccessorOperator, IGQAPCrossover, IStochasticOperator {
    3536    public override bool CanChangeName {
    … …  
    5152
    5253    [StorableConstructor]
    53     protected GQAPCrossover(bool deserializing) : base(deserializing) { }
     54    protected GQAPCrossover(StorableConstructorFlag _) : base(_) { }
    5455    protected GQAPCrossover(GQAPCrossover original, Cloner cloner) : base(original, cloner) { }
    5556    protected GQAPCrossover()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPPathRelinking.cs

    r16077 r16712  
    3030using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131using HeuristicLab.Random;
     32using HEAL.Attic;
    3233
    3334namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    … …  
    3637  /// </summary>
    3738  [Item("GQAPPathRelinking", "Operator that performs path relinking between two solutions. It is 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.")]
    38   [StorableClass]
     39  [StorableType("FAE65A24-AE6D-49DD-8A8C-6574D5304E08")]
    3940  public class GQAPPathRelinking : GQAPCrossover, IQualitiesAwareGQAPOperator {
    4041
    … …  
    5354
    5455    [StorableConstructor]
    55     protected GQAPPathRelinking(bool deserializing) : base(deserializing) { }
     56    protected GQAPPathRelinking(StorableConstructorFlag _) : base(_) { }
    5657    protected GQAPPathRelinking(GQAPPathRelinking original, Cloner cloner) : base(original, cloner) { }
    5758    public GQAPPathRelinking()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/MultiGQAPCrossover.cs

    r16077 r16712  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.PluginInfrastructure;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("MultiGQAPCrossover", "Randomly selects and applies one of its crossovers every time it is called.")]
    36   [StorableClass]
     37  [StorableType("C8AA967E-11CF-48A0-BEC2-71A9ABEB1801")]
    3738  public class MultiGQAPCrossover : StochasticMultiBranch<IGQAPCrossover>, IGQAPCrossover, IProblemInstanceAwareGQAPOperator, IStochasticOperator {
    3839    public override bool CanChangeName {
    … …  
    5455
    5556    [StorableConstructor]
    56     protected MultiGQAPCrossover(bool deserializing) : base(deserializing) { }
     57    protected MultiGQAPCrossover(StorableConstructorFlag _) : base(_) { }
    5758    protected MultiGQAPCrossover(MultiGQAPCrossover original, Cloner cloner) : base(original, cloner) { }
    5859    public MultiGQAPCrossover()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/ApproximateLocalSearch.cs

    r16077 r16712  
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Random;
     34using HEAL.Attic;
    3435
    3536namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    … …  
    3839  /// </summary>
    3940  [Item("ApproximateLocalSearch", "The approximate local search is 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.")]
    40   [StorableClass]
     41  [StorableType("58C75FBC-C586-4048-A60B-DCF967CB2E33")]
    4142  public class ApproximateLocalSearch : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
    4243    IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IAssignmentAwareGQAPOperator, IStochasticOperator {
    … …  
    8182
    8283    [StorableConstructor]
    83     protected ApproximateLocalSearch(bool deserializing) : base(deserializing) { }
     84    protected ApproximateLocalSearch(StorableConstructorFlag _) : base(_) { }
    8485    protected ApproximateLocalSearch(ApproximateLocalSearch original, Cloner cloner) : base(original, cloner) { }
    8586    public ApproximateLocalSearch()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/OneOptLocalSearch.cs

    r16077 r16712  
    3232using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Random;
     34using HEAL.Attic;
    3435
    3536namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3637  [Item("1-opt LocalSearch", "A simple exhaustive 1-change local search.")]
    37   [StorableClass]
     38  [StorableType("C574770B-AB1E-46BE-8B3F-C8C5B2AD3ACF")]
    3839  public class OneOptLocalSearch : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
    3940    IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IAssignmentAwareGQAPOperator, IStochasticOperator {
    … …  
    6970
    7071    [StorableConstructor]
    71     protected OneOptLocalSearch(bool deserializing) : base(deserializing) { }
     72    protected OneOptLocalSearch(StorableConstructorFlag _) : base(_) { }
    7273    protected OneOptLocalSearch(OneOptLocalSearch original, Cloner cloner) : base(original, cloner) { }
    7374    public OneOptLocalSearch()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/DemandEquivalentSwapEquipmentManipluator.cs

    r16077 r16712  
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using HeuristicLab.Random;
     31using HEAL.Attic;
    3132
    3233namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3334
    3435  [Item("DemandEquivalentSwapEquipmentManipluator", "Swaps equipment X from location A with as much equipments from location B that the demand of X is less than or equal to the demand of the swapped equipments in B.")]
    35   [StorableClass]
     36  [StorableType("1FC9A377-D187-414D-9901-D9B26C0BF98E")]
    3637  public class DemandEquivalentSwapEquipmentManipluator : GQAPManipulator {
    3738
    3839    [StorableConstructor]
    39     protected DemandEquivalentSwapEquipmentManipluator(bool deserializing) : base(deserializing) { }
     40    protected DemandEquivalentSwapEquipmentManipluator(StorableConstructorFlag _) : base(_) { }
    4041    protected DemandEquivalentSwapEquipmentManipluator(DemandEquivalentSwapEquipmentManipluator original, Cloner cloner) : base(original, cloner) { }
    4142    public DemandEquivalentSwapEquipmentManipluator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/GQAPManipulator.cs

    r16077 r16712  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132  [Item("GQAPManipulator", "A base class for operators that manipulate assignment vectors of the GeneralizedQuadraticAssignment problems.")]
    32   [StorableClass]
     33  [StorableType("4AC3D0BB-2BAA-4910-A806-7673BE3E7FEC")]
    3334  public abstract class GQAPManipulator : SingleSuccessorOperator, IGQAPManipulator, IProblemInstanceAwareGQAPOperator, IStochasticOperator {
    3435    public override bool CanChangeName {
    … …  
    4849
    4950    [StorableConstructor]
    50     protected GQAPManipulator(bool deserializing) : base(deserializing) { }
     51    protected GQAPManipulator(StorableConstructorFlag _) : base(_) { }
    5152    protected GQAPManipulator(GQAPManipulator original, Cloner cloner) : base(original, cloner) { }
    5253    protected GQAPManipulator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.cs

    r16077 r16712  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.PluginInfrastructure;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("MultiGQAPManipulator", "Randomly selects and applies one of its manipulators every time it is called.")]
    36   [StorableClass]
     37  [StorableType("CA2893AC-EECE-4F3A-A12E-81DC838ADC3C")]
    3738  public class MultiGQAPManipulator : StochasticMultiBranch<IGQAPManipulator>, IGQAPManipulator,
    3839    IProblemInstanceAwareGQAPOperator {
    … …  
    5253
    5354    [StorableConstructor]
    54     protected MultiGQAPManipulator(bool deserializing) : base(deserializing) { }
     55    protected MultiGQAPManipulator(StorableConstructorFlag _) : base(_) { }
    5556    protected MultiGQAPManipulator(MultiGQAPManipulator original, Cloner cloner) : base(original, cloner) { }
    5657    public MultiGQAPManipulator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/RelocateEquipmentManipluator.cs

    r16077 r16712  
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828using HeuristicLab.Random;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132
    3233  [Item("RelocateEquipmentManipluator", "Relocates a random equipment from an overstuffed location to a random one with space or a random equipment if constraints are satisfied.")]
    33   [StorableClass]
     34  [StorableType("B696CF26-6654-4CFC-8527-752C9F16F7DD")]
    3435  public class RelocateEquipmentManipluator : GQAPManipulator {
    3536   
    3637    [StorableConstructor]
    37     protected RelocateEquipmentManipluator(bool deserializing) : base(deserializing) { }
     38    protected RelocateEquipmentManipluator(StorableConstructorFlag _) : base(_) { }
    3839    protected RelocateEquipmentManipluator(RelocateEquipmentManipluator original, Cloner cloner) : base(original, cloner) { }
    3940    public RelocateEquipmentManipluator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapEquipmentManipluator.cs

    r16077 r16712  
    2525using HeuristicLab.Encodings.IntegerVectorEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2728
    2829namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    2930
    3031  [Item("SwapEquipmentManipluator", "Swaps two equipments by placing each in the location of the other.")]
    31   [StorableClass]
     32  [StorableType("FC7FD665-84A3-4BEA-A139-8248120375E0")]
    3233  public class SwapEquipmentManipluator : GQAPManipulator {
    3334
    3435    [StorableConstructor]
    35     protected SwapEquipmentManipluator(bool deserializing) : base(deserializing) { }
     36    protected SwapEquipmentManipluator(StorableConstructorFlag _) : base(_) { }
    3637    protected SwapEquipmentManipluator(SwapEquipmentManipluator original, Cloner cloner) : base(original, cloner) { }
    3738    public SwapEquipmentManipluator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapLocationManipulator.cs

    r16077 r16712  
    2626using HeuristicLab.Encodings.IntegerVectorEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3031
    3132  [Item("SwapLocationManipluator", "Swaps two locations by exchanging all equipments between the locations.")]
    32   [StorableClass]
     33  [StorableType("F0828F68-42FD-4B3E-9E55-5A7145A442AB")]
    3334  public class SwapLocationManipluator : GQAPManipulator {
    3435   
    3536    [StorableConstructor]
    36     protected SwapLocationManipluator(bool deserializing) : base(deserializing) { }
     37    protected SwapLocationManipluator(StorableConstructorFlag _) : base(_) { }
    3738    protected SwapLocationManipluator(SwapLocationManipluator original, Cloner cloner) : base(original, cloner) { }
    3839    public SwapLocationManipluator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Shakers/NMoveShakingOperator.cs

    r16077 r16712  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3031
    3132namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Operators {
    3233  [Item("NMoveShakingOperator", "Performs a number of shaking operations that increase in strength.")]
    33   [StorableClass]
     34  [StorableType("22D9F959-9BAB-497D-B593-FF19BD8CE9AB")]
    3435  public class NMoveShakingOperator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
    3536    IAssignmentAwareGQAPOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {
    … …  
    5354
    5455    [StorableConstructor]
    55     protected NMoveShakingOperator(bool deserializing) : base(deserializing) { }
     56    protected NMoveShakingOperator(StorableConstructorFlag _) : base(_) { }
    5657    protected NMoveShakingOperator(NMoveShakingOperator original, Cloner cloner) : base(original, cloner) { }
    5758    public NMoveShakingOperator() {

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

    r16077 r16712  
    2525  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment", "3.3.15.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment-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/3.3/SolutionCreators/GQAPSolutionCreator.cs

    r16077 r16712  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    2930
    3031namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3132  [Item("GQAPSolutionCreator", "Base class for solution creators of the Generalized Quadratic Assignment Problem.")]
    32   [StorableClass]
     33  [StorableType("1FD56558-5E7C-470C-8E7C-B3CEF7DB1D61")]
    3334  public abstract class GQAPSolutionCreator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, IGQAPSolutionCreator {
    3435
    … …  
    5152
    5253    [StorableConstructor]
    53     protected GQAPSolutionCreator(bool deserializing) : base(deserializing) { }
     54    protected GQAPSolutionCreator(StorableConstructorFlag _) : base(_) { }
    5455    protected GQAPSolutionCreator(GQAPSolutionCreator original, Cloner cloner)
    5556      : base(original, cloner) { }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GQAPStochasticSolutionCreator.cs

    r16077 r16712  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2829
    2930namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3031  [Item("GQAPStochasticSolutionCreator", "Base class for stochastic solution creators of the Generalized Quadratic Assignment Problem.")]
    31   [StorableClass]
     32  [StorableType("D7789768-032F-4EAB-ADED-FF4DD5A23B99")]
    3233  public abstract class GQAPStochasticSolutionCreator : GQAPSolutionCreator, IStochasticOperator {
    3334
    … …  
    3738
    3839    [StorableConstructor]
    39     protected GQAPStochasticSolutionCreator(bool deserializing) : base(deserializing) { }
     40    protected GQAPStochasticSolutionCreator(StorableConstructorFlag _) : base(_) { }
    4041    protected GQAPStochasticSolutionCreator(GQAPStochasticSolutionCreator original, Cloner cloner)
    4142      : base(original, cloner) { }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GreedyRandomizedSolutionCreator.cs

    r16077 r16712  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.Random;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    … …  
    3738  /// </summary>
    3839  [Item("GreedyRandomizedSolutionCreator", "Creates a solution according to the procedure 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.")]
    39   [StorableClass]
     40  [StorableType("44919EFC-AF47-4F0D-8EE4-F5AECBF776CA")]
    4041  public class GreedyRandomizedSolutionCreator : GQAPStochasticSolutionCreator {
    4142
    … …  
    4849
    4950    [StorableConstructor]
    50     protected GreedyRandomizedSolutionCreator(bool deserializing) : base(deserializing) { }
     51    protected GreedyRandomizedSolutionCreator(StorableConstructorFlag _) : base(_) { }
    5152    protected GreedyRandomizedSolutionCreator(GreedyRandomizedSolutionCreator original, Cloner cloner)
    5253      : base(original, cloner) { }

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs

    r16077 r16712  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.Random;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("RandomButFeasibleSolutionCreator", "Creates a random, but feasible solution to the Generalized Quadratic Assignment Problem.")]
    36   [StorableClass]
     37  [StorableType("3C194DAF-81A9-4FA3-AE7F-45951FC33DE1")]
    3738  public class RandomFeasibleSolutionCreator : GQAPStochasticSolutionCreator {
    3839
    … …  
    4546
    4647    [StorableConstructor]
    47     protected RandomFeasibleSolutionCreator(bool deserializing) : base(deserializing) { }
     48    protected RandomFeasibleSolutionCreator(StorableConstructorFlag _) : base(_) { }
    4849    protected RandomFeasibleSolutionCreator(RandomFeasibleSolutionCreator original, Cloner cloner) : base(original, cloner) { }
    4950    public RandomFeasibleSolutionCreator()

  • branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs

    r16077 r16712  
    3131using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232using HeuristicLab.Random;
     33using HEAL.Attic;
    3334
    3435namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
    3536  [Item("SlackMinimizationSolutionCreator", "A heuristic that creates a solution to the Generalized Quadratic Assignment Problem by minimizing the amount of slack.")]
    36   [StorableClass]
     37  [StorableType("02676A57-A686-4FDB-B912-B3792C749669")]
    3738  public class SlackMinimizationSolutionCreator : GQAPStochasticSolutionCreator {
    3839
    … …  
    5152
    5253    [StorableConstructor]
    53     protected SlackMinimizationSolutionCreator(bool deserializing) : base(deserializing) { }
     54    protected SlackMinimizationSolutionCreator(StorableConstructorFlag _) : base(_) { }
    5455    protected SlackMinimizationSolutionCreator(SlackMinimizationSolutionCreator original, Cloner cloner) : base(original, cloner) { }
    5556    public SlackMinimizationSolutionCreator()
Note: See TracChangeset for help on using the changeset viewer.