Context Navigation

Changeset 14167 for trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D

Timestamp:

07/21/16 21:07:27 (8 years ago)

Author:

gkronber

Message:

#2641:

Location:

trunk/sources/HeuristicLab.Problems.BinPacking/3.3/3D

Files:

-                      r14162
+                      r14167
       for (int i = 0; i < nrOfBins; i++) {
         totalUsableSpace += solution.BinPackings[i].BinShape.Volume;
         totalUsedSpace += solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
+        totalUsableSpace += solution.Bins[i].BinShape.Volume;
+        totalUsedSpace += solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
+      }

-                      r14162
+                      r14167
       const double k = 2;
       for (int i = 0; i < nrOfBins; i++) {
         double f = solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
         double c = solution.BinPackings[i].BinShape.Volume;
+        double f = solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
+        double c = solution.Bins[i].BinShape.Volume;
         result += Math.Pow(f / c, k);
+      }

r14162	r14167
60	60	Solution partialSolution,
61	61	ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
62		var bp = new BinPacking3D(partialSolution.Bin~~Measures~~);
	62	var bp = new BinPacking3D(partialSolution.BinShape);
63	63	bp.SlidingBasedPacking(ref remainingIDs, items);
64	64	return bp;

r14162	r14167
53	53	Solution partialSolution,
54	54	ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
55		var bp = new BinPacking3D(partialSolution.Bin~~Measures~~);
	55	var bp = new BinPacking3D(partialSolution.BinShape);
56	56	bp.ExtremePointBasedPacking(ref remainingIDs, items, useStackingConstraints);
57	57	return bp;

-                      r14162
+                      r14167
       foreach (var sequence in sequenceMatrix) {
         remainingIDs = remainingIDs.Concat(sequence).ToList();
         result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+      }
       result.UpdateBinPackings();
 …
       var temp = new List<int>(remainingIDs);
       foreach (int id in temp) {
         foreach (BinPacking3D bp in result.BinPackings) {
+        foreach (BinPacking3D bp in result.Bins) {
           var position = FindPositionForItem(bp, items[id], useStackingConstraints);
           if (position != null) {
 …
       //Put still remaining items in new bins
       while (remainingIDs.Count > 0) {
         result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
+      }
       result.UpdateBinPackings();

r14162	r14167
35	35	[Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 330)]
36	36	public sealed class IntegerVectorProblem : ProblemBase<IntegerVectorEncoding, IntegerVector> {
37		~~// persistence~~
38	37	[StorableConstructor]
39	38	private IntegerVectorProblem(bool deserializing) : base(deserializing) { }

r14162	r14167
47	47	var bp = new BinPacking3D(binShape);
48	48	bp.SlidingBasedPacking(ref remainingIDs, items);
49		result.Bin~~Packing~~s.Add(bp);
	49	result.Bins.Add(bp);
50	50	}
51	51	result.UpdateBinPackings();

r14162	r14167
47	47	var bp = new BinPacking3D(binShape);
48	48	bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: useStackingConstraints);
49		result.Bin~~Packing~~s.Add(bp);
	49	result.Bins.Add(bp);
50	50	}
51	51	result.UpdateBinPackings();

r14162	r14167
34	34	[Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 320)]
35	35	public sealed class PermutationProblem : ProblemBase<PermutationEncoding, Permutation> {
36		~~// persistence~~
37	36	[StorableConstructor]
38	37	private PermutationProblem(bool deserializing) : base(deserializing) { }

-                      r14162
+                      r14167
   [StorableClass]
   public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> {
     public Solution(PackingShape binMeasures) : this(binMeasures, false, false) { }
     public Solution(PackingShape binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
+    public Solution(PackingShape binShape) : this(binShape, false, false) { }
+    public Solution(PackingShape binShape, bool useExtremePoints, bool stackingConstraints) : base(binShape, useExtremePoints, stackingConstraints) { }
     [StorableConstructor]
     protected Solution(bool deserializing) : base(deserializing) { }

Note: See TracChangeset for help on using the changeset viewer.