Changeset 17745 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling

Timestamp:

09/15/20 13:53:11 (4 years ago)

Author:

mkommend

Message:

#2971: Added first draft of results implementation and problem adaptation.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Scheduling/3.3/JobShopSchedulingProblem.cs

@@ -76 +76 @@
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
     }
-    
+
     #region Parameter Properties
     [Storable] public ReferenceParameter<ItemList<Job>> JobDataParameter { get; private set; }
@@ -159 +159 @@
     }
 
-    public override void Analyze(IScheduleSolution[] solutions, double[] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(solutions, qualities, results, random);
-
-      bool max = Maximization;
-
-      int i = -1;
-      if (!max)
-        i = qualities.Select((x, index) => new { index, x }).OrderBy(x => x.x).First().index;
-      else i = qualities.Select((x, index) => new { index, x }).OrderByDescending(x => x.x).First().index;
-
-      if (double.IsNaN(BestKnownQuality) ||
-          max && qualities[i] > BestKnownQuality ||
-          !max && qualities[i] < BestKnownQuality) {
-        BestKnownQuality = qualities[i];
-        BestKnownSolution = Encoding.Decode(solutions[i], JobData);
-      }
-      Schedule bestSolution;
-      if (results.TryGetValue("Best Scheduling Solution", out var result)) {
-        bestSolution = result.Value as Schedule;
-      } else bestSolution = null;
-
-      if (bestSolution == null || IsBetter(bestSolution.Quality, qualities[i]))
-        results.AddOrUpdateResult("Best Scheduling Solution", Encoding.Decode(solutions[i], JobData));
+    public override void Analyze(ISingleObjectiveSolutionContext<IScheduleSolution>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
+
+      //TODO: reimplement code below using results directly
+
+      //bool max = Maximization;
+
+      //int i = -1;
+      //if (!max)
+      //  i = qualities.Select((x, index) => new { index, x }).OrderBy(x => x.x).First().index;
+      //else i = qualities.Select((x, index) => new { index, x }).OrderByDescending(x => x.x).First().index;
+
+      //if (double.IsNaN(BestKnownQuality) ||
+      //    max && qualities[i] > BestKnownQuality ||
+      //    !max && qualities[i] < BestKnownQuality) {
+      //  BestKnownQuality = qualities[i];
+      //  BestKnownSolution = Encoding.Decode(solutions[i], JobData);
+      //}
+      //Schedule bestSolution;
+      //if (results.TryGetValue("Best Scheduling Solution", out var result)) {
+      //  bestSolution = result.Value as Schedule;
+      //} else bestSolution = null;
+
+      //if (bestSolution == null || IsBetter(bestSolution.Quality, qualities[i]))
+      //  results.AddOrUpdateResult("Best Scheduling Solution", Encoding.Decode(solutions[i], JobData));
     }