- Timestamp:
- 05/04/13 17:51:14 (12 years ago)
- Location:
- branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/2D/BinUtilizationRectangularIdenticalBinEvaluator.cs
r9348 r9440 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Common; 32 using HeuristicLab. Problems.BinPacking.PackingPlans;32 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 33 33 using HeuristicLab.Problems.BinPacking.Dimensions; 34 34 using HeuristicLab.Problems.BinPacking.PackingBin; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/2D/PackingRatioRectangularIdenticalBinEvaluator.cs
r9348 r9440 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Common; 32 using HeuristicLab. Problems.BinPacking.PackingPlans;32 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 33 33 using HeuristicLab.Problems.BinPacking.PackingItem; 34 34 using HeuristicLab.Problems.BinPacking.PackingBin; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/3D/BinUtilizationCuboiddenticalBinEvaluator.cs
r9348 r9440 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Common; 32 using HeuristicLab. Problems.BinPacking.PackingPlans;32 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 33 33 using HeuristicLab.Problems.BinPacking.Dimensions; 34 34 using HeuristicLab.Problems.BinPacking.PackingBin; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/3D/PackingRatioCuboidIdenticalBinEvaluator.cs
r9348 r9440 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Common; 32 using HeuristicLab. Problems.BinPacking.PackingPlans;32 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 33 33 using HeuristicLab.Problems.BinPacking.Dimensions; 34 34 using HeuristicLab.Problems.BinPacking.PackingBin; -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/BinUtilizationRegularIdenticalBinEvaluator.cs
r9348 r9440 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Common; 32 using HeuristicLab. Problems.BinPacking.PackingPlans;32 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 33 33 34 34 namespace HeuristicLab.Problems.BinPacking.Evaluators { … … 53 53 B binMeasure = PackingBinMeasuresParameter.ActualValue; 54 54 ItemList<I> itemMeasures = PackingItemMeasuresParameter.ActualValue; 55 int nrOfBins = plan.NrOfBins;56 55 57 56 … … 67 66 68 67 //if (itemPositionsAreValid) 69 return Calculate PackingRatio(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures, nrOfBins);68 return CalculateBinUtilization(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures); 70 69 71 70 //return quality; 72 71 } 73 72 74 private DoubleValue CalculatePackingRatio(PackingPlan<D, B, I> plan, B binMeasure, ItemList<I> itemMeasures, int nrOfBins) { 73 public static DoubleValue CalculateBinUtilization(PackingPlan<D, B, I> plan, B binMeasure, ItemList<I> itemMeasures) { 74 int nrOfBins = plan.NrOfBins; 75 75 double result = 0; 76 76 -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingPlanEvaluationAlgorithm.cs
r9348 r9440 12 12 using HeuristicLab.Parameters; 13 13 using HeuristicLab.Problems.BinPacking.Shapes; 14 using HeuristicLab. Problems.BinPacking.PackingPlans;14 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 15 15 16 16 namespace HeuristicLab.Problems.BinPacking.Evaluators { -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingPlanEvaluator.cs
r9348 r9440 31 31 using HeuristicLab.Parameters; 32 32 using HeuristicLab.Data; 33 using HeuristicLab. Problems.BinPacking.PackingPlans;33 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 34 34 using HeuristicLab.Problems.BinPacking.Shapes; 35 35 -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingRatioRegularIdenticalBinEvaluator.cs
r9348 r9440 30 30 using HeuristicLab.Data; 31 31 using HeuristicLab.Common; 32 using HeuristicLab. Problems.BinPacking.PackingPlans;32 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 33 33 34 34 namespace HeuristicLab.Problems.BinPacking.Evaluators { … … 53 53 B binMeasure = PackingBinMeasuresParameter.ActualValue; 54 54 ItemList<I> itemMeasures = PackingItemMeasuresParameter.ActualValue; 55 int nrOfBins = plan.NrOfBins;56 55 57 56 … … 67 66 68 67 //if (itemPositionsAreValid) 69 return CalculatePackingRatio(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures , nrOfBins);68 return CalculatePackingRatio(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures); 70 69 71 70 //return quality; … … 81 80 k.......a constant, k>1. 82 81 */ 83 private DoubleValue CalculatePackingRatio(PackingPlan<D, B, I> plan, B binMeasure, ItemList<I> itemMeasures, int nrOfBins) { 82 public static DoubleValue CalculatePackingRatio(PackingPlan<D, B, I> plan, B binMeasure, ItemList<I> itemMeasures) { 83 int nrOfBins = plan.NrOfBins; 84 84 double result = 0; 85 85 -
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/RegularSimpleRotationIdenticalBinPackingPlanEvaluator.cs
r9348 r9440 31 31 using HeuristicLab.Parameters; 32 32 using HeuristicLab.Data; 33 using HeuristicLab. Problems.BinPacking.PackingPlans;33 using HeuristicLab.Encodings.PackingEncoding.PackingPlan; 34 34 using HeuristicLab.Problems.BinPacking.Shapes; 35 35 using HeuristicLab.Collections;
Note: See TracChangeset
for help on using the changeset viewer.