Changeset 11327 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringProblemView.cs

Timestamp:

09/02/14 13:09:59 (10 years ago)

Author:

pfleck

Message:

#2208

• Added distance and penalty visualization for orienteering solution.
• Added Evaluate method in IOrienteeringEvaluator for evaluation of new best solutions (still need some design improvements).

File:

• branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringProblemView.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringProblemView.cs

@@ -62 +62 @@
         orienteeringSolutionView.Content = null;
       } else {
-        orienteeringSolutionView.Content = new OrienteeringSolution(
-          Content.BestKnownSolution, Content.Coordinates, Content.StartingPointParameter.Value, Content.TerminalPointParameter.Value, Content.Scores, Content.BestKnownQuality, penalty: null);
+        orienteeringSolutionView.Content = new OrienteeringSolution(Content.BestKnownSolution,
+          Content.Coordinates, Content.StartingPointParameter.Value, Content.TerminalPointParameter.Value, Content.Scores);
+        if (Content.BestKnownSolution != null) {
+          EvaluateBestSolution();
+        }
       }
     }
@@ -89 +92 @@
     private void BestKnownSolutionParameter_ValueChanged(object sender, EventArgs e) {
       orienteeringSolutionView.Content.IntegerVector = Content.BestKnownSolution;
+      if (Content.BestKnownSolution != null)
+        EvaluateBestSolution();
+      else {
+        var solution = orienteeringSolutionView.Content;
+        solution.Penalty = null;
+        solution.Distance = null;
+      }
+    }
+
+    private void EvaluateBestSolution() {
+      var evaluation = Content.Evaluator.Evaluate(Content.BestKnownSolution, Content.Scores, Content.DistanceMatrix,
+        Content.MaximumDistance, Content.PointVisitingCosts);
+      orienteeringSolutionView.Content.Quality = evaluation.Quality;
+      orienteeringSolutionView.Content.Penalty = evaluation.Penalty;
+      orienteeringSolutionView.Content.Distance = evaluation.Distance;
     }
   }