Free cookie consent management tool by TermsFeed Policy Generator

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

#1966: unified namespaces

Location:
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3
Files:
20 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]
Note: See TracChangeset for help on using the changeset viewer.