Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (7 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyzer.cs

    r14185 r14927  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.Persistence;
    3131
    3232namespace HeuristicLab.Problems.Orienteering {
    33   [StorableClass]
     33  [StorableType("b5f67155-c4bd-4379-b702-067378edf9be")]
    3434  public sealed class BestOrienteeringSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
    3535    public bool EnabledByDefault {

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs

    r14185 r14927  
    2727using HeuristicLab.Encodings.IntegerVectorEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    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("ed2f1545-f0e1-4d7c-91a3-592ed035ad86")]
    4242  public sealed class GreedyOrienteeringTourCreator : IntegerVectorCreator, IOrienteeringSolutionCreator {
    4343    public override bool CanChangeName { get { return false; } }

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs

    r14185 r14927  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828
    2929namespace HeuristicLab.Problems.Orienteering {
    … …  
    3232  /// </summary>
    3333  [Item("DistanceMatrix", "Represents a distance matrix of a Orienteering Problem.")]
    34   [StorableClass]
     34  [StorableType("780698fd-86b7-4983-8b9b-f35a55aa7e35")]
    3535  public sealed class DistanceMatrix : DoubleMatrix {
    3636    [StorableConstructor]

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs

    r14185 r14927  
    2727using HeuristicLab.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.Persistence;
    3030
    3131namespace HeuristicLab.Problems.Orienteering {
    3232  [Item("OrienteeringEvaluator", "Operator to evaluate a solution to the orienteering problem.")]
    33   [StorableClass]
     33  [StorableType("7631d1b0-b623-48ff-92eb-2fb4b5d78705")]
    3434  public class OrienteeringEvaluator : InstrumentedOperator, IOrienteeringEvaluator {
    3535

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs

    r14185 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    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("f7cb8fed-a966-4c35-bd59-a834921f91fe")]
    4141  public sealed class OrienteeringLocalImprovementOperator : SingleSuccessorOperator, ILocalImprovementOperator {
    4242

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

    r14185 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    3232using HeuristicLab.Problems.Instances;
    3333using HeuristicLab.Problems.Instances.Types;
    … …  
    3636  [Item("Orienteering Problem (OP)", "Represents a single-objective Orienteering Problem.")]
    3737  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 115)]
    38   [StorableClass]
     38  [StorableType("66e0ef3b-4ce4-4457-a69b-d3d7eb6c6d24")]
    3939  public sealed class OrienteeringProblem
    4040    : SingleObjectiveHeuristicOptimizationProblem<IOrienteeringEvaluator, IOrienteeringSolutionCreator>,

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs

    r14185 r14927  
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Encodings.IntegerVectorEncoding;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929
    3030namespace HeuristicLab.Problems.Orienteering {
    3131  [Item("OrienteeringSolution", "Represents a Orienteering solution which can be visualized in the GUI.")]
    32   [StorableClass]
     32  [StorableType("f535a464-60f1-4b2c-b287-eaf72f7c547a")]
    3333  public sealed class OrienteeringSolution : Item {
    3434    public static new Image StaticItemImage {

  • branches/PersistenceReintegration/HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs

    r14185 r14927  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    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("0f624eb9-cdc7-4109-96c6-1a306532ca54")]
    5151  public sealed class OrienteeringShakingOperator : SingleSuccessorOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {
    5252
    … …  
    141141        var visitablePoints = (
    142142          from point in Enumerable.Range(0, numPoints)
    143           // Calculate the distance when going from the starting point to this point and then to the end point
     143            // Calculate the distance when going from the starting point to this point and then to the end point
    144144          let distance = distances[startingPoint, point] + distances[point, terminalPoint] + pointVisitingCosts
    145145          // If this distance is feasible and the point is neither starting nor ending point, check the point
Note: See TracChangeset for help on using the changeset viewer.