Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.BinPacking/3.3/Interfaces

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.BinPacking (modified) (1 prop)
• HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingItem.cs (modified) (3 diffs)
• HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingPosition.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingShape.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingItem.cs

@@ -1 @@
-#region License Information
+using HEAL.Attic;
+#region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2018 Joseph Helm and Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -21 +22 @@
 
 namespace HeuristicLab.Problems.BinPacking {
+  [StorableType("a0f46e8d-d18f-43c4-8b7d-66db0659b230")]
   // a packing item is one of the items that needs to be located in one of the packing bins (containers)
   public interface IPackingItem : IPackingShape {
@@ -30 +32 @@
     /// <param name="other"></param>
     /// <returns></returns>
-    bool SupportsStacking (IPackingItem other);
+    bool SupportsStacking(IPackingItem other);
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingPosition.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.BinPacking {
-  
+  [StorableType("a8003c2d-a48d-41b3-9f83-1d00f49ea434")]
   public interface IPackingPosition : IItem {
     int AssignedBin { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingShape.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.BinPacking {
+  [StorableType("612b4eb0-946e-4690-ba43-8dd0e5520e8b")]
   // a packing shape represents a physical object of correct dimension (2d or 3d) 
   // packing bins (containers) and packing items are both packing shapes