Changeset 14049 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3

Timestamp:

07/12/16 20:03:45 (8 years ago)

Author:

gkronber

Message:

#1966: simplified class names

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3

Files:

• HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (2 diffs)
• PackingShape.cs (modified) (1 diff)
• Problem.cs (moved) (moved from branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/BinPackingProblem.cs) (2 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/HeuristicLab.Problems.BinPacking-3.3.csproj

@@ -160 +160 @@
     <Compile Include="Analyzers\BestBinPackingSolutionAnalyzer.cs" />
     <Compile Include="Analyzers\BinPackingAnalyzer.cs" />
-    <Compile Include="BinPackingProblem.cs" />
     <Compile Include="Encodings\GroupingVector\GroupingVectorSwap2Manipulator.cs" />
     <Compile Include="Encodings\GroupingVector\GroupingVectorSinglePointCrossover.cs" />
@@ -287 +286 @@
     <Compile Include="PackingSolutionDecoder.cs" />
     <Compile Include="Plugin.cs" />
+    <Compile Include="Problem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingShape.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.BinPacking {
-  [Item("PackingShape", "Represents an abstract shape to describe the measures and the positioning of objects related to bin-packing problems.")]
   [StorableClass]
   public abstract class PackingShape<T> : Item, IPackingShape, IParameterizedItem

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Problem.cs

@@ -35 +35 @@
 
 namespace HeuristicLab.Problems.BinPacking {
-  [Item("BinPackingProblem", "Abstract class that represents a BinPacking Problem")]
   [StorableClass]
-  public abstract class BinPackingProblem<D, B, I> : SingleObjectiveHeuristicOptimizationProblem<IPackingPlanEvaluationAlgorithm, IPackingSolutionCreator> 
+  public abstract class Problem<D, B, I> : SingleObjectiveHeuristicOptimizationProblem<IPackingPlanEvaluationAlgorithm, IPackingSolutionCreator> 
     where D : class, IPackingPosition 
     where B : PackingShape<D>, new()
@@ -92 +91 @@
 
     [StorableConstructor]
-    protected BinPackingProblem(bool deserializing) : base(deserializing) { }
-    protected BinPackingProblem(BinPackingProblem<D,B,I> original, Cloner cloner)
+    protected Problem(bool deserializing) : base(deserializing) { }
+    protected Problem(Problem<D,B,I> original, Cloner cloner)
       : base(original, cloner) {
       InitializeEventHandlers();
     }
 
-    protected BinPackingProblem(IPackingPlanEvaluationAlgorithm e) : this(e, new MultiComponentVectorRandomCreator()) { }
-
-    protected BinPackingProblem(IPackingPlanEvaluationAlgorithm e, IPackingSolutionCreator c) : base (e, c){
+    protected Problem(IPackingPlanEvaluationAlgorithm e) : this(e, new MultiComponentVectorRandomCreator()) { }
+
+    protected Problem(IPackingPlanEvaluationAlgorithm e, IPackingSolutionCreator c) : base (e, c){
       Parameters.Add(new OptionalValueParameter<PackingPlan<D, B, I>>("BestKnownSolution", "The best known solution of this bin-packing instance."));
       Parameters.Add(new ValueParameter<ItemList<I>>("PackingItemMeasures", "Packing-item data defining the measures of the different items that need to be packed.", new ItemList<I>()));