Changeset 13612

Timestamp:

02/08/16 21:38:13 (9 years ago)

Author:

gkronber

Message:

#1966: refactoring: core compiles

Location:

branches/HeuristicLab.BinPacking

Files:

• HeuristicLab.Problems.BinPacking.2D/3.3/BinPacking2D.cs (modified) (7 diffs)
• HeuristicLab.Problems.BinPacking.3D/3.3/BinPacking3D.cs (modified) (1 diff)
• HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs (modified) (1 diff)

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

@@ -37 +37 @@
     public BinPacking2D(RectangularPackingBin binMeasures)
       : base(binMeasures) {
-      //ExtremePoints = new HashSet<TwoDimensionalPacking>();
       ExtremePoints = new SortedSet<TwoDimensionalPacking>(new EPComparer2D());
       ExtremePoints.Add(binMeasures.Origin);
@@ -50 +49 @@
       return new BinPacking2D(this, cloner);
     }
-                      
+
     protected override void GenerateNewExtremePointsForNewItem(RectangularPackingItem newItem, TwoDimensionalPacking position) {
 
@@ -73 +72 @@
       if (sourcePointY.X < BinMeasures.Width && sourcePointY.Y < BinMeasures.Height) {
         //Traversing down the x-axis  
-        while (sourcePointY.X > 0 && !IsPointOccupied(new TwoDimensionalPacking (0,sourcePointY.X - 1, sourcePointY.Y))) {
+        while (sourcePointY.X > 0 && !IsPointOccupied(new TwoDimensionalPacking(0, sourcePointY.X - 1, sourcePointY.Y))) {
           sourcePointY.X--;
         }
@@ -111 +110 @@
         || IsPositionFeasible(measures, TwoDimensionalPacking.MoveDown(currentPosition))) {
         //Slide the item as far as possible to the bottom
-          while (IsPositionFeasible(measures, TwoDimensionalPacking.MoveDown(currentPosition))) {
-            currentPosition = TwoDimensionalPacking.MoveDown(currentPosition);
-        }
-          if (IsPositionFeasible(measures, TwoDimensionalPacking.MoveLeft(currentPosition)))
+        while (IsPositionFeasible(measures, TwoDimensionalPacking.MoveDown(currentPosition))) {
+          currentPosition = TwoDimensionalPacking.MoveDown(currentPosition);
+        }
+        if (IsPositionFeasible(measures, TwoDimensionalPacking.MoveLeft(currentPosition)))
           currentPosition = TwoDimensionalPacking.MoveLeft(currentPosition);
       }
@@ -120 +119 @@
       return IsPositionFeasible(measures, currentPosition) ? currentPosition : null;
     }
-    
+
     public override void SlidingBasedPacking(ref List<int> sequence, ItemList<RectangularPackingItem> itemMeasures) {
       var temp = new List<int>(sequence);
@@ -193 +192 @@
 
     protected override void InitializeOccupationLayers() {
-      for (int i = 0; i*10 <= BinMeasures.Width; i += 1 ) {
+      for (int i = 0; i * 10 <= BinMeasures.Width; i += 1) {
         OccupationLayers[i] = new List<int>();
       }
@@ -207 +206 @@
       return OccupationLayers[position.X / 10];
     }
-    protected override List<int> GetLayerItemIDs(RectangularPackingItem measures, TwoDimensionalPacking position) { 
-      List<int> result = new List<int> ();
+    protected override List<int> GetLayerItemIDs(RectangularPackingItem measures, TwoDimensionalPacking position) {
+      List<int> result = new List<int>();
       int x1 = position.X / 10;
       int x2 = (position.X + (position.Rotated ? measures.Height : measures.Width)) / 10;

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/BinPacking3D.cs

@@ -36 +36 @@
     public BinPacking3D(CuboidPackingBin binMeasures)
       : base(binMeasures) {
-      //ExtremePoints = new HashSet<ThreeDimensionalPacking>();
       ExtremePoints = new SortedSet<ThreeDimensionalPacking>(new EPComparer3D());
       ExtremePoints.Add(binMeasures.Origin);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj

@@ -173 +173 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.BinPacking.2D\3.3\HeuristicLab.Problems.BinPacking2D-3.3.csproj">
+      <Project>{56dd7f51-3164-4c26-a97a-add6fe4b4e86}</Project>
+      <Name>HeuristicLab.Problems.BinPacking2D-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.BinPacking.3D\3.3\HeuristicLab.Problems.BinPacking3D-3.3.csproj">
+      <Project>{95680c63-1e06-4e66-b33b-272a772321c7}</Project>
+      <Name>HeuristicLab.Problems.BinPacking3D-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.BinPacking\3.3\HeuristicLab.Problems.BinPacking-3.3.csproj">
       <Project>{F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}</Project>

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
-using HeuristicLab.Problems.BinPacking.PackingItem;
-using HeuristicLab.Problems.BinPacking.PackingBin;
-using HeuristicLab.Problems.BinPacking.Dimensions;
 
 namespace HeuristicLab.Problems.BinPacking.Views {