Changeset 14876


Ignore:
Timestamp:
04/19/17 11:16:10 (5 weeks ago)
Author:
dsouravl
Message:

#2762: implemented sorting heuristics, starting to work on best fit heuristics

Location:
branches/BinPackingExtension
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/BinPackingExtension

    • Property svn:ignore
      •  

        old new  
        11.vs
         2*.suo
  • branches/BinPackingExtension/HeuristicLab.Problems.BinPacking.Views/3.3/HeuristicLab.Problems.BinPacking.Views-3.3.csproj

    r14835 r14876  
    9999      <Private>False</Private>
    100100    </Reference>
     101    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     102      <SpecificVersion>False</SpecificVersion>
     103      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     104    </Reference>
     105    <Reference Include="HeuristicLab.Data.Views-3.3">
     106      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
     107    </Reference>
     108    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     109      <SpecificVersion>False</SpecificVersion>
     110      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     113      <SpecificVersion>False</SpecificVersion>
     114      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     115      <Private>False</Private>
     116    </Reference>
     117    <Reference Include="HeuristicLab.Optimization.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     118      <SpecificVersion>False</SpecificVersion>
     119      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     120      <Private>False</Private>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     123      <SpecificVersion>False</SpecificVersion>
     124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
     125      <Private>False</Private>
     126    </Reference>
    101127    <Reference Include="PresentationCore" />
    102128    <Reference Include="PresentationFramework" />
    103129    <Reference Include="System" />
    104130    <Reference Include="System.Core" />
     131    <Reference Include="System.Data" />
    105132    <Reference Include="System.Drawing" />
    106133    <Reference Include="System.Windows.Forms" />
    107134    <Reference Include="System.Xaml" />
     135    <Reference Include="System.Xml" />
    108136    <Reference Include="UIAutomationProvider" />
    109137    <Reference Include="WindowsBase" />
     
    111139  </ItemGroup>
    112140  <ItemGroup>
     141    <Compile Include="BinPacking3DProblemView.cs">
     142      <SubType>UserControl</SubType>
     143    </Compile>
     144    <Compile Include="BinPacking3DProblemView.Designer.cs">
     145      <DependentUpon>BinPacking3DProblemView.cs</DependentUpon>
     146    </Compile>
    113147    <Compile Include="Container3DView.xaml.cs">
    114148      <DependentUpon>Container3DView.xaml</DependentUpon>
     
    136170  </ItemGroup>
    137171  <ItemGroup>
     172    <EmbeddedResource Include="BinPacking3DProblemView.resx">
     173      <DependentUpon>BinPacking3DProblemView.cs</DependentUpon>
     174    </EmbeddedResource>
    138175    <EmbeddedResource Include="PackingPlan2DView.resx">
    139176      <DependentUpon>PackingPlan2DView.cs</DependentUpon>
  • branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/BinPacking.cs

    r14162 r14876  
    5252
    5353    #endregion Properties
     54
     55    public int FreeVolume {
     56      get { return BinShape.Volume - Items.Sum(x => x.Value.Volume); }
     57    }
    5458
    5559    protected BinPacking(TBin binShape)
  • branches/BinPackingExtension/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r14838 r14876  
    155155    <Compile Include="2D\ProblemBase.cs" />
    156156    <Compile Include="2D\Solution.cs" />
     157    <Compile Include="3D\BestFitHeuristic.cs" />
    157158    <Compile Include="3D\BinPacking3D.cs" />
    158159    <Compile Include="3D\Evaluators\BinUtilizationEvaluator.cs" />
Note: See TracChangeset for help on using the changeset viewer.