Changeset 14046


Ignore:
Timestamp:
07/12/16 19:34:31 (13 months ago)
Author:
gkronber
Message:

#1966: unified namespaces

Location:
branches/HeuristicLab.BinPacking
Files:
131 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/BinPacking2D.cs

    r14045 r14046  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using HeuristicLab.Problems.BinPacking.PackingItem;
    2625using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2726using HeuristicLab.Core;
    2827using HeuristicLab.Common;
    29 using HeuristicLab.Problems.BinPacking.Dimensions;
    30 
    31 using HeuristicLab.Problems.BinPacking.Shapes;
    32 
    33 namespace HeuristicLab.Encodings.PackingEncoding.PackingPlan {
     28using HeuristicLab.Encodings.PackingEncoding;
     29
     30namespace HeuristicLab.Problems.BinPacking2D {
    3431  [Item("BinPacking2D", "Represents a single-bin packing for a 2D bin-packing problem.")]
    3532  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftGroupingVectorDecoder.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
     25using HeuristicLab.Common;
     26using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    2629
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
    31 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
    32 using HeuristicLab.Problems.BinPacking2D;
    33 using HeuristicLab.Problems.BinPacking.Shapes;
    34 
    35 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking2D {
    3631  [Item("Identical bin two dimensional grouping vector decoder", "<Description missing...>")]
    3732  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftMultiComponentVectorDecoder.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
    26 using HeuristicLab.Problems.BinPacking.PackingItem;
    27 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    2825using HeuristicLab.Common;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
    3026using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
    31 using HeuristicLab.Problems.BinPacking2D;
    32 using HeuristicLab.Problems.BinPacking.Shapes;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    3329
    34 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking2D {
    3531  [Item("Identical bin two dimensional multi component vector decoder", "<Description missing...>")]
    3632  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/BL/BottomLeftPackingSequenceDecoder.cs

    r14045 r14046  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 
    28 using HeuristicLab.Problems.BinPacking.PackingItem;
    29 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3026using HeuristicLab.Common;
    3127using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    32 using HeuristicLab.Problems.BinPacking.Interfaces;
    33 using HeuristicLab.Problems.BinPacking2D;
    34 using HeuristicLab.Problems.BinPacking.Shapes;
     28using HeuristicLab.Problems.BinPacking;
     29using HeuristicLab.Encodings.PackingEncoding;
    3530
    36 namespace HeuristicLab.Problems.BinPacking.Decoders {
     31namespace HeuristicLab.Problems.BinPacking2D {
    3732  [Item("Identical bin, two dimensional, direct permutation decoder", "<Description missing...>")]
    3833  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointGroupingVectorDecoder2D.cs

    r14045 r14046  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
     26using HeuristicLab.Common;
     27using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
     28using HeuristicLab.Problems.BinPacking;
     29using HeuristicLab.Encodings.PackingEncoding;
    2730
    28 using HeuristicLab.Problems.BinPacking.PackingItem;
    29 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    30 using HeuristicLab.Common;
    31 using HeuristicLab.Problems.BinPacking.Interfaces;
    32 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
    33 using HeuristicLab.Problems.BinPacking2D;
    34 using HeuristicLab.Problems.BinPacking.Shapes;
    35 
    36 namespace HeuristicLab.Problems.BinPacking.Decoders {
     31namespace HeuristicLab.Problems.BinPacking2D {
    3732  [Item("Identical bin, two dimensional, extreme points based decoder for the GroupingVector encoding.", "<Description missing...>")]
    3833  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder2D.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
     25using HeuristicLab.Common;
     26using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    2629
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
    31 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
    32 using HeuristicLab.Problems.BinPacking2D;
    33 using HeuristicLab.Problems.BinPacking.Shapes;
    34 
    35 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking2D {
    3631  [Item("Identical bin, two dimensional, extreme points based decoder for the MultiComponentVector encoding.", "<Description missing...>")] // TODO
    3732  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder2D.cs

    r14045 r14046  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    2926using HeuristicLab.Common;
    3027using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    31 using HeuristicLab.Problems.BinPacking.Interfaces;
    32 using HeuristicLab.Problems.BinPacking2D;
    33 using HeuristicLab.Problems.BinPacking.Shapes;
     28using HeuristicLab.Problems.BinPacking;
     29using HeuristicLab.Encodings.PackingEncoding;
    3430
    35 namespace HeuristicLab.Problems.BinPacking.Decoders {
     31namespace HeuristicLab.Problems.BinPacking2D {
    3632  [Item("Identical bin, two dimensional, extreme points based decoder for the PackingSequence encoding.", "<Description missing...>")] // TODO
    3733  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Interfaces/I2DGVDecoder.cs

    r13606 r14046  
    2222
    2323using HeuristicLab.Core;
     24using HeuristicLab.Problems.BinPacking;
    2425
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     26namespace HeuristicLab.Problems.BinPacking2D {
    2627  public interface I2DGVDecoder : IOperator, IPackingSolutionDecoder {
    2728  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Interfaces/I2DMCVDecoder.cs

    r13606 r14046  
    2121
    2222using HeuristicLab.Core;
     23using HeuristicLab.Problems.BinPacking;
    2324
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     25namespace HeuristicLab.Problems.BinPacking2D {
    2526  public interface I2DMCVDecoder : IOperator, IPackingSolutionDecoder {
    2627  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Interfaces/I2DOperator.cs

    r13607 r14046  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.BinPacking2D.Interfaces {
     22namespace HeuristicLab.Problems.BinPacking2D {
    2323  public interface I2DOperator {
    2424  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Interfaces/I2DPSDecoder.cs

    r13606 r14046  
    2121
    2222using HeuristicLab.Core;
     23using HeuristicLab.Problems.BinPacking;
    2324
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     25namespace HeuristicLab.Problems.BinPacking2D {
    2526  public interface I2DPSDecoder : IOperator, IPackingSolutionDecoder {
    2627  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/MoveEvaluators/PackingMoveEvaluator2DGV.cs

    r14045 r14046  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
    2827
    29 using HeuristicLab.Problems.BinPacking.PackingItem;
    30 using HeuristicLab.Problems.BinPacking.Shapes;
    31 using HeuristicLab.Problems.BinPacking2D.Interfaces;
    32 
    33 namespace HeuristicLab.Problems.BinPacking {
     28namespace HeuristicLab.Problems.BinPacking2D {
    3429  [Item("GroupingVectorMoveEvaluator2D", "Class for evaluating packing moves for 2dimensional problems.")]
    3530  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/MoveEvaluators/PackingMoveEvaluator2DMCV.cs

    r14045 r14046  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
    2827
    29 using HeuristicLab.Problems.BinPacking.PackingItem;
    30 using HeuristicLab.Problems.BinPacking.Shapes;
    31 using HeuristicLab.Problems.BinPacking2D.Interfaces;
    32 
    33 namespace HeuristicLab.Problems.BinPacking {
     28namespace HeuristicLab.Problems.BinPacking2D {
    3429  [Item("MultiComponentVectorMoveEvaluator2D", "Class for evaluating packing moves for 2dimensional problems.")]
    3530  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/MoveEvaluators/PackingMoveEvaluator2DPS.cs

    r14045 r14046  
    2424using HeuristicLab.Optimization;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
    2827
    29 using HeuristicLab.Problems.BinPacking.PackingItem;
    30 using HeuristicLab.Problems.BinPacking.Shapes;
    31 using HeuristicLab.Problems.BinPacking2D.Interfaces;
    32 
    33 namespace HeuristicLab.Problems.BinPacking {
     28namespace HeuristicLab.Problems.BinPacking2D {
    3429  [Item("PackingSequenceMoveEvaluator2D", "Class for evaluating packing moves for 2dimensional problems.")]
    3530  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingPlan2D.cs

    r14045 r14046  
    2222using HeuristicLab.Common;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
     24using HeuristicLab.Encodings.PackingEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 
    28 using HeuristicLab.Problems.BinPacking.PackingItem;
    29 using HeuristicLab.Problems.BinPacking.Shapes;
    3026
    3127namespace HeuristicLab.Problems.BinPacking2D {
     
    4440    }
    4541    public override BinPacking<TwoDimensionalPacking, RectangularPackingShape, RectangularPackingItem> NewBinPacking() {
    46       return new Encodings.PackingEncoding.PackingPlan.BinPacking2D(BinMeasures);
     42      return new BinPacking2D(BinMeasures);
    4743    }
    4844  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/PackingRatioRectangularIdenticalBinEvaluator.cs

    r14045 r14046  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525using HeuristicLab.Common;
    26 using HeuristicLab.Problems.BinPacking.PackingItem;
    27 using HeuristicLab.Problems.BinPacking.Dimensions;
    28 using HeuristicLab.Problems.BinPacking.Shapes;
     26using HeuristicLab.Problems.BinPacking;
    2927
    30 namespace HeuristicLab.Problems.BinPacking.Evaluators {
     28namespace HeuristicLab.Problems.BinPacking2D {
    3129  [Item("Packing-Ratio Rectangular Identical-Bin Evaluator", "Represents an evaluation-algorithm for rectangular-shaped bin-packing problems with identical bins which calculates the ratio between packed and unpacked space. Found in Falkenauer:1996")]
    3230  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularIdenticalBinPackingProblem.cs

    r14045 r14046  
    2020#endregion
    2121
    22 using HeuristicLab.Problems.BinPacking.Dimensions;
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    24 
    25 using HeuristicLab.Problems.BinPacking.PackingItem;
    2622using HeuristicLab.Core;
    2723using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2824using HeuristicLab.Common;
    29 using HeuristicLab.Problems.BinPacking.Evaluators;
    3025using HeuristicLab.Encodings.PermutationEncoding;
    3126using HeuristicLab.PluginInfrastructure;
     
    3631using HeuristicLab.Data;
    3732using System;
    38 using HeuristicLab.Problems.BinPacking.Shapes;
     33using HeuristicLab.Problems.BinPacking;
    3934
    40 namespace HeuristicLab.Problems.BinPacking.Problem {
     35namespace HeuristicLab.Problems.BinPacking2D {
    4136  [Item("Bin Packing Problem (2D, identical rectangles) (BPP)", "Represents a two-dimensional bin-packing problem using only bins with identical measures and bins/items with rectangular shapes.")]
    4237  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularPackingItem.cs

    r14045 r14046  
    2121
    2222
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    24 using HeuristicLab.Problems.BinPacking.Shapes;
    2523using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2624using HeuristicLab.Common;
     
    2826using HeuristicLab.Data;
    2927using HeuristicLab.Parameters;
     28using HeuristicLab.Problems.BinPacking;
    3029
    31 
    32 namespace HeuristicLab.Problems.BinPacking.PackingItem {
     30namespace HeuristicLab.Problems.BinPacking2D {
    3331  [Item("RectangularPackingItem", "Represents a rectangular packing-item for bin-packing problems.")]
    3432  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/RectangularPackingShape.cs

    r14045 r14046  
    2222
    2323using System;
    24 using HeuristicLab.Problems.BinPacking.Interfaces;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2827using HeuristicLab.Data;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Problems.BinPacking.Dimensions;
     29using HeuristicLab.Problems.BinPacking;
    3130
    32 namespace HeuristicLab.Problems.BinPacking.Shapes {
     31namespace HeuristicLab.Problems.BinPacking2D {
    3332  [Item("RectangularPackingShape", "Represents the rectangular measures (width, height) of a two-dimensional bin-packing object.")]
    3433  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/TwoDimensionalPacking.cs

    r13606 r14046  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Common;
     26using HeuristicLab.Problems.BinPacking;
    2627
    27 namespace HeuristicLab.Problems.BinPacking.Dimensions {
     28namespace HeuristicLab.Problems.BinPacking2D {
    2829  [Item("Two Dimensional Packing", "Represents a packing-position associated with a two dimensional packing-problem.")]
    2930  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/BinPacking3D.cs

    r14045 r14046  
    2222using System.Collections.Generic;
    2323using System.Linq;
    24 using HeuristicLab.Problems.BinPacking.PackingItem;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2625using HeuristicLab.Core;
    2726using HeuristicLab.Common;
    28 using HeuristicLab.Problems.BinPacking.Dimensions;
    29 using HeuristicLab.Problems.BinPacking.Shapes;
    30 
    31 namespace HeuristicLab.Encodings.PackingEncoding.PackingPlan {
     27using HeuristicLab.Encodings.PackingEncoding;
     28
     29namespace HeuristicLab.Problems.BinPacking3D {
    3230  [Item("BinPacking3D", "Represents a single-bin packing for a 3D bin-packing problem.")]
    3331  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/CuboidIdenticalBinPackingProblem.cs

    r14045 r14046  
    2020#endregion
    2121
    22 using HeuristicLab.Problems.BinPacking.Dimensions;
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    2422
    25 using HeuristicLab.Problems.BinPacking.PackingItem;
    2623using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2724using HeuristicLab.Core;
    2825using HeuristicLab.Common;
    29 using HeuristicLab.Problems.BinPacking.Evaluators;
    3026using HeuristicLab.Encodings.PermutationEncoding;
    3127using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
     
    3430using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
    3531using HeuristicLab.PluginInfrastructure;
    36 using System;
    3732using HeuristicLab.Data;
    38 using HeuristicLab.Problems.BinPacking.Shapes;
     33using HeuristicLab.Problems.BinPacking;
    3934
    40 namespace HeuristicLab.Problems.BinPacking.Problem {
     35namespace HeuristicLab.Problems.BinPacking3D {
    4136  [Item("Bin Packing Problem (3D, identical cuboids) (BPP)", "Represents a three-dimensional bin-packing problem using only bins with identical measures and bins/items with cuboidic shapes.")]
    4237  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/CuboidPackingItem.cs

    r14045 r14046  
    2020#endregion
    2121
    22 using System;
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    24 using HeuristicLab.Problems.BinPacking.Shapes;
    2522using HeuristicLab.Core;
    2623using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2825using HeuristicLab.Data;
    2926using HeuristicLab.Parameters;
     27using HeuristicLab.Problems.BinPacking;
    3028
    31 
    32 namespace HeuristicLab.Problems.BinPacking.PackingItem {
     29namespace HeuristicLab.Problems.BinPacking3D {
    3330  [Item("CuboidPackingItem", "Represents a cuboidic packing-item for bin-packing problems.")]
    3431  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/CuboidPackingShape.cs

    r14045 r14046  
    2121
    2222using System;
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    2423using HeuristicLab.Core;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2726using HeuristicLab.Data;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Problems.BinPacking.Dimensions;
     28using HeuristicLab.Problems.BinPacking;
    3029
    31 namespace HeuristicLab.Problems.BinPacking.Shapes {
     30namespace HeuristicLab.Problems.BinPacking3D {
    3231  [Item("CuboidPackingShape", "Represents the cuboid measures (width, height, depth) of a three-dimensional cuboidic bin-packing object.")]
    3332  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/DecoderInterfaces/I3DGVDecoder.cs

    r13608 r14046  
    2222
    2323using HeuristicLab.Core;
     24using HeuristicLab.Problems.BinPacking;
    2425
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     26namespace HeuristicLab.Problems.BinPacking3D {
    2627  public interface I3DGVDecoder : IOperator, IPackingSolutionDecoder {
    2728  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/DecoderInterfaces/I3DMCVDecoder.cs

    r13608 r14046  
    2222
    2323using HeuristicLab.Core;
     24using HeuristicLab.Problems.BinPacking;
    2425
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     26namespace HeuristicLab.Problems.BinPacking3D {
    2627  public interface I3DMCVDecoder : IOperator, IPackingSolutionDecoder {
    2728  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/DecoderInterfaces/I3DPSDecoder.cs

    r13608 r14046  
    2222
    2323using HeuristicLab.Core;
     24using HeuristicLab.Problems.BinPacking;
    2425
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     26namespace HeuristicLab.Problems.BinPacking3D {
    2627  public interface I3DPSDecoder : IOperator, IPackingSolutionDecoder {
    2728  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftGroupingVectorDecoder.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
     25using HeuristicLab.Common;
     26using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    2629
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
    31 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
    32 using HeuristicLab.Problems.BinPacking.Shapes;
    33 
    34 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking3D {
    3531  [Item("Identical bin, three dimensional, GroupingVector-decoder", "<Description missing...>")]
    3632  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftMultiComponentVectorDecoder.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
     25using HeuristicLab.Common;
     26using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    2629
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
    31 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
    32 using HeuristicLab.Problems.BinPacking.Shapes;
    33 
    34 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking3D {
    3531  [Item("Identical bin, three dimensional, MultiComponentVector-decoder", "<Description missing...>")]
    3632  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/DBL/DeepestBottomLeftPackingSequenceDecoder.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
    26 
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    2925using HeuristicLab.Common;
    3026using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    31 using HeuristicLab.Problems.BinPacking.Interfaces;
    32 using HeuristicLab.Problems.BinPacking.Shapes;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    3329
    34 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking3D {
    3531  [Item("Identical bin, three dimensional, PackingSequence-decoder", "<Description missing...>")]
    3632  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointGroupingVectorDecoder3D.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
     25using HeuristicLab.Common;
     26using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    2629
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
    31 using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
    32 using HeuristicLab.Problems.BinPacking.Shapes;
    33 
    34 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking3D {
    3531  [Item("Identical bin, three dimensional, extreme points based decoder for the GroupingVector encoding.", "<Description missing...>")]
    3632  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointMultiComponentVectorDecoder3D.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
     25using HeuristicLab.Common;
     26using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
     27using HeuristicLab.Problems.BinPacking;
     28using HeuristicLab.Encodings.PackingEncoding;
    2629
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
    31 using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
    32 using HeuristicLab.Problems.BinPacking.Shapes;
    33 
    34 namespace HeuristicLab.Problems.BinPacking.Decoders {
     30namespace HeuristicLab.Problems.BinPacking3D {
    3531  [Item("Identical bin, three dimensional, extreme points based decoder for the MultiComponentVector encoding.", "<Description missing...>")]
    3632  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Decoders/EP/ExtremePointPackingSequenceDecoder3D.cs

    r14045 r14046  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 
    28 using HeuristicLab.Problems.BinPacking.PackingItem;
    29 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3026using HeuristicLab.Common;
    3127using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    32 using HeuristicLab.Problems.BinPacking.Interfaces;
    33 using HeuristicLab.Problems.BinPacking.Shapes;
     28using HeuristicLab.Problems.BinPacking;
     29using HeuristicLab.Encodings.PackingEncoding;
    3430
    35 namespace HeuristicLab.Problems.BinPacking.Decoders {
     31namespace HeuristicLab.Problems.BinPacking3D {
    3632  [Item("Identical bin, three dimensional, extreme points based decoder for the PackingSequence encoding.", "<Description missing...>")]
    3733  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/I3DOperator.cs

    r13608 r14046  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     22namespace HeuristicLab.Problems.BinPacking3D {
    2323  public interface I3DOperator {
    2424  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/MoveEvaluators/PackingMoveEvaluator3DGV.cs

    r14045 r14046  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Dimensions;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
    2928
    30 using HeuristicLab.Problems.BinPacking.PackingItem;
    31 using HeuristicLab.Problems.BinPacking.Shapes;
    32 
    33 namespace HeuristicLab.Problems.BinPacking {
     29namespace HeuristicLab.Problems.BinPacking3D {
    3430  [Item("GroupingVectorMoveEvaluator3D", "Class for evaluating packing moves for 3dimensional problems.")]
    3531  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/MoveEvaluators/PackingMoveEvaluator3DMCV.cs

    r14045 r14046  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Dimensions;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
    2928
    30 using HeuristicLab.Problems.BinPacking.PackingItem;
    31 using HeuristicLab.Problems.BinPacking.Shapes;
    32 
    33 namespace HeuristicLab.Problems.BinPacking {
     29namespace HeuristicLab.Problems.BinPacking3D {
    3430  [Item("MultiComponentVectorMoveEvaluator3D", "Class for evaluating packing moves for 3dimensional problems.")]
    3531  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/MoveEvaluators/PackingMoveEvaluator3DPS.cs

    r14045 r14046  
    2525using HeuristicLab.Optimization;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Dimensions;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
    2928
    30 using HeuristicLab.Problems.BinPacking.PackingItem;
    31 using HeuristicLab.Problems.BinPacking.Shapes;
    32 
    33 namespace HeuristicLab.Problems.BinPacking {
     29namespace HeuristicLab.Problems.BinPacking3D {
    3430  [Item("PackingSequenceMoveEvaluator3D", "Class for evaluating packing moves for 3dimensional problems.")]
    3531  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/PackingPlan3D.cs

    r14045 r14046  
    11using HeuristicLab.Common;
    22using HeuristicLab.Core;
    3 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
     3using HeuristicLab.Encodings.PackingEncoding;
    44using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    5 using HeuristicLab.Problems.BinPacking.Dimensions;
    65
    7 using HeuristicLab.Problems.BinPacking.PackingItem;
    8 using HeuristicLab.Problems.BinPacking.Shapes;
    9 
    10 namespace HeuristicLab.Problems.BinPacking {
     6namespace HeuristicLab.Problems.BinPacking3D {
    117  [Item("PackingPlan3D", "Represents a solution for a 3D bin packing problem.")]
    128  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/PackingRatioCuboidIdenticalBinEvaluator.cs

    r14045 r14046  
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Common;
    25 using HeuristicLab.Problems.BinPacking.Dimensions;
     25using HeuristicLab.Problems.BinPacking;
    2626
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Problems.BinPacking.Shapes;
    29 
    30 namespace HeuristicLab.Problems.BinPacking.Evaluators {
     27namespace HeuristicLab.Problems.BinPacking3D {
    3128  [Item("Packing-Ratio Cuboid Identical-Bin Evaluator", "Represents an evaluation-algorithm for cuboid-shaped bin-packing problems with identical bins which calculates the ratio between packed and unpacked space. Found in Falkenauer:1996")]
    3229  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/Plugin.cs.frame

    r13608 r14046  
    2222using HeuristicLab.PluginInfrastructure;
    2323
    24 namespace HeuristicLab.Problems.BinPacking2D {
     24namespace HeuristicLab.Problems.BinPacking3D {
    2525  /// <summary>
    2626  /// Plugin class for HeuristicLab.Problems.BinPacking plugin.
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.3D/3.3/ThreeDimensionalPacking.cs

    r13608 r14046  
    2020#endregion
    2121
    22 using System.Text;
     22
    2323using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Common;
     26using HeuristicLab.Problems.BinPacking;
    2627
    27 namespace HeuristicLab.Problems.BinPacking.Dimensions {
     28namespace HeuristicLab.Problems.BinPacking3D {
    2829  [Item("Three Dimensional Packing", "Represents a packing-position associated with a three dimensional packing-problem.")]
    2930  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs

    r14045 r14046  
    2323using System.Windows;
    2424using System.Windows.Media;
    25 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 using HeuristicLab.Problems.BinPacking.PackingItem;
    28 using HeuristicLab.Problems.BinPacking.Shapes;
     25using HeuristicLab.Encodings.PackingEncoding;
     26using HeuristicLab.Problems.BinPacking2D;
    2927using Point = System.Windows.Point;
    3028using Size = System.Windows.Size;
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs

    r14045 r14046  
    2424using System.Windows.Input;
    2525using System.Windows.Media.Media3D;
    26 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    27 using HeuristicLab.Problems.BinPacking.Dimensions;
    28 using HeuristicLab.Problems.BinPacking.PackingItem;
    29 using HeuristicLab.Problems.BinPacking.Shapes;
     26using HeuristicLab.Encodings.PackingEncoding;
     27using HeuristicLab.Problems.BinPacking3D;
    3028
    3129namespace HeuristicLab.Problems.BinPacking.Views {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan2DView.cs

    r14045 r14046  
    2323using HeuristicLab.Core.Views;
    2424using HeuristicLab.MainForm;
    25 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    26 using HeuristicLab.Problems.BinPacking.Dimensions;
    27 
    28 using HeuristicLab.Problems.BinPacking.PackingItem;
    29 using HeuristicLab.Problems.BinPacking.Shapes;
     25using HeuristicLab.Problems.BinPacking2D;
     26using HeuristicLab.Encodings.PackingEncoding;
    3027
    3128namespace HeuristicLab.Problems.BinPacking.Views {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs

    r14045 r14046  
    2222using System;
    2323using HeuristicLab.Core.Views;
     24using HeuristicLab.Encodings.PackingEncoding;
    2425using HeuristicLab.MainForm;
    25 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    26 using HeuristicLab.Problems.BinPacking.PackingItem;
    27 
    28 using HeuristicLab.Problems.BinPacking.Dimensions;
    29 using HeuristicLab.Problems.BinPacking.Shapes;
     26using HeuristicLab.Problems.BinPacking3D;
    3027
    3128namespace HeuristicLab.Problems.BinPacking.Views {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Analyzers/BestBinPackingSolutionAnalyzer.cs

    r14045 r14046  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
     27using HeuristicLab.Encodings.PackingEncoding;
    2728using HeuristicLab.Optimization;
    2829using HeuristicLab.Parameters;
    2930using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
    31 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    32 using HeuristicLab.Problems.BinPacking.Shapes;
    33 using HeuristicLab.Problems.BinPacking.Evaluators;
    3431
    35 namespace HeuristicLab.Problems.BinPacking.Analyzers {
     32namespace HeuristicLab.Problems.BinPacking {
    3633  [Item("BestBinPackingSolutionAnalyzer", "An operator for analyzing the best solution of BinPacking Problems given in packingPlan-representation.")]
    3734  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Analyzers/BinPackingAnalyzer.cs

    r14045 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
     25using HeuristicLab.Encodings.PackingEncoding;
    2526using HeuristicLab.Operators;
    2627using HeuristicLab.Optimization;
    2728using HeuristicLab.Parameters;
    2829using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
    30 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    31 using HeuristicLab.Problems.BinPacking.Shapes;
    3230
    33 namespace HeuristicLab.Problems.BinPacking.Analyzers {
     31namespace HeuristicLab.Problems.BinPacking {
    3432  [Item("BinPackingAnalyzer", "Represents the generalized form of Analyzers for BinPacking Problems.")]
    3533  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/BinPackingProblem.cs

    r14045 r14046  
    2121
    2222using HeuristicLab.Optimization;
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    24 using HeuristicLab.Problems.BinPacking.Shapes;
    2523using HeuristicLab.Core;
    2624using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2725using HeuristicLab.Common;
    2826using HeuristicLab.Parameters;
    29 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3027using HeuristicLab.Data;
    3128using HeuristicLab.Encodings.PackingEncoding.MultiComponentVector;
    32 using HeuristicLab.Problems.BinPacking.Decoders;
    3329using HeuristicLab.PluginInfrastructure;
    3430using System.Linq;
    35 using HeuristicLab.Problems.BinPacking.Analyzers;
    3631using System;
    3732using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    3833using HeuristicLab.Encodings.PackingEncoding.GroupingVector;
    39 
    40 namespace HeuristicLab.Problems.BinPacking.Problem {
     34using HeuristicLab.Encodings.PackingEncoding;
     35
     36namespace HeuristicLab.Problems.BinPacking {
    4137  [Item("BinPackingProblem", "Abstract class that represents a BinPacking Problem")]
    4238  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorCrossover.cs

    r13032 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
     25using HeuristicLab.Problems.BinPacking;
    2626
    2727namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorDiscreteCrossover.cs

    r13032 r14046  
    2424using HeuristicLab.Encodings.IntegerVectorEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
     27
    2728
    2829namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorEncoding.cs

    r13613 r14046  
    2828using HeuristicLab.Encodings.IntegerVectorEncoding;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
     30using HeuristicLab.Problems.BinPacking;
    3131
    3232namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorManipulator.cs

    r13032 r14046  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
    2727
    2828namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/GroupingVectorSinglePointCrossover.cs

    r13032 r14046  
    2424using HeuristicLab.Encodings.IntegerVectorEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
     27
    2728
    2829namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/ChangeGrouping/ChangeGroupingMove.cs

    r13032 r14046  
    2525using HeuristicLab.Encodings.IntegerVectorEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
    2828
    2929namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
    3030  [Item("Change Grouping Move", "A move on a grouping vector that is specified by a single group-assignment-index.")]
    3131  [StorableClass]
    32   public class ChangeGroupingMove : GroupingMove, IPackingMove{
     32  public class ChangeGroupingMove : GroupingMove, IPackingMove {
    3333    [Storable]
    3434    public int Index { get; protected set; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/ChangeGrouping/ChangeGroupingMoveGenerator.cs

    r13032 r14046  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     28using HeuristicLab.Problems.BinPacking;
    2929
    3030namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMove.cs

    r13032 r14046  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
    2727
    2828namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMoveHardTabuCriterion.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMoveMaker.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
     30
    3031
    3132namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingMoveSoftTabuCriterion.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/GroupingTabuMaker.cs

    r13032 r14046  
    2525using HeuristicLab.Parameters;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
     28
    2829
    2930namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
    3031  [Item("Grouping tabu maker", "Declares a given grouping move as tabu, by adding its attributes to the tabu list and also store the solution quality or the move quality (whichever is better).")]
    3132  [StorableClass]
    32   public class GroupingTabuMaker : TabuMaker, IGroupingVectorMoveOperator{
     33  public class GroupingTabuMaker : TabuMaker, IGroupingVectorMoveOperator {
    3334    public ILookupParameter<IPackingMove> PackingMoveParameter {
    3435      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     
    4344    public GroupingTabuMaker()
    4445      : base() {
    45         Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
     46      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
    4647      Parameters.Add(new LookupParameter<GroupingVectorEncoding>("GroupingVector", "The solution to evaluate."));
    4748    }
     
    5354    protected override IItem GetTabuAttribute(bool maximization, double quality, double moveQuality) {
    5455      IPackingMove move = PackingMoveParameter.ActualValue;
    55       GroupingVectorEncoding groupingVector = GroupingVectorParameter.ActualValue;   
     56      GroupingVectorEncoding groupingVector = GroupingVectorParameter.ActualValue;
    5657      double baseQuality = moveQuality;
    57       if (maximization && quality > moveQuality || !maximization && quality < moveQuality) 
     58      if (maximization && quality > moveQuality || !maximization && quality < moveQuality)
    5859        baseQuality = quality; // we make an uphill move, the lower bound is the solution quality
    5960
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SwapGrouping/SwapGroupingMove.cs

    r13032 r14046  
    2525using HeuristicLab.Encodings.IntegerVectorEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
     28
    2829
    2930namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/GroupingVector/Moves/SwapGrouping/SwapGroupingMoveGenerator.cs

    r13032 r14046  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     28using HeuristicLab.Problems.BinPacking;
     29
    2930
    3031namespace HeuristicLab.Encodings.PackingEncoding.GroupingVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/Multi/Moves/ChangePositionMove.cs

    r13032 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
     25using HeuristicLab.Problems.BinPacking;
    2626
    2727namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/Multi/Moves/SingleGroupingMove.cs

    r13032 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
     25using HeuristicLab.Problems.BinPacking;
    2626
    2727namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/Multi/Moves/SingleItemRotationMove.cs

    r13032 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
     25using HeuristicLab.Problems.BinPacking;
    2626
    2727namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/Multi/Moves/SwapPositionMove.cs

    r13032 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
     25using HeuristicLab.Problems.BinPacking;
    2626
    2727namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/MultiComponentVectorMove.cs

    r13032 r14046  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
     27
    2728
    2829namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/MultiComponentVectorMoveGenerator.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
     30
    3031
    3132namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/MultiComponentVectorMoveHardTabuCriterion.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/MultiComponentVectorMoveMaker.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
     30
    3031
    3132namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/MultiComponentVectorMoveSoftTabuCriterion.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/MultiComponentVectorTabuMaker.cs

    r13032 r14046  
    2525using HeuristicLab.Parameters;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
     28
    2829
    2930namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
    3031  [Item("Multi component tabu maker", "Declares a given single grouping move as tabu, by adding its attributes to the tabu list and also store the solution quality or the move quality (whichever is better).")]
    3132  [StorableClass]
    32   public class MultiComponentVectorTabuMaker : TabuMaker, IMultiComponentVectorMoveOperator{
     33  public class MultiComponentVectorTabuMaker : TabuMaker, IMultiComponentVectorMoveOperator {
    3334    public ILookupParameter<IPackingMove> PackingMoveParameter {
    3435      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     
    4344    public MultiComponentVectorTabuMaker()
    4445      : base() {
    45         Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
     46      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
    4647      Parameters.Add(new LookupParameter<MultiComponentVectorEncoding>("MultiComponentVector", "The solution to evaluate."));
    4748    }
     
    5556      MultiComponentVectorEncoding solution = MultiComponentVectorParameter.ActualValue;
    5657      double baseQuality = moveQuality;
    57       if (maximization && quality > moveQuality || !maximization && quality < moveQuality) 
     58      if (maximization && quality > moveQuality || !maximization && quality < moveQuality)
    5859        baseQuality = quality; // we make an uphill move, the lower bound is the solution quality
    59                              
     60
    6061      MultiComponentVectorMove mcvMove = move as MultiComponentVectorMove;
    6162      if (mcvMove != null)
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/Moves/Triple/Moves/MCVTripleMove.cs

    r13032 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
     25using HeuristicLab.Problems.BinPacking;
    2626
    2727namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/MultiComponentVectorCrossover.cs

    r13032 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
     25using HeuristicLab.Problems.BinPacking;
     26
    2627
    2728namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
     
    3536    public MultiComponentVectorCrossover()
    3637      : base() {
    37         ParentsParameter.ActualName = "MultiComponentVector";
    38         ChildParameter.ActualName = "MultiComponentVector";
     38      ParentsParameter.ActualName = "MultiComponentVector";
     39      ChildParameter.ActualName = "MultiComponentVector";
    3940    }
    4041
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/MultiComponentVectorEncoding.cs

    r14041 r14046  
    2828using HeuristicLab.Encodings.PermutationEncoding;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
     30using HeuristicLab.Problems.BinPacking;
    3131
    3232namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/MultiComponentVector/MultiComponentVectorManipulator.cs

    r13032 r14046  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
     27
    2728
    2829namespace HeuristicLab.Encodings.PackingEncoding.MultiComponentVector {
     
    3536    public MultiComponentVectorManipulator()
    3637      : base() {
    37         EncodedSolutionParameter.ActualName = "MultiComponentVector";
     38      EncodedSolutionParameter.ActualName = "MultiComponentVector";
    3839    }
    3940
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/BinPacking.cs

    r14045 r14046  
    2222using System.Collections.Generic;
    2323using System.Linq;
    24 using HeuristicLab.Problems.BinPacking.Interfaces;
    25 using HeuristicLab.Problems.BinPacking.Shapes;
    2624using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2725using HeuristicLab.Core;
    2826using HeuristicLab.Common;
    2927using HeuristicLab.Collections;
     28using HeuristicLab.Problems.BinPacking;
    3029
    31 namespace HeuristicLab.Encodings.PackingEncoding.PackingPlan {
     30namespace HeuristicLab.Encodings.PackingEncoding {
    3231  [Item("BinPacking", "Represents a single-bin packing for a bin-packing problem.")]
    3332  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingPlans/PackingPlan.cs

    r14045 r14046  
    2323using System.Collections.Generic;
    2424using System.Linq;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
    26 using HeuristicLab.Problems.BinPacking.Shapes;
    2725using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2826using HeuristicLab.Core;
     
    3432using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
    3533using HeuristicLab.Encodings.IntegerVectorEncoding;
    36 
    37 namespace HeuristicLab.Encodings.PackingEncoding.PackingPlan {
     34using HeuristicLab.Problems.BinPacking;
     35
     36namespace HeuristicLab.Encodings.PackingEncoding {
    3837  [Item("PackingPlan", "Represents a concrete solution for a bin-packing problem.")]
    3938  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/GroupingMoveHardTabuCriterion.cs

    r13032 r14046  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
     30using HeuristicLab.Problems.BinPacking;
    3131
    3232namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
     
    8383      int length = PackingSequence.PackingSequence.Length;
    8484      double moveQuality = MoveQualityParameter.ActualValue.Value;
    85       bool maximization = MaximizationParameter.ActualValue.Value;   
     85      bool maximization = MaximizationParameter.ActualValue.Value;
    8686      bool useAspiration = UseAspirationCriterionParameter.Value.Value;
    8787      bool isTabu = IsMoveTabu(tabuList, move, PackingSequence, moveQuality, maximization, useAspiration);
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/GroupingMoveMaker.cs

    r13032 r14046  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
     30using HeuristicLab.Problems.BinPacking;
    3131
    3232namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/GroupingMoveSoftTabuCriterion.cs

    r13032 r14046  
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.BinPacking.Interfaces;
     30using HeuristicLab.Problems.BinPacking;
     31
    3132
    3233namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/InsertionMove.cs

    r13032 r14046  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     28using HeuristicLab.Problems.BinPacking;
     29
    2930
    3031namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
     
    102103        } else
    103104          if (Index1 == attr.Index1 && Index2 == attr.Index2)
    104             return true;
     105          return true;
    105106      }
    106107      return false;
     
    108109
    109110    public override string ToString() {
    110       return "IM(i1="+Index1 + ", i2=" + Index2  +")";
     111      return "IM(i1=" + Index1 + ", i2=" + Index2 + ")";
    111112    }
    112113  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Insertion/InsertionMoveGenerator.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
     30
    3031
    3132namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/SequenceMove.cs

    r13032 r14046  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
    2828
    2929namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/SequenceTabuMaker.cs

    r13032 r14046  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     28using HeuristicLab.Problems.BinPacking;
    2929
    3030namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
    3131  [Item("Sequence tabu maker", "Declares a given Sequence move as tabu, by adding its attributes to the tabu list and also store the solution quality or the move quality (whichever is better).")]
    3232  [StorableClass]
    33   public class SequenceTabuMaker : TabuMaker, IPackingSequenceMoveOperator{
     33  public class SequenceTabuMaker : TabuMaker, IPackingSequenceMoveOperator {
    3434    public ILookupParameter<IPackingMove> PackingMoveParameter {
    3535      get { return (ILookupParameter<IPackingMove>)Parameters["PackingMove"]; }
     
    4444    public SequenceTabuMaker()
    4545      : base() {
    46         Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
     46      Parameters.Add(new LookupParameter<IPackingMove>("PackingMove", "The move to evaluate."));
    4747      Parameters.Add(new LookupParameter<PackingSequenceEncoding>("PackingSequence", "The solution to evaluate."));
    4848    }
     
    5454    protected override IItem GetTabuAttribute(bool maximization, double quality, double moveQuality) {
    5555      IPackingMove move = PackingMoveParameter.ActualValue;
    56       PackingSequenceEncoding PackingSequence = PackingSequenceParameter.ActualValue;   
     56      PackingSequenceEncoding PackingSequence = PackingSequenceParameter.ActualValue;
    5757      double baseQuality = moveQuality;
    58       if (maximization && quality > moveQuality || !maximization && quality < moveQuality) 
     58      if (maximization && quality > moveQuality || !maximization && quality < moveQuality)
    5959        baseQuality = quality; // we make an uphill move, the lower bound is the solution quality
    6060
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Swap2/Swap2Move.cs

    r13032 r14046  
    2626using HeuristicLab.Encodings.PermutationEncoding;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     28using HeuristicLab.Problems.BinPacking;
     29
    2930
    3031namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/Moves/Swap2/Swap2MoveGenerator.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceCrossover.cs

    r13032 r14046  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
    2727
    2828namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceEncoding.cs

    r14038 r14046  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Encodings.PermutationEncoding;
    27 using HeuristicLab.Optimization;
    2827using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     28using HeuristicLab.Problems.BinPacking;
     29
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceInversionManipulator.cs

    r13461 r14046  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
     28
    2829
    2930namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceManipulator.cs

    r13032 r14046  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
    2828
    2929namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
     
    3636    public PackingSequenceManipulator()
    3737      : base() {
    38         EncodedSolutionParameter.ActualName = "PackingSequence";
     38      EncodedSolutionParameter.ActualName = "PackingSequence";
    3939    }
    4040
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceOrderCrossover.cs

    r13032 r14046  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
    2828
    2929namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
     
    4242    }
    4343
    44     public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2)  {
     44    public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2) {
    4545      PackingSequenceEncoding result = new PackingSequenceEncoding();
    4646      result.PackingSequence = OrderCrossover.Apply(random, parent1.PackingSequence, parent2.PackingSequence);
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequencePartiallyMatchedCrossover.cs

    r13032 r14046  
    2525using HeuristicLab.Encodings.PermutationEncoding;
    2626using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
     27using HeuristicLab.Problems.BinPacking;
     28
    2829
    2930namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
     
    4243    }
    4344
    44     public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2)  {
     45    public override PackingSequenceEncoding Cross(IRandom random, PackingSequenceEncoding parent1, PackingSequenceEncoding parent2) {
    4546      PackingSequenceEncoding result = new PackingSequenceEncoding();
    4647      result.PackingSequence = PartiallyMatchedCrossover.Apply(random, parent1.PackingSequence, parent2.PackingSequence);
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceScrambleManipulator.cs

    r13461 r14046  
    2424using HeuristicLab.Encodings.PermutationEncoding;
    2525using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Problems.BinPacking.Interfaces;
     26using HeuristicLab.Problems.BinPacking;
    2727
    2828namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
     
    3535    public PackingSequenceScrambleManipulator()
    3636      : base() {
    37         EncodedSolutionParameter.ActualName = "PackingSequence";
     37      EncodedSolutionParameter.ActualName = "PackingSequence";
    3838    }
    3939    public override IDeepCloneable Clone(Cloner cloner) {
     
    4343    protected override void Manipulate(IRandom random, PackingSequenceEncoding individual) {
    4444      ScrambleManipulator.Apply(random, individual.PackingSequence);
    45     }   
     45    }
    4646  }
    4747}
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSolutionCreator.cs

    r13032 r14046  
    2626using HeuristicLab.Parameters;
    2727using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    28 using HeuristicLab.Problems.BinPacking.Interfaces;
     28using HeuristicLab.Problems.BinPacking;
    2929
    3030namespace HeuristicLab.Encodings.PackingEncoding {
     
    4242    public PackingSolutionCreator()
    4343      : base() {
    44         Parameters.Add(new LookupParameter<IItem>("EncodedPackingSolution", "The new bin packing solution candidate."));
     44      Parameters.Add(new LookupParameter<IItem>("EncodedPackingSolution", "The new bin packing solution candidate."));
    4545    }
    4646
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSolutionCrossover.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSolutionManipulator.cs

    r13032 r14046  
    2727using HeuristicLab.Parameters;
    2828using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.Problems.BinPacking.Interfaces;
     29using HeuristicLab.Problems.BinPacking;
    3030
    3131namespace HeuristicLab.Encodings.PackingEncoding {
     
    4747    public PackingSolutionManipulator()
    4848      : base() {
    49         Parameters.Add(new LookupParameter<IPackingSolutionEncoding>("EncodedSolution", "The bin packing solution to be manipulated."));
     49      Parameters.Add(new LookupParameter<IPackingSolutionEncoding>("EncodedSolution", "The bin packing solution to be manipulated."));
    5050      Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
    5151    }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/BinUtilizationRegularIdenticalBinEvaluator.cs

    r14045 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
    26 using HeuristicLab.Problems.BinPacking.Shapes;
    2725using HeuristicLab.Data;
    2826using HeuristicLab.Common;
    29 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
     27using HeuristicLab.Encodings.PackingEncoding;
    3028
    31 namespace HeuristicLab.Problems.BinPacking.Evaluators {
     29namespace HeuristicLab.Problems.BinPacking {
    3230  [Item("Bin-Utilization Regular Identical-Bin Evaluator", "<Description missing> Found in Lee:2010")]
    3331  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/PackingPlanEvaluationAlgorithm.cs

    r14045 r14046  
    2121
    2222using System;
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    2423using HeuristicLab.Operators;
    2524using HeuristicLab.Core;
     
    2827using HeuristicLab.Data;
    2928using HeuristicLab.Parameters;
    30 using HeuristicLab.Problems.BinPacking.Shapes;
    3129
    32 namespace HeuristicLab.Problems.BinPacking.Evaluators {
     30
     31namespace HeuristicLab.Problems.BinPacking {
    3332  [Item("Packingplan Evaluation Algorithm", "Represents a composition of a decoder and an evaluator for bin-packing problems.")]
    3433  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/PackingPlanEvaluator.cs

    r14045 r14046  
    2222
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Problems.BinPacking.Interfaces;
    2524using HeuristicLab.Operators;
    2625using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2827using HeuristicLab.Parameters;
    2928using HeuristicLab.Data;
    30 using HeuristicLab.Problems.BinPacking.Shapes;
    3129
    32 namespace HeuristicLab.Problems.BinPacking.Evaluators {
     30
     31namespace HeuristicLab.Problems.BinPacking {
    3332  [Item("Packingplan Evaluator", "Represents a evaluator class for standard bin-packing problems.")]
    3433  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/PackingRatioRegularIdenticalBinEvaluator.cs

    r14045 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    25 using HeuristicLab.Problems.BinPacking.Interfaces;
    26 using HeuristicLab.Problems.BinPacking.Shapes;
    2725using HeuristicLab.Data;
    2826using HeuristicLab.Common;
    29 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
     27using HeuristicLab.Encodings.PackingEncoding;
    3028
    31 namespace HeuristicLab.Problems.BinPacking.Evaluators {
     29namespace HeuristicLab.Problems.BinPacking {
    3230  [Item("Packing-Ratio Regular Identical-Bin Evaluator", "Represents an evaluation-algorithm for regular-shaped bin-packing problems with identical bins which calculates the ratio between packed and unpacked space. Found in Falkenauer:1996")]
    3331  [StorableClass]
     
    9896
    9997      result = result / nrOfBins;
    100       return new DoubleValue (result);
     98      return new DoubleValue(result);
    10199    }
    102100  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Evaluators/RegularSimpleRotationIdenticalBinPackingPlanEvaluator.cs

    r14045 r14046  
    2121
    2222using HeuristicLab.Core;
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524using HeuristicLab.Common;
    2625using HeuristicLab.Parameters;
    27 using HeuristicLab.Problems.BinPacking.Shapes;
    2826using HeuristicLab.Collections;
    2927
    30 namespace HeuristicLab.Problems.BinPacking.Evaluators {
     28namespace HeuristicLab.Problems.BinPacking {
    3129  [Item("Regular Simple-Rotation Identical-Bin Packingplan Evaluator", "Represents a evaluator class for bin-packing problems using regular shapes and only simple rotations.")]
    3230  [StorableClass]
     
    4745    [StorableConstructor]
    4846    protected RegularSimpleRotationIdenticalBinPackingPlanEvaluator(bool deserializing) : base(deserializing) { }
    49     protected RegularSimpleRotationIdenticalBinPackingPlanEvaluator(RegularSimpleRotationIdenticalBinPackingPlanEvaluator<D,B,I> original, Cloner cloner)
     47    protected RegularSimpleRotationIdenticalBinPackingPlanEvaluator(RegularSimpleRotationIdenticalBinPackingPlanEvaluator<D, B, I> original, Cloner cloner)
    5048      : base(original, cloner) {
    5149    }
     
    6159    protected bool HasOverlappingOrNotContainedItems(ObservableDictionary<int, D> positions, B binMeasure, ItemList<I> itemMeasures, int nrOfBins) {
    6260      //TODO: Optimize performance by removing unnecessary allocations..
    63       for (int i = 0; i < itemMeasures.Count; i++ ) {
    64         I packingItem = itemMeasures [i];
     61      for (int i = 0; i < itemMeasures.Count; i++) {
     62        I packingItem = itemMeasures[i];
    6563        D currentPosition = positions[i];
    6664        if (!binMeasure.Encloses(currentPosition, packingItem))
     
    6866
    6967        for (int j = 0; j < itemMeasures.Count; j++) {
    70             D checkedPosition = positions[j];
     68          D checkedPosition = positions[j];
    7169          if (i != j && currentPosition.AssignedBin == checkedPosition.AssignedBin) {
    7270            I checkedItem = itemMeasures[j];
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/BPPData.cs

    r13032 r14046  
    2222
    2323
    24 namespace HeuristicLab.Problems.Instances {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  /// <summary>
    2626  /// Describes instances of the regular two dimensional bin packing problem (2DBPP).
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/BPPInstanceProvider.cs

    r13460 r14046  
    2828using System.Reflection;
    2929using System.Text.RegularExpressions;
    30 using System.Windows.Forms;
     30using HeuristicLab.Problems.Instances;
    3131
    32 namespace HeuristicLab.Problems.Instances.BinPacking {
     32namespace HeuristicLab.Problems.BinPacking {
    3333  public class BPPORLIBInstanceProvider : ProblemInstanceProvider<BPPData>, IProblemInstanceProvider<BPPData> {
    3434
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/BPPORLIBDataDescriptor.cs

    r13032 r14046  
    2121
    2222
    23 namespace HeuristicLab.Problems.Instances.BinPacking {
     23using HeuristicLab.Problems.Instances;
     24
     25namespace HeuristicLab.Problems.BinPacking {
    2426  internal class BPPORLIBDataDescriptor : IDataDescriptor {
    2527    public string Name { get; internal set; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/BPPORLIBParser.cs

    r13460 r14046  
    2424using System.IO;
    2525
    26 namespace HeuristicLab.Problems.Instances.BinPacking {
     26namespace HeuristicLab.Problems.BinPacking {
    2727  public class BPPORLIBParser {
    2828    public string Name { get; set; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Instances/RealBPPData.cs

    r13032 r14046  
    2222
    2323
    24 namespace HeuristicLab.Problems.Instances {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  /// <summary>
    2626  /// Describes instances of the regular two dimensional bin packing problem (2DBPP).
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IGroupingVectorMoveOperator.cs

    r13032 r14046  
    2222using HeuristicLab.Optimization;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IGroupingVectorMoveOperator : IGroupingVectorOperator, IMoveOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IGroupingVectorOperator.cs

    r13032 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IGroupingVectorOperator : IOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IMultiComponentVectorMoveOperator.cs

    r13032 r14046  
    2222using HeuristicLab.Optimization;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IMultiComponentVectorMoveOperator : IMultiComponentVectorOperator, IMoveOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IMultiComponentVectorOperator.cs

    r13032 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IMultiComponentVectorOperator : IOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingDimensions.cs

    r13605 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  // TODO: this interface should contain positions
    2626  public interface IPackingDimensions : IItem {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingItem.cs

    r13605 r14046  
    2020#endregion
    2121
    22 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     22namespace HeuristicLab.Problems.BinPacking {
    2323  // a packing item is one of the items that needs to be located in one of the packing bins (containers)
    2424  public interface IPackingItem : IPackingShape {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingMove.cs

    r13032 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces  {
     24namespace HeuristicLab.Problems.BinPacking  {
    2525  public interface IPackingMove : IItem {
    2626    IPackingSolutionEncoding GetSolutionAfterMove();
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingMoveEvaluator.cs

    r13032 r14046  
    2222using HeuristicLab.Optimization;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces  {
     24namespace HeuristicLab.Problems.BinPacking  {
    2525  public interface IPackingMoveEvaluator : ISingleObjectiveMoveEvaluator, IMoveOperator, IPackingOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingOperator.cs

    r13032 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IPackingOperator : IOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingPlan.cs

    r13605 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  // represents a packing solution (either 2d or 3d)
    2626  public interface IPackingPlan : IItem {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingPlanEvaluationAlgorithm.cs

    r13032 r14046  
    2323using HeuristicLab.Optimization;
    2424
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     25namespace HeuristicLab.Problems.BinPacking {
    2626  public interface IPackingPlanEvaluationAlgorithm : ISingleObjectiveEvaluator {
    2727    ILookupParameter<IPackingSolutionDecoder> PackingSolutionDecoderParameter { get; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingPlanEvaluator.cs

    r13032 r14046  
    2323using HeuristicLab.Optimization;
    2424
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     25namespace HeuristicLab.Problems.BinPacking {
    2626  public interface IPackingPlanEvaluator : ISingleObjectiveEvaluator {
    2727     ILookupParameter<IPackingPlan> PackingPlanParameter { get; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingSequenceMoveOperator.cs

    r13032 r14046  
    2222using HeuristicLab.Optimization;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IPackingSequenceMoveOperator : IPackingSequenceOperator, IMoveOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingSequenceOperator.cs

    r13032 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IPackingSequenceOperator : IOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingShape.cs

    r14043 r14046  
    2323using HeuristicLab.Core;
    2424
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     25namespace HeuristicLab.Problems.BinPacking {
    2626  // a packing shape represents a physical object of correct dimension (2d or 3d)
    2727  // packing bins (containers) and packing items are both packing shapes
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingSolutionCreator.cs

    r13032 r14046  
    2323using HeuristicLab.Optimization;
    2424
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     25namespace HeuristicLab.Problems.BinPacking {
    2626  public interface IPackingSolutionCreator : ISolutionCreator{
    2727    ILookupParameter<IItem> EncodedSolutionParameter { get; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingSolutionCrossover.cs

    r13032 r14046  
    2424using HeuristicLab.Optimization;
    2525
    26 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     26namespace HeuristicLab.Problems.BinPacking {
    2727  public interface IPackingSolutionCrossover : ICrossover, IPackingOperator {
    2828    ILookupParameter<IPackingSolutionEncoding> ChildParameter { get; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingSolutionDecoder.cs

    r13032 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IPackingSolutionDecoder : IOperator {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingSolutionEncoding.cs

    r13032 r14046  
    2222using HeuristicLab.Core;
    2323
    24 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     24namespace HeuristicLab.Problems.BinPacking {
    2525  public interface IPackingSolutionEncoding : IItem {
    2626  }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Interfaces/IPackingSolutionManipulator.cs

    r13032 r14046  
    2323using HeuristicLab.Optimization;
    2424
    25 namespace HeuristicLab.Problems.BinPacking.Interfaces {
     25namespace HeuristicLab.Problems.BinPacking {
    2626  public interface IPackingSolutionManipulator : IManipulator, IPackingOperator {
    2727    ILookupParameter<IPackingSolutionEncoding> EncodedSolutionParameter { get; }
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingDimensions.cs

    r13608 r14046  
    2121
    2222
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    2423using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Common;
    2726
    28 namespace HeuristicLab.Problems.BinPacking.Dimensions {
     27namespace HeuristicLab.Problems.BinPacking {
    2928  [Item("Packing Dimensions", "Represents an abstract packing-position associated with a packing-problem.")]
    3029  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingMoveEvaluator.cs

    r14045 r14046  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Data;
    25 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
     25using HeuristicLab.Encodings.PackingEncoding;
    2626using HeuristicLab.Operators;
    2727using HeuristicLab.Optimization;
    2828using HeuristicLab.Parameters;
    2929using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.Problems.BinPacking.Decoders;
    31 using HeuristicLab.Problems.BinPacking.Evaluators;
    32 using HeuristicLab.Problems.BinPacking.Interfaces;
    33 using HeuristicLab.Problems.BinPacking.Shapes;
    3430
    3531namespace HeuristicLab.Problems.BinPacking {
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingShape.cs

    r14043 r14046  
    2323using System;
    2424using System.Collections.Generic;
    25 using System.Drawing;
    2625using System.Linq;
    27 using HeuristicLab.Problems.BinPacking.Interfaces;
    2826using HeuristicLab.Core;
    2927using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3028using HeuristicLab.Common;
    3129
    32 namespace HeuristicLab.Problems.BinPacking.Shapes {
     30namespace HeuristicLab.Problems.BinPacking {
    3331  [Item("PackingShape", "Represents an abstract shape to describe the measures and the positioning of objects related to bin-packing problems.")]
    3432  [StorableClass]
  • branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingSolutionDecoder.cs

    r14045 r14046  
    2121
    2222
    23 using HeuristicLab.Problems.BinPacking.Interfaces;
    2423using HeuristicLab.Core;
    2524using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     
    2726using HeuristicLab.Operators;
    2827using HeuristicLab.Parameters;
    29 using HeuristicLab.Problems.BinPacking.Shapes;
    30 using HeuristicLab.Encodings.PackingEncoding.PackingPlan;
    3128using HeuristicLab.Data;
     29using HeuristicLab.Encodings.PackingEncoding;
    3230
    33 namespace HeuristicLab.Problems.BinPacking.Decoders {
     31namespace HeuristicLab.Problems.BinPacking {
    3432
    3533  [Item("Packing-Solution Decoder", "An operator to create a concrete bin packing solution from a given encoding-instance.")]
Note: See TracChangeset for help on using the changeset viewer.