Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders

Timestamp:

03/31/19 14:40:15 (6 years ago)

Author:

abeham

Message:

#1614: updated to new persistence and .NET 4.6.1

• merged changes in #3000
• merged changes in #2936

Location:

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders

Files:

• KNearestNeighborRecommender.cs (modified) (3 diffs)
• OverallBestRecommender.cs (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/KNearestNeighborRecommender.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -25 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System.Linq;
 
 namespace HeuristicLab.OptimizationExpertSystem.Common {
   [Item("K-Nearest Neighbor Recommender", "")]
-  [StorableClass]
+  [StorableType("E791B8DE-10C6-4363-909D-09DB1780254D")]
   public sealed class KNearestNeighborRecommender : ParameterizedNamedItem, IAlgorithmInstanceRecommender {
     
@@ -43 +43 @@
 
     [StorableConstructor]
-    private KNearestNeighborRecommender(bool deserializing) : base(deserializing) { }
+    private KNearestNeighborRecommender(StorableConstructorFlag _) : base(_) { }
     private KNearestNeighborRecommender(KNearestNeighborRecommender original, Cloner cloner) : base(original, cloner) { }
     public KNearestNeighborRecommender() {

branches/1614_GeneralizedQAP/HeuristicLab.OptimizationExpertSystem.Common/3.3/Recommenders/OverallBestRecommender.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -25 +29 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace HeuristicLab.OptimizationExpertSystem.Common {
   [Item("Overall Best Recommender", "")]
-  [StorableClass]
+  [StorableType("C9DFC50D-6637-4238-B7F1-5D434A16815E")]
   public class OverallBestRecommender : ParameterizedNamedItem, IAlgorithmInstanceRecommender {
 
@@ -40 +40 @@
     
     [StorableConstructor]
-    private OverallBestRecommender(bool deserializing) : base(deserializing) { }
+    private OverallBestRecommender(StorableConstructorFlag _) : base(_) { }
     private OverallBestRecommender(OverallBestRecommender original, Cloner cloner) : base(original, cloner) { }
     public OverallBestRecommender() { }