Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/13 17:51:14 (12 years ago)
Author:
jhelm
Message:

#1966: Implemented new encoding (MultiComponentVector/MCV); Implemented move-operators for MCV and GV encodings; Implemented new decoding-methods for PS, GV and MCV encodings (ExtremePoint-based packing);

Location:
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/BinUtilizationRegularIdenticalBinEvaluator.cs

    r9348 r9440  
    3030using HeuristicLab.Data;
    3131using HeuristicLab.Common;
    32 using HeuristicLab.Problems.BinPacking.PackingPlans;
     32using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3333
    3434namespace HeuristicLab.Problems.BinPacking.Evaluators {
     
    5353      B binMeasure = PackingBinMeasuresParameter.ActualValue;
    5454      ItemList<I> itemMeasures = PackingItemMeasuresParameter.ActualValue;
    55       int nrOfBins = plan.NrOfBins;
    5655
    5756
     
    6766
    6867      //if (itemPositionsAreValid)
    69       return CalculatePackingRatio(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures, nrOfBins);
     68      return CalculateBinUtilization(plan as PackingPlan<D, B, I>, binMeasure, itemMeasures);
    7069
    7170      //return quality;
    7271    }
    7372
    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;
    7575      double result = 0;
    7676
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingPlanEvaluationAlgorithm.cs

    r9348 r9440  
    1212using HeuristicLab.Parameters;
    1313using HeuristicLab.Problems.BinPacking.Shapes;
    14 using HeuristicLab.Problems.BinPacking.PackingPlans;
     14using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    1515
    1616namespace HeuristicLab.Problems.BinPacking.Evaluators {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingPlanEvaluator.cs

    r9348 r9440  
    3131using HeuristicLab.Parameters;
    3232using HeuristicLab.Data;
    33 using HeuristicLab.Problems.BinPacking.PackingPlans;
     33using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3434using HeuristicLab.Problems.BinPacking.Shapes;
    3535
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/PackingRatioRegularIdenticalBinEvaluator.cs

    r9348 r9440  
    3030using HeuristicLab.Data;
    3131using HeuristicLab.Common;
    32 using HeuristicLab.Problems.BinPacking.PackingPlans;
     32using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3333
    3434namespace HeuristicLab.Problems.BinPacking.Evaluators {
     
    5353      B binMeasure = PackingBinMeasuresParameter.ActualValue;
    5454      ItemList<I> itemMeasures = PackingItemMeasuresParameter.ActualValue;
    55       int nrOfBins = plan.NrOfBins;
    5655
    5756
     
    6766
    6867      //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);
    7069
    7170      //return quality;
     
    8180        k.......a constant, k>1.
    8281     */
    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;
    8484      double result = 0;
    8585
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/Abstract/RegularSimpleRotationIdenticalBinPackingPlanEvaluator.cs

    r9348 r9440  
    3131using HeuristicLab.Parameters;
    3232using HeuristicLab.Data;
    33 using HeuristicLab.Problems.BinPacking.PackingPlans;
     33using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3434using HeuristicLab.Problems.BinPacking.Shapes;
    3535using HeuristicLab.Collections;
Note: See TracChangeset for help on using the changeset viewer.