Changeset 14038


Ignore:
Timestamp:
07/12/16 16:35:10 (12 months ago)
Author:
gkronber
Message:

#1966: fixed compile errors and reverted some changes from the last commit which prepared for refactoring to use new Encoding framework

Location:
branches/HeuristicLab.BinPacking
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.BinPacking.sln

    r13608 r14038  
    11
    22Microsoft Visual Studio Solution File, Format Version 12.00
    3 # Visual Studio 2012
     3# Visual Studio 14
     4VisualStudioVersion = 14.0.25123.0
     5MinimumVisualStudioVersion = 10.0.40219.1
    46Project("{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}"
    57EndProject
     
    6365    {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    6466    {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|Any CPU.Build.0 = Debug|Any CPU
    65     {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    66     {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|Mixed Platforms.Build.0 = Debug|x86
     67    {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     68    {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    6769    {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|x64.ActiveCfg = Debug|x64
    6870    {56DD7F51-3164-4C26-A97A-ADD6FE4B4E86}.Debug|x64.Build.0 = Debug|x64
     
    7981    {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    8082    {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
    81     {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
    82     {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|Mixed Platforms.Build.0 = Debug|x86
     83    {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     84    {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    8385    {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|x64.ActiveCfg = Debug|x64
    8486    {95680C63-1E06-4E66-B33B-272A772321C7}.Debug|x64.Build.0 = Debug|x64
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/BinPacking2D.cs

    r13612 r14038  
    5959      if (sourcePointX.X < BinMeasures.Width && sourcePointX.Y < BinMeasures.Height) {
    6060        //Traversing down the y-axis       
    61         while (sourcePointX.Y > 0 && !IsPointOccupied(new TwoDimensionalPacking(0, sourcePointX.X, sourcePointX.Y - 1))) {
    62           sourcePointX.Y--;
     61        var newPoint = new TwoDimensionalPacking(0, sourcePointX.X, sourcePointX.Y - 1);
     62        while (sourcePointX.Y > 0 && !IsPointOccupied(newPoint)) {
     63          sourcePointX = newPoint;
     64          newPoint = new TwoDimensionalPacking(0, sourcePointX.X, sourcePointX.Y - 1);
    6365        }
    6466        ExtremePoints.Add(new TwoDimensionalPacking(0, sourcePointX.X, sourcePointX.Y));
     
    7274      if (sourcePointY.X < BinMeasures.Width && sourcePointY.Y < BinMeasures.Height) {
    7375        //Traversing down the x-axis 
    74         while (sourcePointY.X > 0 && !IsPointOccupied(new TwoDimensionalPacking(0, sourcePointY.X - 1, sourcePointY.Y))) {
    75           sourcePointY.X--;
     76        var newPoint = new TwoDimensionalPacking(0, sourcePointY.X - 1, sourcePointY.Y);
     77        while (sourcePointY.X > 0 && !IsPointOccupied(newPoint)) {
     78          sourcePointY = newPoint;
     79          newPoint = new TwoDimensionalPacking(0, sourcePointY.X - 1, sourcePointY.Y);
    7680        }
    7781        ExtremePoints.Add(new TwoDimensionalPacking(0, sourcePointY.X, sourcePointY.Y));
     
    96100
    97101      if (epIndex < ExtremePoints.Count) {
    98         var result = ExtremePoints.ElementAt(epIndex);
    99         result.Rotated = rotated;
     102        var currentPoint = ExtremePoints.ElementAt(epIndex);
     103
     104        var result = new TwoDimensionalPacking(currentPoint.AssignedBin, currentPoint.X, currentPoint.Y, rotated);
    100105        return result;
    101106      }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/BinPacking3D.cs

    r13612 r14038  
    165165
    166166      if (epIndex < ExtremePoints.Count) {
    167         var result = ExtremePoints.ElementAt(epIndex);
    168         result.Rotated = rotated;
     167        var origPoint = ExtremePoints.ElementAt(epIndex);
     168        var result = new ThreeDimensionalPacking(origPoint.AssignedBin, origPoint.X, origPoint.Y, origPoint.Z, rotated);
    169169        return result;
    170170      }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj

    r13612 r14038  
    158158      <DependentUpon>Container2DView.xaml</DependentUpon>
    159159    </Compile>
    160     <Compile Include="PackingPlan2DView.cs" />
     160    <Compile Include="PackingPlan2DView.cs">
     161      <SubType>UserControl</SubType>
     162    </Compile>
    161163    <Compile Include="PackingPlan2DView.Designer.cs">
    162164      <DependentUpon>PackingPlan2DView.cs</DependentUpon>
    163165    </Compile>
    164     <Compile Include="PackingPlan3DView.cs" />
     166    <Compile Include="PackingPlan3DView.cs">
     167      <SubType>UserControl</SubType>
     168    </Compile>
    165169    <Compile Include="PackingPlan3DView.Designer.cs">
    166170      <DependentUpon>PackingPlan3DView.cs</DependentUpon>
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs

    r13612 r14038  
    2424using HeuristicLab.MainForm;
    2525using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
     26using HeuristicLab.Problems.BinPacking.Dimensions;
     27using HeuristicLab.Problems.BinPacking.PackingBin;
     28using HeuristicLab.Problems.BinPacking.PackingItem;
    2629
    2730namespace HeuristicLab.Problems.BinPacking.Views {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Plugin.cs.frame

    r13532 r14038  
    3636  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3737  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    38   [PluginDependency("HeuristicLab.SharpDX", "2.6.3")]
    3938  public class HeuristicLabProblemsBinPackingViewsPlugin : PluginBase {
    4039  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceEncoding.cs

    r13613 r14038  
    3232  [Item("Packing Sequence Encoding", "Represents an encoding for a bin packing problem using permutation of item-indexes to define the packing sequence.")]
    3333  [StorableClass]
    34   public class PackingSequenceEncoding : Encoding<PackingSequenceRandomCreator> {
     34  public class PackingSequenceEncoding : Item, IPackingSolutionEncoding {
    3535
    3636    [Storable]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceRandomCreator.cs

    r13613 r14038  
    3333  [Item("PackingSequenceCreator", "Creator class used to create PackingSequence solutions for bin packing problems.")]
    3434  [StorableClass]
    35   public class PackingSequenceRandomCreator : SingleSuccessorOperator, IPackingSequenceCreator, IStochasticOperator {
     35  public class PackingSequenceRandomCreator : PackingSolutionCreator, IStochasticOperator {
    3636
    3737    public ILookupParameter<IRandom> RandomParameter {
     
    7474      return solution;
    7575    }
    76 
     76    protected override IItem CreateSolution() {
     77      return Apply(PackingItemsParameter.ActualValue.Value, RandomParameter.ActualValue);
     78    }
    7779  }
    7880}
Note: See TracChangeset for help on using the changeset viewer.