Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/31/19 14:40:15 (6 years ago)
Author:
abeham
Message:

#1614: updated to new persistence and .NET 4.6.1

Location:
branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexContext.cs

    r15616 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    2626namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
    2727  [Item("CPLEX Context", "A context for CPLEX solvers.")]
    28   [StorableClass]
     28  [StorableType("9A91A380-A6C3-4294-80D7-163AA13D600B")]
    2929  public class CplexContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3030   
    3131    [StorableConstructor]
    32     protected CplexContext(bool deserializing) : base(deserializing) { }
     32    protected CplexContext(StorableConstructorFlag _) : base(_) { }
    3333    protected CplexContext(CplexContext original, Cloner cloner)
    3434      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/CplexSolver.cs

    r15718 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.IntegerVectorEncoding;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using ILOG.CPLEX;
    3131using ILOG.OPL;
    … …  
    3333namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
    3434  [Item("CPLEX Solver (GQAP)", "Base class")]
    35   [StorableClass]
     35  [StorableType("09AC71C5-20C7-4AC0-9E5A-405BA5075552")]
    3636  public abstract class CplexSolver : ContextAlgorithm<CplexContext, IntegerVectorEncoding> {
    3737    public override bool SupportsPause {
    … …  
    4949
    5050    [StorableConstructor]
    51     protected CplexSolver(bool deserializing) : base(deserializing) { }
     51    protected CplexSolver(StorableConstructorFlag _) : base(_) { }
    5252    protected CplexSolver(CplexSolver original, Cloner cloner)
    5353    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/GQAP-FY.cs

    r15604 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525using ILOG.CPLEX;
    2626using ILOG.OPL;
    … …  
    2828namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
    2929  [Item("FY-Linearization CPLEX (GQAP)", "")]
    30   [StorableClass]
     30  [StorableType("C10D185E-B007-4C9F-9EFC-6EE1D44A3DE1")]
    3131  [Creatable(CreatableAttribute.Categories.Algorithms)]
    3232  public sealed class GQAP_FY : CplexSolver {
    3333   
    3434    [StorableConstructor]
    35     private GQAP_FY(bool deserializing) : base(deserializing) { }
     35    private GQAP_FY(StorableConstructorFlag _) : base(_) { }
    3636    private GQAP_FY(GQAP_FY original, Cloner cloner)
    3737    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/CPLEX/GQAP-KB.cs

    r15575 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525using ILOG.CPLEX;
    2626using ILOG.OPL;
    … …  
    2828namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.CPLEX {
    2929  [Item("KB-Linearization CPLEX (GQAP)", "")]
    30   [StorableClass]
     30  [StorableType("649D3DB6-3E54-46E7-BB12-5F26417D6E40")]
    3131  [Creatable(CreatableAttribute.Categories.Algorithms)]
    3232  public sealed class GQAP_KB : CplexSolver {
    3333   
    3434    [StorableConstructor]
    35     private GQAP_KB(bool deserializing) : base(deserializing) { }
     35    private GQAP_KB(StorableConstructorFlag _) : base(_) { }
    3636    private GQAP_KB(GQAP_KB original, Cloner cloner)
    3737    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/ESContext.cs

    r15572 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    2727namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
    2828  [Item("Evolution Strategy (GQAP) Context", "Context for Evolution Strategies (GQAP).")]
    29   [StorableClass]
     29  [StorableType("8A811131-337D-4CF6-A938-FFA08BF50B40")]
    3030  public sealed class ESContext : PopulationContext<ISingleObjectiveSolutionScope<ESGQAPSolution>> {
    3131   
    … …  
    5252   
    5353    [StorableConstructor]
    54     private ESContext(bool deserializing) : base(deserializing) { }
     54    private ESContext(StorableConstructorFlag _) : base(_) { }
    5555    private ESContext(ESContext original, Cloner cloner)
    5656      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/ESGQAPSolution.cs

    r15616 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Data;
    2526using HeuristicLab.Encodings.IntegerVectorEncoding;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
    2929  [Item("ES-specific GQAP Solution", "GQAP Solution that holds a strategy parameter")]
    30   [StorableClass]
     30  [StorableType("00A9856C-5E25-4F12-B3B0-6A9FF855B8A9")]
    3131  public class ESGQAPSolution : GQAPSolution {
    3232
    … …  
    4343
    4444    [StorableConstructor]
    45     protected ESGQAPSolution(bool deserializing) : base(deserializing) { }
     45    protected ESGQAPSolution(StorableConstructorFlag _) : base(_) { }
    4646    protected ESGQAPSolution(ESGQAPSolution original, Cloner cloner)
    4747    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/EvolutionStrategy.cs

    r15700 r16728  
    2424using System.Linq;
    2525using System.Threading;
     26using HEAL.Attic;
    2627using HeuristicLab.Common;
    2728using HeuristicLab.Core;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.Random;
    3434
    3535namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
     36  [StorableType("d568d524-1f84-461c-adf5-573d8e472063")]
    3637  public enum ESSelection { Plus = 0, Comma = 1 }
    3738
    3839  [Item("Evolution Strategy (GQAP)", "The algorithm implements a simple evolution strategy (ES).")]
    3940  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
    40   [StorableClass]
     41  [StorableType("A1590185-F2E3-4163-896E-28EEC93A5CDF")]
    4142  public sealed class EvolutionStrategy : StochasticAlgorithm<ESContext, IntegerVectorEncoding> {
    4243
    … …  
    9394
    9495    [StorableConstructor]
    95     private EvolutionStrategy(bool deserializing) : base(deserializing) { }
     96    private EvolutionStrategy(StorableConstructorFlag _) : base(_) { }
    9697    private EvolutionStrategy(EvolutionStrategy original, Cloner cloner)
    9798      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/OSGA.cs

    r15700 r16728  
    2323using System.Linq;
    2424using System.Threading;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    … …  
    2930using HeuristicLab.Optimization;
    3031using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232
    3333namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
    3434  [Item("OSGA (GQAP)", "The algorithm implements a strict offspring selection genetic algorithm (OSGA).")]
    3535  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
    36   [StorableClass]
     36  [StorableType("3BCF54DD-CECB-4027-AF2F-1764E6318B78")]
    3737  public sealed class OSGA : StochasticAlgorithm<OSGAContext, IntegerVectorEncoding> {
    3838
    … …  
    7171
    7272    [StorableConstructor]
    73     private OSGA(bool deserializing) : base(deserializing) { }
     73    private OSGA(StorableConstructorFlag _) : base(_) { }
    7474    private OSGA(OSGA original, Cloner cloner)
    7575      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Evolutionary/OSGAContext.cs

    r15572 r16728  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Data;
    2627using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2828
    2929namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.Evolutionary {
    3030  [Item("OSGA (GQAP) Context", "Context for OSGA (GQAP).")]
    31   [StorableClass]
     31  [StorableType("65ADDF53-91A6-4C8C-9DDE-B330E87AB32B")]
    3232  public sealed class OSGAContext : PopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3333   
    … …  
    7272   
    7373    [StorableConstructor]
    74     private OSGAContext(bool deserializing) : base(deserializing) { }
     74    private OSGAContext(StorableConstructorFlag _) : base(_) { }
    7575    private OSGAContext(OSGAContext original, Cloner cloner)
    7676      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs

    r15704 r16728  
    2323using System.Linq;
    2424using System.Threading;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    … …  
    2930using HeuristicLab.Optimization;
    3031using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232
    3333namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.GRASP {
    … …  
    4141  [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.")]
    4242  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
    43   [StorableClass]
     43  [StorableType("F39B6832-67A7-4123-B279-338914599BAB")]
    4444  public sealed class GRASP : StochasticAlgorithm<GRASPContext, IntegerVectorEncoding> {
    4545
    … …  
    123123
    124124    [StorableConstructor]
    125     private GRASP(bool deserializing) : base(deserializing) { }
     125    private GRASP(StorableConstructorFlag _) : base(_) { }
    126126    private GRASP(GRASP original, Cloner cloner)
    127127      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASPContext.cs

    r15572 r16728  
    2121
    2222using System.Linq;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    2526using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.GRASP {
    2929  [Item("GRASP+PR (GQAP) Context", "Context for GRASP+PR (GQAP).")]
    30   [StorableClass]
     30  [StorableType("64A7F8C0-8A38-4293-AC84-CE241EBF6F2C")]
    3131  public sealed class GRASPContext : PopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3232   
    … …  
    5050   
    5151    [StorableConstructor]
    52     private GRASPContext(bool deserializing) : base(deserializing) { }
     52    private GRASPContext(StorableConstructorFlag _) : base(_) { }
    5353    private GRASPContext(GRASPContext original, Cloner cloner)
    5454      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj

    r15758 r16728  
    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.Collections-3.3, Version=3.3.0.0">
    4550      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/ContextAlgorithm.cs

    r15718 r16728  
    2424using System.Linq;
    2525using System.Threading;
     26using HEAL.Attic;
    2627using HeuristicLab.Analysis;
    2728using HeuristicLab.Common;
    … …  
    3031using HeuristicLab.Optimization;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333
    3434namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3535  [Item("Context-based Algorithm", "Algorithms that make use of contexts to facilitate applying operators.")]
    36   [StorableClass]
     36  [StorableType("F7679602-28B2-495C-AF6C-370EFC7BE38A")]
    3737  public abstract class ContextAlgorithm<TContext, TEncoding> : BasicAlgorithm
    3838    where TContext : class, IContext, new()
    … …  
    110110
    111111    [StorableConstructor]
    112     protected ContextAlgorithm(bool deserializing) : base(deserializing) { }
     112    protected ContextAlgorithm(StorableConstructorFlag _) : base(_) { }
    113113    protected ContextAlgorithm(ContextAlgorithm<TContext, TEncoding> original, Cloner cloner)
    114114      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/StochasticAlgorithm.cs

    r15572 r16728  
    2121
    2222using System.Threading;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    … …  
    2627using HeuristicLab.Optimization;
    2728using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2929using HeuristicLab.Random;
    3030
    3131namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3232  [Item("Stochastic Algorithm", "Stochastic context-based algorithms to facilitate applying operators.")]
    33   [StorableClass]
     33  [StorableType("749A9442-BCE6-45A1-8911-159217199013")]
    3434  public abstract class StochasticAlgorithm<TContext, TEncoding> : ContextAlgorithm<TContext, TEncoding>
    3535    where TContext : class, IStochasticContext, new()
    … …  
    5757
    5858    [StorableConstructor]
    59     protected StochasticAlgorithm(bool deserializing) : base(deserializing) { }
     59    protected StochasticAlgorithm(StorableConstructorFlag _) : base(_) { }
    6060    protected StochasticAlgorithm(StochasticAlgorithm<TContext, TEncoding> original, Cloner cloner)
    6161      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/BasicContext.cs

    r15700 r16728  
    2323using System.Collections.Generic;
    2424using System.Threading;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    2728using HeuristicLab.Data;
    2829using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    3232  [Item("Basic Context", "A base class for algorithms' contexts.")]
    33   [StorableClass]
     33  [StorableType("633CC9F2-35B9-4193-A022-0D768532937A")]
    3434  public class BasicContext : ParameterizedNamedItem, IContext {
    3535
    … …  
    7777
    7878    [StorableConstructor]
    79     protected BasicContext(bool deserializing) : base(deserializing) { }
     79    protected BasicContext(StorableConstructorFlag _) : base(_) { }
    8080    protected BasicContext(BasicContext original, Cloner cloner)
    8181    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/PopulationContext.cs

    r15616 r16728  
    2222using System.Collections.Generic;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2929  [Item("Population Context", "A context for population-based algorithms.")]
    30   [StorableClass]
     30  [StorableType("2FF3BB92-80E9-4463-B05A-5D36B76873A6")]
    3131  public abstract class PopulationContext<TSolutionScope> : StochasticContext
    3232    where TSolutionScope: class, IScope {
    … …  
    5656
    5757    [StorableConstructor]
    58     protected PopulationContext(bool deserializing) : base(deserializing) { }
     58    protected PopulationContext(StorableConstructorFlag _) : base(_) { }
    5959    protected PopulationContext(PopulationContext<TSolutionScope> original, Cloner cloner)
    6060      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/SingleSolutionContext.cs

    r15616 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    2626namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2727  [Item("Single Solution Context", "A context for single solution algorithms.")]
    28   [StorableClass]
     28  [StorableType("1AE4E4ED-21C5-48E7-833C-58D813557026")]
    2929  public abstract class SingleSolutionContext<TSolutionScope> : StochasticContext
    3030    where TSolutionScope: class, IScope {
    … …  
    4444
    4545    [StorableConstructor]
    46     protected SingleSolutionContext(bool deserializing) : base(deserializing) { }
     46    protected SingleSolutionContext(StorableConstructorFlag _) : base(_) { }
    4747    protected SingleSolutionContext(SingleSolutionContext<TSolutionScope> original, Cloner cloner)
    4848      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/StochasticContext.cs

    r15616 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    2727namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
    2828  [Item("Stochastic Context", "A base class for stochastic algorithms' contexts.")]
    29   [StorableClass]
     29  [StorableType("9A9B3147-4D77-45E7-9A79-B6393666AB2E")]
    3030  public class StochasticContext : BasicContext, IStochasticContext {
    3131   
    … …  
    3838
    3939    [StorableConstructor]
    40     protected StochasticContext(bool deserializing) : base(deserializing) { }
     40    protected StochasticContext(StorableConstructorFlag _) : base(_) { }
    4141    protected StochasticContext(StochasticContext original, Cloner cloner)
    4242    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Interfaces.cs

    r15700 r16728  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Core;
    2425
    2526namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
     27  [StorableType("2bab7669-028a-4ba8-9c63-60853e15ad47")]
    2628  public interface ISingleObjectiveSolutionScope<TSolution> : IScope {
    2729    TSolution Solution { get; set; }
    2830    double Fitness { get; set; }
    2931  }
    30 
     32  [StorableType("0ae52e60-5ea1-428f-99ca-b7b84a79857d")]
    3133  public interface IContext : IExecutionContext {
    3234    new IExecutionContext Parent { get; set; }
    … …  
    3739    event EventHandler BestQualityChanged;
    3840  }
    39 
     41  [StorableType("ab766d45-2dab-4280-9f4e-1531fe9a91cf")]
    4042  public interface IStochasticContext : IContext {
    4143    IRandom Random { get; set; }

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/SingleObjectiveSolutionScope.cs

    r15572 r16728  
    2121
    2222using System.Drawing;
     23using HEAL.Attic;
    2324using HeuristicLab.Collections;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    2627using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    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("C3F4010D-8B4F-4F0E-B99C-1B78AED8F114")]
    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/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHC.cs

    r15700 r16728  
    2323using System.Linq;
    2424using System.Threading;
     25using HEAL.Attic;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    … …  
    2930using HeuristicLab.Optimization;
    3031using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3232
    3333namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
    3434  [Item("LAHC (GQAP)", "Late-acceptance hill climber for the GQAP.")]
    3535  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
    36   [StorableClass]
     36  [StorableType("41FABEE1-506A-45FE-A6D3-57932036AEC8")]
    3737  public sealed class LAHC : StochasticAlgorithm<LAHCContext, IntegerVectorEncoding> {
    3838
    … …  
    6262
    6363    [StorableConstructor]
    64     private LAHC(bool deserializing) : base(deserializing) { }
     64    private LAHC(StorableConstructorFlag _) : base(_) { }
    6565    private LAHC(LAHC original, Cloner cloner)
    6666      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/LAHCContext.cs

    r15616 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Data;
    2526using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
    2929  [Item("LAHC Context", "Context for late-acceptance hill climber")]
    30   [StorableClass]
     30  [StorableType("546B6C06-D986-49AA-BDEB-B664D2A9DA8C")]
    3131  public sealed class LAHCContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3232    [Storable]
    … …  
    5959   
    6060    [StorableConstructor]
    61     private LAHCContext(bool deserializing) : base(deserializing) { }
     61    private LAHCContext(StorableConstructorFlag _) : base(_) { }
    6262    private LAHCContext(LAHCContext original, Cloner cloner)
    6363    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHC.cs

    r15700 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2829using HeuristicLab.Optimization;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131
    3232namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
    3333  [Item("pLAHC-s (GQAP)", "Parameterless Late-acceptance hill climber for the GQAP.")]
    3434  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
    35   [StorableClass]
     35  [StorableType("90A97927-D784-4F73-9215-ADC75A9F6C9D")]
    3636  public sealed class PLAHCS : StochasticAlgorithm<PLAHCContext, IntegerVectorEncoding> {
    3737
    … …  
    7272
    7373    [StorableConstructor]
    74     private PLAHCS(bool deserializing) : base(deserializing) { }
     74    private PLAHCS(StorableConstructorFlag _) : base(_) { }
    7575    private PLAHCS(PLAHCS original, Cloner cloner)
    7676      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LAHC/pLAHCContext.cs

    r15616 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Data;
    2526using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2727
    2828namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LAHC {
    2929  [Item("pLAHC-s Context", "Context for parameterless late-acceptance hill climber with seeding.")]
    30   [StorableClass]
     30  [StorableType("3C550AB5-8FEC-42DA-9200-ABC98A1C20EA")]
    3131  public sealed class PLAHCContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3232    [Storable]
    … …  
    7373   
    7474    [StorableConstructor]
    75     private PLAHCContext(bool deserializing) : base(deserializing) { }
     75    private PLAHCContext(StorableConstructorFlag _) : base(_) { }
    7676    private PLAHCContext(PLAHCContext original, Cloner cloner)
    7777    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/IteratedLS.cs

    r15700 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2829using HeuristicLab.Optimization;
    2930using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3131
    3232namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
    3333  [Item("Iterated Local Search (GQAP)", "Iterated local search for the GQAP.")]
    3434  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
    35   [StorableClass]
     35  [StorableType("2C8EE433-B133-4382-8B4F-4EFFA536D759")]
    3636  public sealed class IteratedLS : StochasticAlgorithm<LocalSearchContext, IntegerVectorEncoding> {
    3737
    … …  
    6161
    6262    [StorableConstructor]
    63     private IteratedLS(bool deserializing) : base(deserializing) { }
     63    private IteratedLS(StorableConstructorFlag _) : base(_) { }
    6464    private IteratedLS(IteratedLS original, Cloner cloner)
    6565      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/LocalSearchContext.cs

    r15616 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    2727namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
    2828  [Item("Local Search Context", "Context for local search algorithms.")]
    29   [StorableClass]
     29  [StorableType("1AD51259-7DDB-43C1-A4A0-9E8B652988B1")]
    3030  public sealed class LocalSearchContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3131    [Storable]
    … …  
    4444   
    4545    [StorableConstructor]
    46     private LocalSearchContext(bool deserializing) : base(deserializing) { }
     46    private LocalSearchContext(StorableConstructorFlag _) : base(_) { }
    4747    private LocalSearchContext(LocalSearchContext original, Cloner cloner)
    4848    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSearch/MultistartLS.cs

    r15700 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.IntegerVectorEncoding;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSearch {
    3232  [Item("Multi-start Local Search (GQAP)", "Multi-start local search for the GQAP.")]
    3333  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
    34   [StorableClass]
     34  [StorableType("DA79118A-BA6B-4A0F-81E6-752D750BF7F4")]
    3535  public sealed class MultistartLS : StochasticAlgorithm<LocalSearchContext, IntegerVectorEncoding> {
    3636
    … …  
    4949
    5050    [StorableConstructor]
    51     private MultistartLS(bool deserializing) : base(deserializing) { }
     51    private MultistartLS(StorableConstructorFlag _) : base(_) { }
    5252    private MultistartLS(MultistartLS original, Cloner cloner)
    5353      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPBinarySolver.cs

    r15713 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.IntegerVectorEncoding;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using localsolver;
    3131
    3232namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
    3333  [Item("LocalSolver Binary (GQAP)", "LocalSolver algorithm solving the GQAP using 0-1 decision variables")]
    34   [StorableClass]
     34  [StorableType("E9040268-4240-4EF7-8E9A-6991D0831D06")]
    3535  [Creatable(CreatableAttribute.Categories.Algorithms)]
    3636  public sealed class GQAPBinarySolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
    … …  
    5656
    5757    [StorableConstructor]
    58     private GQAPBinarySolver(bool deserializing) : base(deserializing) { }
     58    private GQAPBinarySolver(StorableConstructorFlag _) : base(_) { }
    5959    private GQAPBinarySolver(GQAPBinarySolver original, Cloner cloner)
    6060    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPIntegerSolver.cs

    r15713 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.IntegerVectorEncoding;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using localsolver;
    3131
    3232namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
    3333  [Item("LocalSolver Integer (GQAP)", "LocalSolver algorithm solving the GQAP using integer decision variables")]
    34   [StorableClass]
     34  [StorableType("6D0D77CE-A8DE-41EA-9674-A1D59782D03B")]
    3535  [Creatable(CreatableAttribute.Categories.Algorithms)]
    3636  public sealed class GQAPIntegerSolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
    … …  
    5555
    5656    [StorableConstructor]
    57     private GQAPIntegerSolver(bool deserializing) : base(deserializing) { }
     57    private GQAPIntegerSolver(StorableConstructorFlag _) : base(_) { }
    5858    private GQAPIntegerSolver(GQAPIntegerSolver original, Cloner cloner)
    5959    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/GQAPListSolver.cs

    r15890 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.IntegerVectorEncoding;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030using localsolver;
    3131
    3232namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
    3333  [Item("LocalSolver List (GQAP)", "LocalSolver algorithm solving the GQAP using list decision variables")]
    34   [StorableClass]
     34  [StorableType("BBB27FAA-DCFD-4DB4-A465-4A02E1A0EDA9")]
    3535  [Creatable(CreatableAttribute.Categories.Algorithms)]
    3636  public sealed class GQAPListSolver : ContextAlgorithm<LocalSolverContext, IntegerVectorEncoding> {
    … …  
    5555
    5656    [StorableConstructor]
    57     private GQAPListSolver(bool deserializing) : base(deserializing) { }
     57    private GQAPListSolver(StorableConstructorFlag _) : base(_) { }
    5858    private GQAPListSolver(GQAPListSolver original, Cloner cloner)
    5959    : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/LocalSolverNet/LocalSolverContext.cs

    r15700 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    2727namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.LocalSolverNet {
    2828  [Item("LocalSolver Context", "A context for CPLEX solvers.")]
    29   [StorableClass]
     29  [StorableType("DAE4D0C7-AFE1-4FCF-9DD5-899E4DC4FD9E")]
    3030  public class LocalSolverContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3131
    … …  
    4545
    4646    [StorableConstructor]
    47     protected LocalSolverContext(bool deserializing) : base(deserializing) { }
     47    protected LocalSolverContext(StorableConstructorFlag _) : base(_) { }
    4848    protected LocalSolverContext(LocalSolverContext original, Cloner cloner)
    4949      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/RandomSearch/RandomSearch.cs

    r15703 r16728  
    2222using System;
    2323using System.Threading;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    … …  
    2728using HeuristicLab.Encodings.IntegerVectorEncoding;
    2829using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3030
    3131namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.RandomSearch {
    3232  [Item("Random Search (GQAP)", "Random search for the GQAP.")]
    3333  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms)]
    34   [StorableClass]
     34  [StorableType("D6ED1A84-BBCD-4163-96A7-47F3DCACBE49")]
    3535  public sealed class RandomSearch : StochasticAlgorithm<RandomSearchContext, IntegerVectorEncoding> {
    3636
    … …  
    4949
    5050    [StorableConstructor]
    51     private RandomSearch(bool deserializing) : base(deserializing) { }
     51    private RandomSearch(StorableConstructorFlag _) : base(_) { }
    5252    private RandomSearch(RandomSearch original, Cloner cloner)
    5353      : base(original, cloner) {

  • branches/1614_GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/RandomSearch/RandomSearchContext.cs

    r15698 r16728  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Parameters;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2626
    2727namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.RandomSearch {
    2828  [Item("Random Search Context", "Context for random search algorithms.")]
    29   [StorableClass]
     29  [StorableType("49827D3F-3668-44C8-888B-5F5EB6769652")]
    3030  public sealed class RandomSearchContext : SingleSolutionContext<ISingleObjectiveSolutionScope<GQAPSolution>> {
    3131    [Storable]
    … …  
    4444   
    4545    [StorableConstructor]
    46     private RandomSearchContext(bool deserializing) : base(deserializing) { }
     46    private RandomSearchContext(StorableConstructorFlag _) : base(_) { }
    4747    private RandomSearchContext(RandomSearchContext original, Cloner cloner)
    4848    : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.