Changeset 14064

Timestamp:

07/13/16 21:24:37 (8 years ago)

Author:

gkronber

Message:

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

Location:

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

Files:

• Encodings/PackingSequence/Encoding.cs (added)
• Encodings/PackingSequence/IPackingSequenceCreator.cs (modified) (1 diff)
• Encodings/PackingSequence/PackingSequence.cs (modified) (1 diff)
• Encodings/PackingSequence/PackingSequenceRandomCreator.cs (modified) (2 diffs)
• HeuristicLab.Problems.BinPacking-3.3.csproj (modified) (2 diffs)
• PackingSequenceProblem.cs (added)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/IPackingSequenceCreator.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Problems.BinPacking;
 
 namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
-  interface IPackingSequenceCreator : ISolutionCreator {
+  interface IPackingSequenceCreator : ISolutionCreator, IPackingSequenceOperator {
     IValueLookupParameter<IntValue> PackingItemsParameter { get; }
-    ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence> SolutionParameter { get; }
+    ILookupParameter<PackingSequence> SolutionParameter { get; }
 
   }

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequence.cs

@@ -9 +9 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.BinPacking.Encodings.PackingSequence {
+namespace HeuristicLab.Encodings.PackingEncoding.PackingSequence {
   [Item("PackingSequence", "Represents a packing sequence (permutation).")]
   [StorableClass]

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/Encodings/PackingSequence/PackingSequenceRandomCreator.cs

@@ -42 +42 @@
     }
 
-    public ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence> SolutionParameter {
-      get { return (ILookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence>)Parameters["PackingItems"]; }
+    public ILookupParameter<PackingSequence> SolutionParameter {
+      get { return (ILookupParameter<PackingSequence>)Parameters["PackingItems"]; }
     }
 
@@ -59 +59 @@
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator."));
       Parameters.Add(new ValueLookupParameter<IntValue>("PackingItems", "The number of packing-items handled in this problem instance."));
-      Parameters.Add(new LookupParameter<Problems.BinPacking.Encodings.PackingSequence.PackingSequence>("PackingSequence"));
+      Parameters.Add(new LookupParameter<PackingSequence>("PackingSequence"));
 
       SolutionParameter.ActualName = "PackingSequence";

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

@@ -216 +216 @@
     <Compile Include="Encodings\PackingPlans\BinPacking.cs" />
     <Compile Include="Encodings\PackingPlans\PackingPlan.cs" />
+    <Compile Include="Encodings\PackingSequence\Encoding.cs" />
     <Compile Include="Encodings\PackingSequence\IPackingSequenceCreator.cs" />
     <Compile Include="Encodings\PackingSequence\Moves\Insertion\ExhaustiveInsertionMoveGenerator.cs" />
@@ -280 +281 @@
     <Compile Include="PackingSolutionDecoder.cs" />
     <Compile Include="Plugin.cs" />
+    <Compile Include="PackingSequenceProblem.cs" />
     <Compile Include="Problem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />