Changeset 17097 for stable/HeuristicLab.Problems.BinPacking/3.3/3D/PackingShape.cs

Timestamp:

07/07/19 23:40:10 (5 years ago)

Author:

mkommend

Message:

#2520: Merged 16565 - 16579 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.BinPacking (modified) (1 prop)
• HeuristicLab.Problems.BinPacking/3.3/3D/PackingShape.cs (modified) (4 diffs)

stable/HeuristicLab.Problems.BinPacking/3.3/3D/PackingShape.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Data;
@@ -30 +30 @@
 namespace HeuristicLab.Problems.BinPacking3D {
   [Item("PackingShape (3d)", "Represents the cuboid measures (width, height, depth) of a three-dimensional cuboidic bin-packing object.")]
-  [StorableClass]
+  [StorableType("87C5DC4E-A7E3-4853-B6C7-690B3F47DB57")]
   public class PackingShape : PackingShape<PackingPosition>, IComparable<PackingShape> {
     public IFixedValueParameter<IntValue> HeightParameter {
@@ -58 +58 @@
 
     [StorableConstructor]
-    protected PackingShape(bool deserializing) : base(deserializing) { }
+    protected PackingShape(StorableConstructorFlag _) : base(_) { }
     protected PackingShape(PackingShape original, Cloner cloner)
       : base(original, cloner) {
@@ -118 +118 @@
       else throw new ArgumentException(string.Format("Cannot compare with object {0}", obj), "obj");
     }
-
     #endregion
 
+    [StorableType(StorableMemberSelection.AllFields, "6dc0b0e2-e165-44e0-a342-71974f0494e3")]
     private struct CuboidDiagonal {
       public int x1;