Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.LocalSearch

Timestamp:

12/28/18 16:10:48 (6 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.Algorithms.LocalSearch/3.3

Files:

• HeuristicLab.Algorithms.LocalSearch-3.3.csproj (modified) (1 diff)
• LocalSearch.cs (modified) (3 diffs)
• LocalSearchImprovementOperator.cs (modified) (3 diffs)
• LocalSearchMainLoop.cs (modified) (3 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLab.Algorithms.LocalSearch-3.3.csproj

@@ -102 +102 @@
       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
     </Reference>

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs

@@ -31 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Random;
 
@@ -37 +37 @@
   [Item("Local Search (LS)", "A local search algorithm.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 100)]
-  [StorableClass]
+  [StorableType("399F7E6A-4111-4F91-BB99-EFE721789E27")]
   public sealed class LocalSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -125 +125 @@
 
     [StorableConstructor]
-    private LocalSearch(bool deserializing) : base(deserializing) { }
+    private LocalSearch(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs

@@ -30 +30 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Algorithms.LocalSearch {
@@ -37 +37 @@
   /// </summary>
   [Item("LocalSearchImprovementOperator", "A local search improvement operator.")]
-  [StorableClass]
+  [StorableType("40424217-DBA8-4787-A38A-2AE7130CB69D")]
   public sealed class LocalSearchImprovementOperator : SingleSuccessorOperator, ILocalImprovementAlgorithmOperator, IStochasticOperator, ISingleObjectiveOperator {
     #region IGenericLocalImprovementOperator Properties
@@ -118 +118 @@
 
     [StorableConstructor]
-    private LocalSearchImprovementOperator(bool deserializing) : base(deserializing) { }
+    private LocalSearchImprovementOperator(StorableConstructorFlag _) : base(_) { }
     private LocalSearchImprovementOperator(LocalSearchImprovementOperator original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

@@ -26 +26 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Selection;
 
@@ -34 +34 @@
   /// </summary>
   [Item("LocalSearchMainLoop", "An operator which represents the main loop of a best improvement local search (if only a single move is generated in each iteration it is a first improvement local search).")]
-  [StorableClass]
+  [StorableType("629DEE28-5E94-44C2-AFDA-83F7F0128091")]
   public sealed class LocalSearchMainLoop : AlgorithmOperator {
     #region Parameter properties
@@ -82 +82 @@
 
     [StorableConstructor]
-    private LocalSearchMainLoop(bool deserializing) : base(deserializing) { }
+    private LocalSearchMainLoop(StorableConstructorFlag _) : base(_) { }
     public LocalSearchMainLoop()
       : base() {