Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/28/18 16:10:48 (5 years ago)
Author:
jkarder
Message:

#2520: worked on reintegration of new persistence

  • added nuget references to HEAL.Fossil
  • added StorableType attributes to many classes
  • changed signature of StorableConstructors
  • removed some classes in old persistence
  • removed some unnecessary usings
Location:
branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.Orienteering {
    33   [StorableClass]
     33  [StorableType("6E07CAD7-20ED-4507-B2BB-B7393D9BBB95")]
    3434  public sealed class BestOrienteeringSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
    3535    public bool EnabledByDefault {
    … …  
    7979
    8080    [StorableConstructor]
    81     private BestOrienteeringSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     81    private BestOrienteeringSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    8282    private BestOrienteeringSolutionAnalyzer(BestOrienteeringSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    8383    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs

    r16453 r16462  
    2727using HeuristicLab.Encodings.IntegerVectorEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.Orienteering {
    … …  
    3939  /// </summary>
    4040  [Item("GreedyOrienteeringTourCreator", @"Implements the solution creation procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
    41   [StorableClass]
     41  [StorableType("FB68525D-DD53-4BE7-A6B4-EC54E6FD0E64")]
    4242  public sealed class GreedyOrienteeringTourCreator : IntegerVectorCreator, IOrienteeringSolutionCreator {
    4343    public override bool CanChangeName { get { return false; } }
    … …  
    6565
    6666    [StorableConstructor]
    67     private GreedyOrienteeringTourCreator(bool deserializing)
    68       : base(deserializing) { }
     67    private GreedyOrienteeringTourCreator(StorableConstructorFlag _) : base(_) { }
    6968    private GreedyOrienteeringTourCreator(GreedyOrienteeringTourCreator original, Cloner cloner)
    7069      : base(original, cloner) { }

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs

    r16453 r16462  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.Orienteering {
    … …  
    3232  /// </summary>
    3333  [Item("DistanceMatrix", "Represents a distance matrix of a Orienteering Problem.")]
    34   [StorableClass]
     34  [StorableType("8318D250-3F2D-4A4D-9833-AB4EA453A3A4")]
    3535  public sealed class DistanceMatrix : DoubleMatrix {
    3636    [StorableConstructor]
    37     private DistanceMatrix(bool deserializing) : base(deserializing) { }
     37    private DistanceMatrix(StorableConstructorFlag _) : base(_) { }
    3838    private DistanceMatrix(DistanceMatrix original, Cloner cloner) {
    3939      throw new NotSupportedException("Distance matrices cannot be cloned.");

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs

    r16453 r16462  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.Orienteering {
    3232  [Item("OrienteeringEvaluator", "Operator to evaluate a solution to the orienteering problem.")]
    33   [StorableClass]
     33  [StorableType("ACAC24FD-9FBC-4722-BFB0-21BFEF02C2D1")]
    3434  public class OrienteeringEvaluator : InstrumentedOperator, IOrienteeringEvaluator {
    3535
    … …  
    6262
    6363    [StorableConstructor]
    64     protected OrienteeringEvaluator(bool deserializing)
    65       : base(deserializing) {
     64    protected OrienteeringEvaluator(StorableConstructorFlag _) : base(_) {
    6665    }
    6766    protected OrienteeringEvaluator(OrienteeringEvaluator original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

    r16454 r16462  
    8686      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    8787    </Reference>
    88     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     88    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    8989      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    9090    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.Orienteering {
    … …  
    3838  /// </summary>
    3939  [Item("OrienteeringLocalImprovementOperator", @"Implements the iterative improvement procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
    40   [StorableClass]
     40  [StorableType("92FA69B3-F243-4D12-A67A-AA1D7EBCD302")]
    4141  public sealed class OrienteeringLocalImprovementOperator : SingleSuccessorOperator, ILocalImprovementOperator {
    4242
    … …  
    8989
    9090    [StorableConstructor]
    91     private OrienteeringLocalImprovementOperator(bool deserializing) : base(deserializing) { }
     91    private OrienteeringLocalImprovementOperator(StorableConstructorFlag _) : base(_) { }
    9292    private OrienteeringLocalImprovementOperator(OrienteeringLocalImprovementOperator original, Cloner cloner)
    9393      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

    r16453 r16462  
    3131using HeuristicLab.Optimization.Operators;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Fossil;
    3434using HeuristicLab.Problems.Instances;
    3535using HeuristicLab.Problems.Instances.Types;
    … …  
    3838  [Item("Orienteering Problem (OP)", "Represents a single-objective Orienteering Problem.")]
    3939  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 115)]
    40   [StorableClass]
     40  [StorableType("0B8DB4A4-F183-4368-86C6-C51289B183D2")]
    4141  public sealed class OrienteeringProblem
    4242    : SingleObjectiveHeuristicOptimizationProblem<IOrienteeringEvaluator, IOrienteeringSolutionCreator>,
    … …  
    113113
    114114    [StorableConstructor]
    115     private OrienteeringProblem(bool deserializing)
    116       : base(deserializing) {
     115    private OrienteeringProblem(StorableConstructorFlag _) : base(_) {
    117116    }
    118117    private OrienteeringProblem(OrienteeringProblem original, Cloner cloner)

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs

    r16453 r16462  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.IntegerVectorEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.Orienteering {
    3131  [Item("OrienteeringSolution", "Represents a Orienteering solution which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("BC58ED08-B9A7-40F3-B8E0-A6B33AA993F4")]
    3333  public sealed class OrienteeringSolution : Item {
    3434    public static new Image StaticItemImage {
    … …  
    142142
    143143    [StorableConstructor]
    144     private OrienteeringSolution(bool deserializing)
    145       : base(deserializing) { }
     144    private OrienteeringSolution(StorableConstructorFlag _) : base(_) { }
    146145    private OrienteeringSolution(OrienteeringSolution original, Cloner cloner)
    147146      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.Orienteering {
    … …  
    4848  /// </summary>
    4949  [Item("OrienteeringShakingOperator", @"Implements the shaking procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
    50   [StorableClass]
     50  [StorableType("D6654BD1-63CD-4057-89C8-36D1EE6EA7DF")]
    5151  public sealed class OrienteeringShakingOperator : SingleSuccessorOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {
    5252
    … …  
    8989
    9090    [StorableConstructor]
    91     private OrienteeringShakingOperator(bool deserializing) : base(deserializing) { }
     91    private OrienteeringShakingOperator(StorableConstructorFlag _) : base(_) { }
    9292    private OrienteeringShakingOperator(OrienteeringShakingOperator original, Cloner cloner)
    9393      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.