Changeset 14064


Ignore:
Timestamp:
07/13/16 21:24:37 (12 months ago)
Author:
gkronber
Message:

#1966: first steps for refactoring to use new Encoding framework

Location:
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/IPackingSequenceCreator.cs

    r13613 r14064  
    2424using HeuristicLab.Data;
    2525using HeuristicLab.Optimization;
     26using HeuristicLab.Problems.BinPacking;
    2627
    2728namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
    28   interface IPackingSequenceCreator : ISolutionCreator {
     29  interface IPackingSequenceCreator : ISolutionCreator, IPackingSequenceOperator {
    2930    IValueLookupParameter<IntValue> PackingItemsParameter { get; }
    30     ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence> SolutionParameter { get; }
     31    ILookupParameter<PackingSequence> SolutionParameter { get; }
    3132
    3233  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequence.cs

    r13613 r14064  
    99using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    1010
    11 namespace HeuristicLab.Problems.BinPacking.Encodings.PackingSequence {
     11namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
    1212  [Item("PackingSequence", "Represents a packing sequence (permutation).")]
    1313  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceRandomCreator.cs

    r14038 r14064  
    4242    }
    4343
    44     public ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence> SolutionParameter {
    45       get { return (ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence>)Parameters["PackingItems"]; }
     44    public ILookupParameter<PackingSequence> SolutionParameter {
     45      get { return (ILookupParameter<PackingSequence>)Parameters["PackingItems"]; }
    4646    }
    4747
     
    5959      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
    6060      Parameters.Add(new ValueLookupParameter<IntValue>("PackingItems", "The number of packing-items handled in this problem instance."));
    61       Parameters.Add(new LookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence>("PackingSequence"));
     61      Parameters.Add(new LookupParameter<PackingSequence>("PackingSequence"));
    6262
    6363      SolutionParameter.ActualName = "PackingSequence";
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

    r14054 r14064  
    216216    <Compile Include="Encodings\PackingPlans\BinPacking.cs" />
    217217    <Compile Include="Encodings\PackingPlans\PackingPlan.cs" />
     218    <Compile Include="Encodings\PackingSequence\Encoding.cs" />
    218219    <Compile Include="Encodings\PackingSequence\IPackingSequenceCreator.cs" />
    219220    <Compile Include="Encodings\PackingSequence\Moves\Insertion\ExhaustiveInsertionMoveGenerator.cs" />
     
    280281    <Compile Include="PackingSolutionDecoder.cs" />
    281282    <Compile Include="Plugin.cs" />
     283    <Compile Include="PackingSequenceProblem.cs" />
    282284    <Compile Include="Problem.cs" />
    283285    <Compile Include="Properties\AssemblyInfo.cs" />
Note: See TracChangeset for help on using the changeset viewer.