Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/PathRelinkers

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.TestFunctions (modified) (1 prop)
• HeuristicLab.Problems.TestFunctions/3.3/PathRelinkers/SingleObjectiveTestFunctionPathRelinker.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/PathRelinkers/SingleObjectiveTestFunctionPathRelinker.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -29 +29 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.TestFunctions {
@@ -40 +40 @@
   /// </remarks>
   [Item("SingleObjectiveTestFunctionPathRelinker", "An operator that relinks paths between test functions solutions. It is based on an implementation described in Duarte, A., Martí, R., and Gortazar, F. (2011). Path Relinking for Large Scale Global Optimization. Soft Computing, Vol. 15.")]
-  [StorableClass]
+  [StorableType("BBDCF6E0-AB7F-4A5B-8BFC-A2D2D1E56D5C")]
   public sealed class SingleObjectiveTestFunctionPathRelinker : SingleObjectivePathRelinker {
     #region Parameter properties
@@ -55 +55 @@
 
     [StorableConstructor]
-    private SingleObjectiveTestFunctionPathRelinker(bool deserializing) : base(deserializing) { }
+    private SingleObjectiveTestFunctionPathRelinker(StorableConstructorFlag _) : base(_) { }
     private SingleObjectiveTestFunctionPathRelinker(SingleObjectiveTestFunctionPathRelinker original, Cloner cloner) : base(original, cloner) { }
     public SingleObjectiveTestFunctionPathRelinker()