Changeset 16565 for trunk/HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.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.Problems.BinPacking (modified) (1 prop)
• HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs (modified) (3 diffs)

trunk/HeuristicLab.Problems.BinPacking/3.3/2D/BinPacking2D.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Common;
@@ -29 +29 @@
 namespace HeuristicLab.Problems.BinPacking2D {
   [Item("BinPacking2D", "Represents a single-bin packing for a 2D bin-packing problem.")]
-  [StorableClass]
+  [StorableType("8B9C6AB0-ED65-4868-B1DF-09BD1F49309A")]
   public class BinPacking2D : BinPacking.BinPacking<PackingPosition, PackingShape, PackingItem> {
 
@@ -39 +39 @@
 
     [StorableConstructor]
-    protected BinPacking2D(bool deserializing) : base(deserializing) { }
+    protected BinPacking2D(StorableConstructorFlag _) : base(_) { }
     protected BinPacking2D(BinPacking2D original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {