Changeset 14170


Ignore:
Timestamp:
07/21/16 21:57:36 (9 months ago)
Author:
gkronber
Message:

#2641: merged r14162,r14163,r14167,r14168,r14169 from trunk to stable

Location:
stable
Files:
30 edited
4 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab 3.3.sln

    r14165 r14170  
    5555    {1256B945-EEA9-4BE4-9880-76B5B113F089} = {1256B945-EEA9-4BE4-9880-76B5B113F089}
    5656    {9319C447-8183-4DBC-8145-0E3CF98084CC} = {9319C447-8183-4DBC-8145-0E3CF98084CC}
     57    {D53E8E48-CFAA-4F57-AC35-63BEF4476159} = {D53E8E48-CFAA-4F57-AC35-63BEF4476159}
    5758    {0C39A349-1979-419A-89BD-E4E2F26BD287} = {0C39A349-1979-419A-89BD-E4E2F26BD287}
    5859    {C49CB749-8B24-4628-8003-E86475749410} = {C49CB749-8B24-4628-8003-E86475749410}
     
    7576    {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0} = {7EA0985E-A1D6-4FA7-B30A-2633FDFB01F0}
    7677    {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809}
     78    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E} = {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}
    7779    {0C378762-D5DB-488A-8931-2BA42B1B7CBF} = {0C378762-D5DB-488A-8931-2BA42B1B7CBF}
    7880    {97198965-AFEA-496B-B3B1-316905C43FD6} = {97198965-AFEA-496B-B3B1-316905C43FD6}
     
    101103    {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9} = {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}
    102104    {6F023B90-2091-40A9-8AC0-B0338DFF8E5F} = {6F023B90-2091-40A9-8AC0-B0338DFF8E5F}
     105    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4} = {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}
    103106    {FE856595-64CD-46DA-9CD2-FFF3E6B0D4F2} = {FE856595-64CD-46DA-9CD2-FFF3E6B0D4F2}
    104107    {9A04599C-D608-4240-8DA6-D41F51C515A3} = {9A04599C-D608-4240-8DA6-D41F51C515A3}
     
    457460EndProject
    458461Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions.MultiObjective-3.3", "HeuristicLab.Problems.TestFunctions.MultiObjective\3.3\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj", "{D53E8E48-CFAA-4F57-AC35-63BEF4476159}"
     462EndProject
     463Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.BinPacking.Views-3.3", "HeuristicLab.Problems.BinPacking.Views\3.3\HeuristicLab.Problems.BinPacking.Views-3.3.csproj", "{8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}"
     464EndProject
     465Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.BinPacking-3.3", "HeuristicLab.Problems.BinPacking\3.3\HeuristicLab.Problems.BinPacking-3.3.csproj", "{F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}"
    459466EndProject
    460467Global
     
    22262233    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|Any CPU.ActiveCfg = Release|Any CPU
    22272234    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|Any CPU.Build.0 = Release|Any CPU
    2228     {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x64.ActiveCfg = Release|Any CPU
    2229     {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x86.ActiveCfg = Release|Any CPU
     2235    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x64.ActiveCfg = Release|x64
     2236    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x64.Build.0 = Release|x64
     2237    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x86.ActiveCfg = Release|x86
     2238    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x86.Build.0 = Release|x86
     2239    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2240    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2241    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Debug|x64.ActiveCfg = Debug|x64
     2242    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Debug|x64.Build.0 = Debug|x64
     2243    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Debug|x86.ActiveCfg = Debug|x86
     2244    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Debug|x86.Build.0 = Debug|x86
     2245    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2246    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Release|Any CPU.Build.0 = Release|Any CPU
     2247    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Release|x64.ActiveCfg = Release|x64
     2248    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Release|x64.Build.0 = Release|x64
     2249    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Release|x86.ActiveCfg = Release|x86
     2250    {8CFC7A61-E214-44DC-96B3-4CEA9B8E958E}.Release|x86.Build.0 = Release|x86
     2251    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2252    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2253    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|x64.ActiveCfg = Debug|x64
     2254    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|x64.Build.0 = Debug|x64
     2255    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|x86.ActiveCfg = Debug|x86
     2256    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Debug|x86.Build.0 = Debug|x86
     2257    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2258    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|Any CPU.Build.0 = Release|Any CPU
     2259    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x64.ActiveCfg = Release|x64
     2260    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x64.Build.0 = Release|x64
     2261    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x86.ActiveCfg = Release|x86
     2262    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x86.Build.0 = Release|x86
    22302263  EndGlobalSection
    22312264  GlobalSection(SolutionProperties) = preSolution
     
    22332266  EndGlobalSection
    22342267  GlobalSection(NestedProjects) = preSolution
    2235     {0C67A033-F6D9-4237-B3CA-C033A44706BE} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    22362268    {3083C7AA-5AF4-4C75-BA19-B69B86E2F66A} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
    22372269    {9A04599C-D608-4240-8DA6-D41F51C515A3} = {D1B1DE45-F9C7-4FBF-B73C-E759BC4223D5}
  • stable/HeuristicLab.Optimizer

  • stable/HeuristicLab.Optimizer/3.3/HeuristicLab.Optimizer-3.3.csproj

    r13884 r14170  
    149149    <EmbeddedResource Include="Documents\ALPSGP_SymReg.hl" />
    150150    <EmbeddedResource Include="Documents\ALPSGA_TSP.hl" />
     151    <EmbeddedResource Include="Documents\TS_BPP.hl" />
    151152    <None Include="Plugin.cs.frame" />
    152153    <Compile Include="OptimizerSingleDocumentMainForm.cs">
  • stable/HeuristicLab.Optimizer/3.3/StartPage.cs

    r13285 r14170  
    135135      var standardProblems = new List<string> { "ALPSGA_TSP", "ES_Griewank", "GA_Grouping", "GA_TSP", "GA_VRP", "GE_ArtificialAnt",
    136136                "IslandGA_TSP", "LS_Knapsack", "PSO_Schwefel", "RAPGA_JSSP",
    137                 "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP", "VNS_TSP"
     137                "SA_Rastrigin", "SGP_SantaFe","GP_Multiplexer", "SS_VRP", "TS_TSP", "TS_VRP", "VNS_OP", "VNS_TSP", "TS_BPP"
    138138        };
    139139      groupLookup[standardProblemsGroup] = standardProblems;
  • stable/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs

    r14162 r14170  
    5757    private void UpdateState(PackingPlan<BinPacking2D.PackingPosition, PackingShape, PackingItem> plan) {
    5858      int currentBin = (binSelection != null && binSelection.SelectedItem != null) ? (int)(binSelection.SelectedItem) : 0;
    59       container2DView.Packing = plan.BinPackings[currentBin];
     59      container2DView.Packing = plan.Bins[currentBin];
    6060    }
    6161
  • stable/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs

    r14162 r14170  
    4747      } else {
    4848        int i = 0;
    49         foreach (var bp in Content.BinPackings)
     49        foreach (var bp in Content.Bins)
    5050          binSelection.Items.Add(i++ + " (" + Math.Round(bp.PackingDensity * 100, 2) + "%)");
    5151
     
    5757    private void ShowSelectedPacking() {
    5858      int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
    59       packingPlan3D.Packing = Content.BinPackings[currentBin];
     59      packingPlan3D.Packing = Content.Bins[currentBin];
    6060    }
    6161
     
    6666      // add items of this container
    6767      int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
    68       var packing = Content.BinPackings[currentBin];
     68      var packing = Content.Bins[currentBin];
    6969      foreach (var item in packing.Items) {
    7070        itemSelection.Items.Add(item.Key);
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/BinUtilizationEvaluator.cs

    r14162 r14170  
    5353
    5454      for (int i = 0; i < nrOfBins; i++) {
    55         totalUsableSpace += solution.BinPackings[i].BinShape.Volume;
    56         totalUsedSpace += solution.BinPackings[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);
    5757      }
    5858
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/Evaluators/PackingRatioEvaluator.cs

    r14162 r14170  
    6060      const double k = 2;
    6161      for (int i = 0; i < nrOfBins; i++) {
    62         double f = solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
    63         double c = solution.BinPackings[i].BinShape.Volume;
     62        double f = solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
     63        double c = solution.Bins[i].BinShape.Volume;
    6464        result += Math.Pow(f / c, k);
    6565      }
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs

    r14162 r14170  
    5353      Solution partialSolution,
    5454      ref IList<int> remainingIDs, IList<PackingItem> items) {
    55       var bp = new BinPacking2D(partialSolution.BinMeasures);
     55      var bp = new BinPacking2D(partialSolution.BinShape);
    5656      bp.SlidingBasedPacking(ref remainingIDs, items);
    5757      return bp;
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs

    r14162 r14170  
    5353      Solution partialSolution,
    5454      ref IList<int> remainingIDs, IList<PackingItem> items) {
    55       var bp = new BinPacking2D(partialSolution.BinMeasures);
     55      var bp = new BinPacking2D(partialSolution.BinShape);
    5656      bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: false);
    5757      return bp;
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs

    r14162 r14170  
    4747      foreach (var sequence in sequenceMatrix) {
    4848        remainingIDs = remainingIDs.Concat(sequence).ToList();
    49         result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items));
     49        result.Bins.Add(CreatePacking(result, ref remainingIDs, items));
    5050      }
    5151      result.UpdateBinPackings();
     
    5454      var temp = new List<int>(remainingIDs);
    5555      foreach (int id in temp) {
    56         foreach (BinPacking2D bp in result.BinPackings) {
     56        foreach (BinPacking2D bp in result.Bins) {
    5757          var position = FindPositionForItem(bp, items[id]);
    5858          if (position != null) {
     
    6666      //Put still remaining items in new bins
    6767      while (remainingIDs.Count > 0) {
    68         result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items));
     68        result.Bins.Add(CreatePacking(result, ref remainingIDs, items));
    6969      }
    7070      result.UpdateBinPackings();
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/BottomLeftPermutationDecoder.cs

    r14162 r14170  
    4747        var bp = new BinPacking2D(binShape);
    4848        bp.SlidingBasedPacking(ref remainingIDs, items);
    49         result.BinPackings.Add(bp);
     49        result.Bins.Add(bp);
    5050      }
    5151      result.UpdateBinPackings();
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/PermutationEncoding/ExtremePointPermutationDecoder.cs

    r14162 r14170  
    4747        var bp = new BinPacking2D(binShape);
    4848        bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: false);
    49         result.BinPackings.Add(bp);
     49        result.Bins.Add(bp);
    5050      }
    5151      result.UpdateBinPackings();
  • stable/HeuristicLab.Problems.BinPacking/3.3/2D/Solution.cs

    r14162 r14170  
    2929  [StorableClass]
    3030  public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> {
    31     public Solution(PackingShape binMeasures) : this(binMeasures, false, false) { }
    32     public Solution(PackingShape binMeasures, 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) { }
    3333    [StorableConstructor]
    3434    protected Solution(bool deserializing) : base(deserializing) { }
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/BinUtilizationEvaluator.cs

    r14162 r14170  
    5454
    5555      for (int i = 0; i < nrOfBins; i++) {
    56         totalUsableSpace += solution.BinPackings[i].BinShape.Volume;
    57         totalUsedSpace += solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
     56        totalUsableSpace += solution.Bins[i].BinShape.Volume;
     57        totalUsedSpace += solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
    5858      }
    5959
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Evaluators/PackingRatioEvaluator.cs

    r14162 r14170  
    6161      const double k = 2;
    6262      for (int i = 0; i < nrOfBins; i++) {
    63         double f = solution.BinPackings[i].Items.Sum(kvp => kvp.Value.Volume);
    64         double c = solution.BinPackings[i].BinShape.Volume;
     63        double f = solution.Bins[i].Items.Sum(kvp => kvp.Value.Volume);
     64        double c = solution.Bins[i].BinShape.Volume;
    6565        result += Math.Pow(f / c, k);
    6666      }
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/BottomLeftIntegerVectorDecoder.cs

    r14162 r14170  
    6060      Solution partialSolution,
    6161      ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
    62       var bp = new BinPacking3D(partialSolution.BinMeasures);
     62      var bp = new BinPacking3D(partialSolution.BinShape);
    6363      bp.SlidingBasedPacking(ref remainingIDs, items);
    6464      return bp;
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/ExtremePointIntegerVectorDecoder.cs

    r14162 r14170  
    5353      Solution partialSolution,
    5454      ref IList<int> remainingIDs, IList<PackingItem> items, bool useStackingConstraints) {
    55       var bp = new BinPacking3D(partialSolution.BinMeasures);
     55      var bp = new BinPacking3D(partialSolution.BinShape);
    5656      bp.ExtremePointBasedPacking(ref remainingIDs, items, useStackingConstraints);
    5757      return bp;
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorDecoderBase.cs

    r14162 r14170  
    4747      foreach (var sequence in sequenceMatrix) {
    4848        remainingIDs = remainingIDs.Concat(sequence).ToList();
    49         result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
     49        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
    5050      }
    5151      result.UpdateBinPackings();
     
    5454      var temp = new List<int>(remainingIDs);
    5555      foreach (int id in temp) {
    56         foreach (BinPacking3D bp in result.BinPackings) {
     56        foreach (BinPacking3D bp in result.Bins) {
    5757          var position = FindPositionForItem(bp, items[id], useStackingConstraints);
    5858          if (position != null) {
     
    6666      //Put still remaining items in new bins
    6767      while (remainingIDs.Count > 0) {
    68         result.BinPackings.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
     68        result.Bins.Add(CreatePacking(result, ref remainingIDs, items, useStackingConstraints));
    6969      }
    7070      result.UpdateBinPackings();
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/IntegerVectorEncoding/IntegerVectorProblem.cs

    r14162 r14170  
    3535  [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 330)]
    3636  public sealed class IntegerVectorProblem : ProblemBase<IntegerVectorEncoding, IntegerVector> {
    37     // persistence
    3837    [StorableConstructor]
    3938    private IntegerVectorProblem(bool deserializing) : base(deserializing) { }
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/BottomLeftPermutationDecoder.cs

    r14162 r14170  
    4747        var bp = new BinPacking3D(binShape);
    4848        bp.SlidingBasedPacking(ref remainingIDs, items);
    49         result.BinPackings.Add(bp);
     49        result.Bins.Add(bp);
    5050      }
    5151      result.UpdateBinPackings();
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/ExtremePointPermutationDecoder.cs

    r14162 r14170  
    4747        var bp = new BinPacking3D(binShape);
    4848        bp.ExtremePointBasedPacking(ref remainingIDs, items, stackingConstraints: useStackingConstraints);
    49         result.BinPackings.Add(bp);
     49        result.Bins.Add(bp);
    5050      }
    5151      result.UpdateBinPackings();
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/PermutationEncoding/PermutationProblem.cs

    r14162 r14170  
    3434  [Creatable(Category = CreatableAttribute.Categories.CombinatorialProblems, Priority = 320)]
    3535  public sealed class PermutationProblem : ProblemBase<PermutationEncoding, Permutation> {
    36     // persistence
    3736    [StorableConstructor]
    3837    private PermutationProblem(bool deserializing) : base(deserializing) { }
  • stable/HeuristicLab.Problems.BinPacking/3.3/3D/Solution.cs

    r14162 r14170  
    88  [StorableClass]
    99  public class Solution : PackingPlan<PackingPosition, PackingShape, PackingItem> {
    10     public Solution(PackingShape binMeasures) : this(binMeasures, false, false) { }
    11     public Solution(PackingShape binMeasures, bool useExtremePoints, bool stackingConstraints) : base(binMeasures, useExtremePoints, stackingConstraints) { }
     10    public Solution(PackingShape binShape) : this(binShape, false, false) { }
     11    public Solution(PackingShape binShape, bool useExtremePoints, bool stackingConstraints) : base(binShape, useExtremePoints, stackingConstraints) { }
    1212    [StorableConstructor]
    1313    protected Solution(bool deserializing) : base(deserializing) { }
  • stable/HeuristicLab.Problems.BinPacking/3.3/PackingPlan.cs

    r14162 r14170  
    3838    public int NrOfBins {
    3939      get {
    40         if (BinPackings != null)
    41           return BinPackings.Count;
     40        if (Bins != null)
     41          return Bins.Count;
    4242        else return 0;
    4343      }
     
    4949
    5050    [Storable]
    51     public B BinMeasures { get; private set; }
     51    public B BinShape { get; private set; }
    5252
    5353    [Storable]
    54     public ObservableList<BinPacking<D, B, I>> BinPackings { get; set; }
     54    public ObservableList<BinPacking<D, B, I>> Bins { get; set; }
    5555
    5656    [Storable]
     
    6969    #endregion
    7070
    71     protected PackingPlan(B binMeasures, bool useExtremePoints, bool stackingConstraints)
     71    protected PackingPlan(B binShape, bool useExtremePoints, bool stackingConstraints)
    7272      : base() {
    73       BinMeasures = (B)binMeasures.Clone();
     73      BinShape = (B)binShape.Clone();
    7474      StackingConstraints = stackingConstraints;
    7575      UseExtremePoints = useExtremePoints;
    76       BinPackings = new ObservableList<BinPacking<D, B, I>>();
     76      Bins = new ObservableList<BinPacking<D, B, I>>();
    7777    }
    7878
     
    8181    protected PackingPlan(PackingPlan<D, B, I> original, Cloner cloner)
    8282      : base(original, cloner) {
    83       this.BinPackings = new ObservableList<BinPacking<D, B, I>>(original.BinPackings.Select(p => cloner.Clone(p)));
     83      this.Bins = new ObservableList<BinPacking<D, B, I>>(original.Bins.Select(p => cloner.Clone(p)));
    8484      UseExtremePoints = original.UseExtremePoints;
    8585      StackingConstraints = original.StackingConstraints;
    86       BinMeasures = cloner.Clone(original.BinMeasures);
     86      BinShape = cloner.Clone(original.BinShape);
    8787      Quality = cloner.Clone(original.Quality);
    8888    }
     
    9090
    9191    public void UpdateBinPackings() {
    92       BinPackings.RemoveAll(x => x.Positions.Count == 0);
    93       BinPackings = new ObservableList<BinPacking<D, B, I>>(BinPackings.OrderByDescending(bp => bp.PackingDensity));
     92      Bins.RemoveAll(x => x.Positions.Count == 0);
     93      Bins = new ObservableList<BinPacking<D, B, I>>(Bins.OrderByDescending(bp => bp.PackingDensity));
    9494    }
    9595
     
    110110      OnQualityChanged();
    111111    }
    112 
    113     public event EventHandler BinPackingsChanged;
    114112    #endregion
    115113  }
  • stable/HeuristicLab.Problems.BinPacking/3.3/PackingShape.cs

    r14162 r14170  
    7878    public abstract int CompareTo(object obj);
    7979
     80    [Storable]
    8081    public IKeyedItemCollection<string, IParameter> Parameters { get; private set; }
    8182  }
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj

    r14165 r14170  
    3939  <PropertyGroup>
    4040    <StartupObject />
     41  </PropertyGroup>
     42  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     43    <DebugSymbols>true</DebugSymbols>
     44    <OutputPath>..\..\bin\</OutputPath>
     45    <DefineConstants>CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
     46    <DebugType>full</DebugType>
     47    <PlatformTarget>x64</PlatformTarget>
     48    <RunCodeAnalysis>true</RunCodeAnalysis>
     49    <ErrorReport>prompt</ErrorReport>
     50    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     51  </PropertyGroup>
     52  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     53    <OutputPath>..\..\bin\</OutputPath>
     54    <DefineConstants>TRACE</DefineConstants>
     55    <Optimize>true</Optimize>
     56    <DebugType>pdbonly</DebugType>
     57    <PlatformTarget>x64</PlatformTarget>
     58    <ErrorReport>prompt</ErrorReport>
     59    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     60  </PropertyGroup>
     61  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     62    <DebugSymbols>true</DebugSymbols>
     63    <OutputPath>..\..\bin\</OutputPath>
     64    <DefineConstants>CODE_ANALYSIS;DEBUG;TRACE</DefineConstants>
     65    <DebugType>full</DebugType>
     66    <PlatformTarget>x86</PlatformTarget>
     67    <RunCodeAnalysis>true</RunCodeAnalysis>
     68    <ErrorReport>prompt</ErrorReport>
     69    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     70  </PropertyGroup>
     71  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     72    <OutputPath>..\..\bin\</OutputPath>
     73    <DefineConstants>TRACE</DefineConstants>
     74    <Optimize>true</Optimize>
     75    <DebugType>pdbonly</DebugType>
     76    <PlatformTarget>x86</PlatformTarget>
     77    <ErrorReport>prompt</ErrorReport>
     78    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    4179  </PropertyGroup>
    4280  <ItemGroup>
  • stable/HeuristicLab.Tests

  • stable/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r14165 r14170  
    270270      <SpecificVersion>False</SpecificVersion>
    271271      <HintPath>..\bin\HeuristicLab.Problems.Binary-3.3.dll</HintPath>
     272      <Private>False</Private>
     273    </Reference>
     274    <Reference Include="HeuristicLab.Problems.BinPacking-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     275      <SpecificVersion>False</SpecificVersion>
     276      <HintPath>..\bin\HeuristicLab.Problems.BinPacking-3.3.dll</HintPath>
    272277      <Private>False</Private>
    273278    </Reference>
Note: See TracChangeset for help on using the changeset viewer.