Changeset 16565 for trunk/HeuristicLab.Operators/3.3/ConditionalBranch.cs

Timestamp:

01/28/19 13:41:42 (6 years ago)

Author:

gkronber

Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Operators/3.3/ConditionalBranch.cs (modified) (4 diffs)

trunk/HeuristicLab.Operators/3.3/ConditionalBranch.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.
@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Operators {
@@ -31 +31 @@
   /// </summary>
   [Item("ConditionalBranch", "A branch of two operators whose executions depend on a boolean condition. If the boolean condition is not present, the false branch is executed.")]
-  [StorableClass]
+  [StorableType("DAE01CA9-CE0C-48BB-BA7B-6BF380B02862")]
   public class ConditionalBranch : SingleSuccessorOperator {
     public LookupParameter<BoolValue> ConditionParameter {
@@ -52 +52 @@
 
     [StorableConstructor]
-    protected ConditionalBranch(bool deserializing) : base(deserializing) { }
+    protected ConditionalBranch(StorableConstructorFlag _) : base(_) { }
     protected ConditionalBranch(ConditionalBranch original, Cloner cloner)
       : base(original, cloner) {