Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

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.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.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)
  * and the BEACON Center for the Study of Evolution in Action.
  *
@@ -31 +31 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Random;
 
@@ -40 +40 @@
   // and the original source code in C++11 available from: https://github.com/brianwgoldman/Parameter-less_Population_Pyramid
   [Item("Hill Climber (HC)", "Binary Hill Climber.")]
-  [StorableClass]
+  [StorableType("BA349010-6295-406E-8989-B271FB96ED86")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
   public class HillClimber : BasicAlgorithm {
@@ -81 +81 @@
 
     [StorableConstructor]
-    protected HillClimber(bool deserializing) : base(deserializing) { }
+    protected HillClimber(StorableConstructorFlag _) : base(_) { }
     protected HillClimber(HillClimber original, Cloner cloner)
       : base(original, cloner) {