Changeset 14167 for trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D
- Timestamp:
- 07/21/16 21:07:27 (8 years ago)
- Location:
- trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/BinUtilizationEvaluator.cs
r14162 r14167 53 53 54 54 for (int i = 0; i < nrOfBins; i++) { 55 totalUsableSpace += solution.Bin Packings[i].BinShape.Volume;56 totalUsedSpace += solution.Bin Packings[i].Items.Sum(kvp => kvp.Value.Volume);55 totalUsableSpace += solution.Bins[i].BinShape.Volume; 56 totalUsedSpace += solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume); 57 57 } 58 58 -
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/PackingRatioEvaluator.cs
r14162 r14167 60 60 const double k = 2; 61 61 for (int i = 0; i < nrOfBins; i++) { 62 double f = solution.Bin Packings[i].Items.Sum(kvp => kvp.Value.Volume);63 double c = solution.Bin Packings[i].BinShape.Volume;62 double f = solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume); 63 double c = solution.Bins[i].BinShape.Volume; 64 64 result += Math.Pow(f / c, k); 65 65 } -
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs
r14162 r14167 53 53 Solution partialSolution, 54 54 ref IList<int> remainingIDs, IList<PackingItem> items) { 55 var bp = new BinPacking2D(partialSolution.Bin Measures);55 var bp = new BinPacking2D(partialSolution.BinShape); 56 56 bp.SlidingBasedPacking(ref remainingIDs, items); 57 57 return bp; -
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs
r14162 r14167 53 53 Solution partialSolution, 54 54 ref IList<int> remainingIDs, IList<PackingItem> items) { 55 var bp = new BinPacking2D(partialSolution.Bin Measures);55 var bp = new BinPacking2D(partialSolution.BinShape); 56 56 bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: false); 57 57 return bp; -
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs
r14162 r14167 47 47 foreach (var sequence in sequenceMatrix) { 48 48 remainingIDs = remainingIDs.Concat(sequence).ToList(); 49 result.Bin Packings.Add(CreatePacking(result, ref remainingIDs, items));49 result.Bins.Add(CreatePacking(result, ref remainingIDs, items)); 50 50 } 51 51 result.UpdateBinPackings(); … … 54 54 var temp = new List<int>(remainingIDs); 55 55 foreach (int id in temp) { 56 foreach (BinPacking2D bp in result.Bin Packings) {56 foreach (BinPacking2D bp in result.Bins) { 57 57 var position = FindPositionForItem(bp, items[id]); 58 58 if (position != null) { … … 66 66 //Put still remaining items in new bins 67 67 while (remainingIDs.Count > 0) { 68 result.Bin Packings.Add(CreatePacking(result, ref remainingIDs, items));68 result.Bins.Add(CreatePacking(result, ref remainingIDs, items)); 69 69 } 70 70 result.UpdateBinPackings(); -
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/BottomLeftPermutationDecoder.cs
r14162 r14167 47 47 var bp = new BinPacking2D(binShape); 48 48 bp.SlidingBasedPacking(ref remainingIDs, items); 49 result.Bin Packings.Add(bp);49 result.Bins.Add(bp); 50 50 } 51 51 result.UpdateBinPackings(); -
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/ExtremePointPermutationDecoder.cs
r14162 r14167 47 47 var bp = new BinPacking2D(binShape); 48 48 bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: false); 49 result.Bin Packings.Add(bp);49 result.Bins.Add(bp); 50 50 } 51 51 result.UpdateBinPackings(); -
trunk/sources/HeuristicLab.Problems.BinPacking/3.3/2D/Solution.cs
r14162 r14167 29 29 [StorableClass] 30 30 public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> { 31 public Solution(PackingShape bin Measures) : this(binMeasures, false, false) { }32 public Solution(PackingShape bin Measures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }31 public Solution(PackingShape binShape) : this(binShape, false, false) { } 32 public Solution(PackingShape binShape, bool useExtremePoints, bool stackingConstraints) : base(binShape, useExtremePoints, stackingConstraints) { } 33 33 [StorableConstructor] 34 34 protected Solution(bool deserializing) : base(deserializing) { }
Note: See TracChangeset
for help on using the changeset viewer.