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.QuadraticAssignment/3.3
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/BestQAPSolutionAnalyzer.cs

    r16453 r16462  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Fossil;
    3131
    3232namespace HeuristicLab.Problems.QuadraticAssignment {
    … …  
    3535  /// </summary>
    3636  [Item("BestQAPSolutionAnalyzer", "An operator for analyzing the best solution of Quadratic Assignment Problems.")]
    37   [StorableClass]
     37  [StorableType("A133BED6-EF96-4735-B122-120BD8831A47")]
    3838  public sealed class BestQAPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
    3939    public bool EnabledByDefault {
    … …  
    7373
    7474    [StorableConstructor]
    75     private BestQAPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     75    private BestQAPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
    7676    private BestQAPSolutionAnalyzer(BestQAPSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
    7777    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/QAPAlleleFrequencyAnalyzer.cs

    r16453 r16462  
    2727using HeuristicLab.Encodings.PermutationEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030
    3131namespace HeuristicLab.Problems.QuadraticAssignment {
    … …  
    3434  /// </summary>
    3535  [Item("QAPAlleleFrequencyAnalyzer", "An operator for analyzing the frequency of alleles in solutions of Quadratic Assignment Problems.")]
    36   [StorableClass]
     36  [StorableType("490E5FD6-A269-4F5F-AC07-12056CDFFC7F")]
    3737  public sealed class QAPAlleleFrequencyAnalyzer : AlleleFrequencyAnalyzer<Permutation> {
    3838    public LookupParameter<DoubleMatrix> WeightsParameter {
    … …  
    4444
    4545    [StorableConstructor]
    46     private QAPAlleleFrequencyAnalyzer(bool deserializing) : base(deserializing) { }
     46    private QAPAlleleFrequencyAnalyzer(StorableConstructorFlag _) : base(_) { }
    4747    private QAPAlleleFrequencyAnalyzer(QAPAlleleFrequencyAnalyzer original, Cloner cloner) : base(original, cloner) { }
    4848    public QAPAlleleFrequencyAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/QAPPopulationDiversityAnalyzer.cs

    r16453 r16462  
    2727using HeuristicLab.Encodings.PermutationEncoding;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Fossil;
    3030using HeuristicLab.PluginInfrastructure;
    3131
    … …  
    3535  /// </summary>
    3636  [Item("QAPPopulationDiversityAnalyzer", "An operator for analyzing the diversity of solutions of Quadratic Assignment Problems regarding their structural identity (number of equal facilty->location assignments).")]
    37   [StorableClass]
     37  [StorableType("255DFAD4-14E4-4CFB-905F-BA521815F593")]
    3838  [Obsolete("Use the PopulationSimilarityAnalyzer in the HeuristicLab.Analysis plugin instead.")]
    3939  [NonDiscoverableType]
    … …  
    5252
    5353    [StorableConstructor]
    54     private QAPPopulationDiversityAnalyzer(bool deserializing) : base(deserializing) { }
     54    private QAPPopulationDiversityAnalyzer(StorableConstructorFlag _) : base(_) { }
    5555    private QAPPopulationDiversityAnalyzer(QAPPopulationDiversityAnalyzer original, Cloner cloner) : base(original, cloner) { }
    5656    public QAPPopulationDiversityAnalyzer()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    31   [StorableClass]
     31  [StorableType("8B15F5F0-4C42-4143-B7F5-2462C78BC49C")]
    3232  public class QAPEvaluator : InstrumentedOperator, IQAPEvaluator {
    3333
    … …  
    4646
    4747    [StorableConstructor]
    48     protected QAPEvaluator(bool deserializing) : base(deserializing) { }
     48    protected QAPEvaluator(StorableConstructorFlag _) : base(_) { }
    4949    protected QAPEvaluator(QAPEvaluator original, Cloner cloner) : base(original, cloner) { }
    5050    public QAPEvaluator() {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPInversionMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPInversionMoveEvaluator", "Evaluated an inversion move on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("56ED50D5-FF78-4F9D-82B5-89F594353ADD")]
    3333  public class QAPInversionMoveEvaluator : QAPMoveEvaluator, IPermutationInversionMoveOperator {
    3434    public ILookupParameter<InversionMove> InversionMoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected QAPInversionMoveEvaluator(bool deserializing) : base(deserializing) { }
     39    protected QAPInversionMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    protected QAPInversionMoveEvaluator(QAPInversionMoveEvaluator original, Cloner cloner)
    4141      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    … …  
    3333  /// </summary>
    3434  [Item("QAPMoveEvaluator", "A base class for operators which evaluate moves.")]
    35   [StorableClass]
     35  [StorableType("71C3A4D8-F5BB-4539-AD28-B969D7F0D879")]
    3636  public abstract class QAPMoveEvaluator : SingleSuccessorOperator, IQAPMoveEvaluator {
    3737
    … …  
    5757
    5858    [StorableConstructor]
    59     protected QAPMoveEvaluator(bool deserializing) : base(deserializing) { }
     59    protected QAPMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    6060    protected QAPMoveEvaluator(QAPMoveEvaluator original, Cloner cloner) : base(original, cloner) { }
    6161    protected QAPMoveEvaluator()

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPScrambleMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPScrambleMoveEvaluator", "Evaluated a scramble move on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("E5D1B682-6ADA-4DEE-8546-6C5BCE1C91D0")]
    3333  public class QAPScrambleMoveEvaluator : QAPMoveEvaluator, IPermutationScrambleMoveOperator {
    3434    public ILookupParameter<ScrambleMove> ScrambleMoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected QAPScrambleMoveEvaluator(bool deserializing) : base(deserializing) { }
     39    protected QAPScrambleMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    protected QAPScrambleMoveEvaluator(QAPScrambleMoveEvaluator original, Cloner cloner)
    4141      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPSwap2MoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPSwap2MoveEvaluator", "Evaluated a swap-2 move on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("7BB50BA8-2690-4752-B129-91A520DB5829")]
    3333  public class QAPSwap2MoveEvaluator : QAPMoveEvaluator, IPermutationSwap2MoveOperator {
    3434    public ILookupParameter<Swap2Move> Swap2MoveParameter {
    … …  
    3737
    3838    [StorableConstructor]
    39     protected QAPSwap2MoveEvaluator(bool deserializing) : base(deserializing) { }
     39    protected QAPSwap2MoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4040    protected QAPSwap2MoveEvaluator(QAPSwap2MoveEvaluator original, Cloner cloner)
    4141      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/Evaluators/QAPTranslocationMoveEvaluator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    3131  [Item("QAPTranslocationMoveEvaluator", "Evaluates translocation moves on a QAP solution.")]
    32   [StorableClass]
     32  [StorableType("0B1B33E0-7F88-485C-8E00-79FBB266CE4E")]
    3333  public class QAPTranslocationMoveEvaluator : QAPMoveEvaluator, IPermutationTranslocationMoveOperator {
    3434
    … …  
    3838
    3939    [StorableConstructor]
    40     protected QAPTranslocationMoveEvaluator(bool deserializing) : base(deserializing) { }
     40    protected QAPTranslocationMoveEvaluator(StorableConstructorFlag _) : base(_) { }
    4141    protected QAPTranslocationMoveEvaluator(QAPTranslocationMoveEvaluator original, Cloner cloner)
    4242      : base(original, cloner) {

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

    r16454 r16462  
    112112      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
    113113    </Reference>
    114     <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
     114    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    115115      <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
    116116    </Reference>

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPExhaustiveInsertionLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.QuadraticAssignment {
    3434  [Item("QAPExhaustiveInsertionLocalImprovement", "Takes a solution and finds the local optimum with respect to the insertion neighborhood by decending along the steepest gradient.")]
    35   [StorableClass]
     35  [StorableType("9E024205-A638-4671-B212-511E941B5992")]
    3636  public class QAPExhaustiveInsertionLocalImprovement : SingleSuccessorOperator, ILocalImprovementOperator, ISingleObjectiveOperator {
    3737
    … …  
    7373
    7474    [StorableConstructor]
    75     protected QAPExhaustiveInsertionLocalImprovement(bool deserializing) : base(deserializing) { }
     75    protected QAPExhaustiveInsertionLocalImprovement(StorableConstructorFlag _) : base(_) { }
    7676    protected QAPExhaustiveInsertionLocalImprovement(QAPExhaustiveInsertionLocalImprovement original, Cloner cloner)
    7777      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPExhaustiveInversionLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.QuadraticAssignment {
    3434  [Item("QAPExhaustiveInversionLocalImprovement", "Takes a solution and finds the local optimum with respect to the inversion neighborhood by decending along the steepest gradient.")]
    35   [StorableClass]
     35  [StorableType("7A0F7835-87A6-4C3E-BEE2-E1BA6F67972B")]
    3636  public class QAPExhaustiveInversionLocalImprovement : SingleSuccessorOperator, ILocalImprovementOperator, ISingleObjectiveOperator {
    3737
    … …  
    7373
    7474    [StorableConstructor]
    75     protected QAPExhaustiveInversionLocalImprovement(bool deserializing) : base(deserializing) { }
     75    protected QAPExhaustiveInversionLocalImprovement(StorableConstructorFlag _) : base(_) { }
    7676    protected QAPExhaustiveInversionLocalImprovement(QAPExhaustiveInversionLocalImprovement original, Cloner cloner)
    7777      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPExhaustiveSwap2LocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.QuadraticAssignment {
    3434  [Item("QAPExhaustiveSwap2LocalImprovement", "Takes a solution and finds the local optimum with respect to the swap2 neighborhood by decending along the steepest gradient.")]
    35   [StorableClass]
     35  [StorableType("AD82A71D-773A-4CD2-841F-755840656E92")]
    3636  public class QAPExhaustiveSwap2LocalImprovement : SingleSuccessorOperator, ILocalImprovementOperator, ISingleObjectiveOperator {
    3737
    … …  
    7777
    7878    [StorableConstructor]
    79     protected QAPExhaustiveSwap2LocalImprovement(bool deserializing) : base(deserializing) { }
     79    protected QAPExhaustiveSwap2LocalImprovement(StorableConstructorFlag _) : base(_) { }
    8080    protected QAPExhaustiveSwap2LocalImprovement(QAPExhaustiveSwap2LocalImprovement original, Cloner cloner)
    8181      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPStochasticScrambleLocalImprovement.cs

    r16453 r16462  
    2929using HeuristicLab.Optimization;
    3030using HeuristicLab.Parameters;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HEAL.Fossil;
    3232
    3333namespace HeuristicLab.Problems.QuadraticAssignment {
    3434  [Item("QAPStochasticScrambleLocalImprovement", "Takes a solution and finds the local optimum with respect to the scramble neighborhood by decending along the steepest gradient.")]
    35   [StorableClass]
     35  [StorableType("045B5151-E5DC-4AF3-8CAD-E160E0EE17FF")]
    3636  public class QAPStochasticScrambleLocalImprovement : SingleSuccessorOperator, ILocalImprovementOperator, IStochasticOperator, ISingleObjectiveOperator {
    3737
    … …  
    8181
    8282    [StorableConstructor]
    83     protected QAPStochasticScrambleLocalImprovement(bool deserializing) : base(deserializing) { }
     83    protected QAPStochasticScrambleLocalImprovement(StorableConstructorFlag _) : base(_) { }
    8484    protected QAPStochasticScrambleLocalImprovement(QAPStochasticScrambleLocalImprovement original, Cloner cloner)
    8585      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/QAPAssignment.cs

    r16453 r16462  
    2525using HeuristicLab.Data;
    2626using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Fossil;
    2828
    2929namespace HeuristicLab.Problems.QuadraticAssignment {
    3030  [Item("QAP Assignment", "Represents a solution to the QAP.")]
    31   [StorableClass]
     31  [StorableType("7ED6596B-3179-4CE5-8132-498735E536F7")]
    3232  public sealed class QAPAssignment : Item, INotifyPropertyChanged {
    3333
    … …  
    7777
    7878    [StorableConstructor]
    79     private QAPAssignment(bool deserializing) : base(deserializing) { }
     79    private QAPAssignment(StorableConstructorFlag _) : base(_) { }
    8080    private QAPAssignment(QAPAssignment original, Cloner cloner)
    8181      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/QAPSimilarityCalculator.cs

    r16453 r16462  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Optimization.Operators;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Fossil;
    2929
    3030namespace HeuristicLab.Problems.QuadraticAssignment {
    … …  
    3636  /// </remarks>
    3737  [Item("QAPSimilarityCalculator", "An operator that performs similarity calculation between two quadratic assignment solutions. The operator calculates the similarity based on the number of edges the two solutions have in common.")]
    38   [StorableClass]
     38  [StorableType("23D76028-3E59-4E77-959A-D4A1BFB59864")]
    3939  public sealed class QAPSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
    4040    protected override bool IsCommutative { get { return true; } }
    … …  
    4545    public DoubleMatrix Distances { get; set; }
    4646
    47     private QAPSimilarityCalculator(bool deserializing) : base(deserializing) { }
     47    [StorableConstructor]
     48    private QAPSimilarityCalculator(StorableConstructorFlag _) : base(_) { }
    4849    private QAPSimilarityCalculator(QAPSimilarityCalculator original, Cloner cloner)
    4950      : base(original, cloner) {

  • branches/2520_PersistenceReintegration/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

    r16453 r16462  
    3232using HeuristicLab.Optimization.Operators;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Fossil;
    3535using HeuristicLab.PluginInfrastructure;
    3636using HeuristicLab.Problems.Instances;
    … …  
    3939  [Item("Quadratic Assignment Problem (QAP)", "The Quadratic Assignment Problem (QAP) can be described as the problem of assigning N facilities to N fixed locations such that there is exactly one facility in each location and that the sum of the distances multiplied by the connection strength between the facilities becomes minimal.")]
    4040  [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 140)]
    41   [StorableClass]
     41  [StorableType("A86B1F49-D8E6-45E4-8EFB-8F5CCA2F9DC7")]
    4242  public sealed class QuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IQAPEvaluator, IPermutationCreator>, IStorableContent,
    4343    IProblemInstanceConsumer<QAPData>,
    … …  
    110110
    111111    [StorableConstructor]
    112     private QuadraticAssignmentProblem(bool deserializing) : base(deserializing) { }
     112    private QuadraticAssignmentProblem(StorableConstructorFlag _) : base(_) { }
    113113    private QuadraticAssignmentProblem(QuadraticAssignmentProblem original, Cloner cloner)
    114114      : base(original, cloner) {
Note: See TracChangeset for help on using the changeset viewer.