Changeset 14929 for branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding

Timestamp:

05/04/17 19:06:54 (8 years ago)

Author:

gkronber

Message:

#2520 fixed unit tests for new persistence: loading & storing all samples

Location:

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3

Files:

• Interfaces/IPermutationCreator.cs (modified) (2 diffs)
• Interfaces/IPermutationCrossover.cs (modified) (2 diffs)
• Interfaces/IPermutationInversionMoveOperator.cs (modified) (1 diff)
• Interfaces/IPermutationManipulator.cs (modified) (2 diffs)
• Interfaces/IPermutationMoveOperator.cs (modified) (1 diff)
• Interfaces/IPermutationMultiNeighborhoodShakingOperator.cs (modified) (1 diff)
• Interfaces/IPermutationOperator.cs (modified) (2 diffs)
• Interfaces/IPermutationScrambleMoveOperator.cs (modified) (1 diff)
• Interfaces/IPermutationSwap2MoveOperator.cs (modified) (1 diff)
• Interfaces/IPermutationTranslocationMoveOperator.cs (modified) (1 diff)
• PermutationTypes.cs (modified) (2 diffs)
• SimilarityCalculators/HammingSimilarityCalculator.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationCreator.cs

@@ -23 +23 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -28 +29 @@
   /// An interface which represents an operator for creating permutations.
   /// </summary>
+  [StorableType("ff0731f2-e21e-46bc-a8a7-88eb2642308b")]
   public interface IPermutationCreator : IPermutationOperator, ISolutionCreator {
     IValueLookupParameter<IntValue> LengthParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationCrossover.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -27 +28 @@
   /// An interface which represents an operator for crossing permutations.
   /// </summary>
+  [StorableType("eddf4eb4-ce20-4370-a56a-452b8c2c07af")]
   public interface IPermutationCrossover : IPermutationOperator, ICrossover {
     ILookupParameter<ItemArray<Permutation>> ParentsParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationInversionMoveOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [StorableType("a1e47030-b87e-44ab-b880-b9e585232a47")]
   public interface IPermutationInversionMoveOperator : IPermutationMoveOperator {
     ILookupParameter<InversionMove> InversionMoveParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationManipulator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -27 +28 @@
   /// An interface which represents an operator for manipulating solutions.
   /// </summary>
+  [StorableType("7f303722-095a-4e05-b32d-0c5841fd35be")]
   public interface IPermutationManipulator : IPermutationOperator, IManipulator {
     ILookupParameter<Permutation> PermutationParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationMoveOperator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [StorableType("916135e7-6f62-4863-a576-9d8b82f74af3")]
   public interface IPermutationMoveOperator : IPermutationOperator, IMoveOperator {
     ILookupParameter<Permutation> PermutationParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationMultiNeighborhoodShakingOperator.cs

@@ -22 +22 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [StorableType("d17e606e-f38e-4d62-b02f-7ee25ccc0edd")]
   public interface IPermutationMultiNeighborhoodShakingOperator : IMultiNeighborhoodShakingOperator, IPermutationOperator {
     ILookupParameter<Permutation> PermutationParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
@@ -26 +27 @@
   /// An interface which represents an operator dealing with permutations.
   /// </summary>
+  [StorableType("3f03dc6e-f215-43d7-8bd3-6e0a2ba9f095")]
   public interface IPermutationOperator : IOperator { }
 }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationScrambleMoveOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [StorableType("8179e2c6-a43a-4919-9046-f8b88e6e960a")]
   public interface IPermutationScrambleMoveOperator : IPermutationMoveOperator {
     ILookupParameter<ScrambleMove> ScrambleMoveParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationSwap2MoveOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [StorableType("858d37d9-5351-49de-ba6a-b2a1ba358164")]
   public interface IPermutationSwap2MoveOperator : IPermutationMoveOperator {
     ILookupParameter<Swap2Move> Swap2MoveParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/Interfaces/IPermutationTranslocationMoveOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [StorableType("f40c2980-4a09-424c-9ad7-449a12b9df94")]
   public interface IPermutationTranslocationMoveOperator : IPermutationMoveOperator {
     ILookupParameter<TranslocationMove> TranslocationMoveParameter { get; }

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationTypes.cs

@@ -1 @@
-#region License Information
+using HeuristicLab.Persistence;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -21 +22 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [StorableType("c263bb41-17ce-4757-9164-04d83141ac40")]
   public enum PermutationTypes {
     RelativeDirected,

branches/PersistenceReintegration/HeuristicLab.Encodings.PermutationEncoding/3.3/SimilarityCalculators/HammingSimilarityCalculator.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Persistence;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
   [Item("Hamming Similarity Calculator for Permutation", "An operator that performs similarity calculation between two permutation-encoded solutions.")]
+  [StorableType("f60f68af-cb7a-43d2-bd41-c96627c40a56")]
   public sealed class HammingSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     protected override bool IsCommutative { get { return true; } }