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/Infrastructure
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • 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) {
Note: See TracChangeset for help on using the changeset viewer.