Changeset 14128 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingSequenceProblem.cs

Timestamp:

07/20/16 14:02:36 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring of bin packing implementation

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking/3.3/PackingSequenceProblem.cs (modified) (5 diffs)

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

@@ -23 +23 @@
 
 using System;
+using System.CodeDom;
 using System.Linq;
+using System.Text;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.PackingEncoding.PackingSequence;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.BinPacking;
 
-namespace HeuristicLab.Problems.BinPacking2d {
+namespace HeuristicLab.Problems.BinPacking {
   [StorableClass]
-  abstract class PackingSequenceProblem : SingleObjectiveBasicProblem<Encoding> {
+  public abstract class PackingSequenceProblem<TSolution, TEncoding> : SingleObjectiveBasicProblem<TEncoding>
+    where TSolution : class, IItem
+    where TEncoding : class, IEncoding {
 
     // persistence
@@ -43 +48 @@
 
     // cloning
-    protected PackingSequenceProblem(PackingSequenceProblem original, Cloner cloner)
+    protected PackingSequenceProblem(PackingSequenceProblem<TSolution, TEncoding> original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -53 +58 @@
     }
 
-    public sealed override double Evaluate(Individual individual, IRandom random) {
-      return Evaluate(individual.PackingSequence(), random);
-    }
-    public abstract double Evaluate(PackingSequence sequence, IRandom random);
-
-    public virtual void Analyze(PackingSequence[] trees, double[] qualities, ResultCollection results,
+    public virtual void Analyze(TSolution[] solutions, double[] qualities, ResultCollection results,
       IRandom random) {
       if (!results.ContainsKey("Best Solution Quality")) {
@@ -64 +64 @@
       }
       if (!results.ContainsKey("Best Solution")) {
-        results.Add(new Result("Best Solution", typeof(PackingSequence)));
+        results.Add(new Result("Best Solution", typeof(TSolution)));
       }
 
@@ -72 +72 @@
           IsBetter(bestQuality, ((DoubleValue)results["Best Solution Quality"].Value).Value)) {
         var bestIdx = Array.IndexOf(qualities, bestQuality);
-        var bestClone = (IItem)trees[bestIdx].Clone();
+        var bestClone = (IItem)solutions[bestIdx].Clone();
         results["Best Solution"].Value = bestClone;
         results["Best Solution Quality"].Value = new DoubleValue(bestQuality);
       }
     }
-
-    public sealed override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
-      Analyze(individuals.Select(ind => ind.PackingSequence()).ToArray(), qualities, results, random);
-    }
   }
 }