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

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.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -105 +105 @@
     }
 
-    public override void Analyze(ISingleObjectiveSolutionContext<IVRPEncodedSolution>[] solutionContexts, ResultCollection results, IRandom random) {
-      base.Analyze(solutionContexts, results, random);
-      var evaluations = solutionContexts.Select(x => (VRPEvaluation)x.EvaluationResult);
-
-      var bestInPop = evaluations.Select((x, index) => new { index, Eval = x }).OrderBy(x => x.Eval.Quality).First();
-      IResult bestSolutionResult;
-      if (!results.TryGetValue("Best VRP Solution", out bestSolutionResult) || !(bestSolutionResult.Value is VRPSolution)) {
-        var best = new VRPSolution(ProblemInstance, solutionContexts[bestInPop.index].EncodedSolution, (VRPEvaluation)bestInPop.Eval.Clone());
-        if (bestSolutionResult != null)
-          bestSolutionResult.Value = best;
-        else results.Add(bestSolutionResult = new Result("Best VRP Solution", best));
-      }
-
-      var bestSolution = (VRPSolution)bestSolutionResult.Value;
-      if (bestSolution == null || bestInPop.Eval.Quality < bestSolution.Evaluation.Quality) {
-        var best = new VRPSolution(ProblemInstance,
-          (IVRPEncodedSolution)solutionContexts[bestInPop.index].EncodedSolution.Clone(),
-          (VRPEvaluation)bestInPop.Eval.Clone());
-        bestSolutionResult.Value = best;
-      };
-
-      var bestValidInPop = evaluations.Select((x, index) => new { index, Eval = x }).Where(x => x.Eval.IsFeasible).OrderBy(x => x.Eval.Quality).FirstOrDefault();
-      IResult bestValidSolutionResult;
-      if (!results.TryGetValue("Best Valid VRP Solution", out bestValidSolutionResult) || !(bestValidSolutionResult.Value is VRPSolution)) {
-        var bestValid = new VRPSolution(ProblemInstance, solutionContexts[bestValidInPop.index].EncodedSolution, (VRPEvaluation)bestValidInPop.Eval.Clone());
-        if (bestValidSolutionResult != null)
-          bestValidSolutionResult.Value = bestValid;
-        else results.Add(bestValidSolutionResult = new Result("Best Valid VRP Solution", bestValid));
-      }
-
-      if (bestValidInPop != null) {
-        var bestValidSolution = (VRPSolution)bestValidSolutionResult.Value;
-        if (bestValidSolution == null || bestValidInPop.Eval.Quality < bestValidSolution.Evaluation.Quality) {
-          var best = new VRPSolution(ProblemInstance,
-            (IVRPEncodedSolution)solutionContexts[bestValidInPop.index].EncodedSolution.Clone(),
-            (VRPEvaluation)bestValidInPop.Eval.Clone());
-          bestValidSolutionResult.Value = best;
-        };
-      }
+    public override void Analyze(ISingleObjectiveSolutionContext<IVRPEncodedSolution>[] solutionContexts, IRandom random) {
+      base.Analyze(solutionContexts, random);
+
+      //TODO reimplement using results directly
+
+      //var evaluations = solutionContexts.Select(x => (VRPEvaluation)x.EvaluationResult);
+
+      //var bestInPop = evaluations.Select((x, index) => new { index, Eval = x }).OrderBy(x => x.Eval.Quality).First();
+      //IResult bestSolutionResult;
+      //if (!results.TryGetValue("Best VRP Solution", out bestSolutionResult) || !(bestSolutionResult.Value is VRPSolution)) {
+      //  var best = new VRPSolution(ProblemInstance, solutionContexts[bestInPop.index].EncodedSolution, (VRPEvaluation)bestInPop.Eval.Clone());
+      //  if (bestSolutionResult != null)
+      //    bestSolutionResult.Value = best;
+      //  else results.Add(bestSolutionResult = new Result("Best VRP Solution", best));
+      //}
+
+      //var bestSolution = (VRPSolution)bestSolutionResult.Value;
+      //if (bestSolution == null || bestInPop.Eval.Quality < bestSolution.Evaluation.Quality) {
+      //  var best = new VRPSolution(ProblemInstance,
+      //    (IVRPEncodedSolution)solutionContexts[bestInPop.index].EncodedSolution.Clone(),
+      //    (VRPEvaluation)bestInPop.Eval.Clone());
+      //  bestSolutionResult.Value = best;
+      //};
+
+      //var bestValidInPop = evaluations.Select((x, index) => new { index, Eval = x }).Where(x => x.Eval.IsFeasible).OrderBy(x => x.Eval.Quality).FirstOrDefault();
+      //IResult bestValidSolutionResult;
+      //if (!results.TryGetValue("Best Valid VRP Solution", out bestValidSolutionResult) || !(bestValidSolutionResult.Value is VRPSolution)) {
+      //  var bestValid = new VRPSolution(ProblemInstance, solutionContexts[bestValidInPop.index].EncodedSolution, (VRPEvaluation)bestValidInPop.Eval.Clone());
+      //  if (bestValidSolutionResult != null)
+      //    bestValidSolutionResult.Value = bestValid;
+      //  else results.Add(bestValidSolutionResult = new Result("Best Valid VRP Solution", bestValid));
+      //}
+
+      //if (bestValidInPop != null) {
+      //  var bestValidSolution = (VRPSolution)bestValidSolutionResult.Value;
+      //  if (bestValidSolution == null || bestValidInPop.Eval.Quality < bestValidSolution.Evaluation.Quality) {
+      //    var best = new VRPSolution(ProblemInstance,
+      //      (IVRPEncodedSolution)solutionContexts[bestValidInPop.index].EncodedSolution.Clone(),
+      //      (VRPEvaluation)bestValidInPop.Eval.Clone());
+      //    bestValidSolutionResult.Value = best;
+      //  };
+      //}
     }
 
@@ -164 +167 @@
     }
 
-    void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
+    private void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
       EvalBestKnownSolution();
     }
 
-    void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
+    private void ProblemInstance_EvaluationChanged(object sender, EventArgs e) {
       BestKnownQuality = double.NaN;
       if (BestKnownSolution != null) {
@@ -191 +194 @@
     }
 
-    void ProblemInstanceParameter_ValueChanged(object sender, EventArgs e) {
+    private void ProblemInstanceParameter_ValueChanged(object sender, EventArgs e) {
       InitializeOperators();
       AttachProblemInstanceEventHandlers();
@@ -219 +222 @@
         .Where(x => operatorTypes.Add(x)).Select(t => (IOperator)Activator.CreateInstance(t)).ToList();
       newOps.AddRange(ProblemInstance.FilterOperators(analyzers));
-      
+
       Operators.Replace(newOps);
     }