Changeset 11265

Timestamp:

08/04/14 15:27:43 (10 years ago)

Author:

pfleck

Message:

#2208 Improved orienteering solution view by labeling start and endpoint

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringProblemView.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyser.cs (modified) (4 diffs)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs (modified) (6 diffs)

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

@@ -58 +58 @@
         orienteeringSolutionView.Content = null;
       } else {
-        orienteeringSolutionView.Content = new OrienteeringSolution(Content.BestKnownSolution, Content.Coordinates, Content.Scores, Content.BestKnownQuality);
+        orienteeringSolutionView.Content = new OrienteeringSolution(
+          Content.BestKnownSolution, Content.Coordinates, Content.StartingPoint, Content.TerminusPoint, Content.Scores, Content.BestKnownQuality);
       }
     }

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

@@ -120 +120 @@
                 graphics.FillRectangle(Brushes.Red, points[i].X - size / 2, points[i].Y - size / 2, size, size);
               }
+
+              int startingPoint = Content.StartingPoint.Value;
+              int terminusPoint = Content.TerminusPoint.Value;
+              Font font = new Font(FontFamily.GenericSansSerif, 10, FontStyle.Regular);
+              graphics.DrawString("Begin", font, Brushes.Black, points[startingPoint].X, points[startingPoint].Y);
+              graphics.DrawString("End", font, Brushes.Black, points[terminusPoint].X, points[terminusPoint].Y);
             }
           } else {

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyser.cs

@@ -42 +42 @@
       get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
+    public ILookupParameter<IntValue> StartingPointParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["StartingPoint"]; }
+    }
+    public ILookupParameter<IntValue> TerminusPointParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["TerminusPoint"]; }
+    }
     public ILookupParameter<DoubleArray> ScoresParameter {
       get { return (ILookupParameter<DoubleArray>)Parameters["Scores"]; }
@@ -72 +78 @@
       Parameters.Add(new ScopeTreeLookupParameter<IntegerVector>("IntegerVector", "The Orienteering solutions which should be analysed."));
       Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the points."));
+      Parameters.Add(new LookupParameter<IntValue>("StartingPoint", "Index of the starting point."));
+      Parameters.Add(new LookupParameter<IntValue>("TerminusPoint", "Index of the ending point."));
       Parameters.Add(new LookupParameter<DoubleArray>("Scores", "The scores of the points."));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the Orienteering solutions which should be analyzed."));
@@ -95 +103 @@
       var solution = BestSolutionParameter.ActualValue;
       var coordinates = CoordinatesParameter.ActualValue;
+      var startingPoint = StartingPointParameter.ActualValue;
+      var terminusPoint = TerminusPointParameter.ActualValue;
       var scores = ScoresParameter.ActualValue;
       if (solution == null) {
@@ -100 +110 @@
           (IntegerVector)solutions[bestIndex].Clone(),
           coordinates,
+          startingPoint,
+          terminusPoint,
           scores,
           new DoubleValue(qualities[bestIndex].Value));

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs

@@ -38 +38 @@
           if (coordinates != null) RegisterCoordinatesEvents();
           OnCoordinatesChanged();
+        }
+      }
+    }
+    [Storable]
+    private IntValue startingPoint;
+    public IntValue StartingPoint {
+      get { return startingPoint; }
+      set {
+        if (startingPoint != value) {
+          if (startingPoint != null) DeregisterStartingPointEvents();
+          startingPoint = value;
+          if (startingPoint != null) RegisterStartingPointEvents();
+          OnStartingPointChanged();
+        }
+      }
+    }
+    [Storable]
+    private IntValue terminusPoint;
+    public IntValue TerminusPoint {
+      get { return terminusPoint; }
+      set {
+        if (terminusPoint != value) {
+          if (terminusPoint != null) DeregisterTerminusPointEvents();
+          terminusPoint = value;
+          if (terminusPoint != null) RegisterTerminusPointEvents();
+          OnTerminusPointChanged();
         }
       }
@@ -77 +103 @@
       Initialize();
     }
-    public OrienteeringSolution(IntegerVector integerVector, DoubleMatrix coordinates, DoubleArray scores, DoubleValue quality)
+    public OrienteeringSolution(IntegerVector integerVector, DoubleMatrix coordinates, IntValue startingPoint, IntValue terminusPoint,
+      DoubleArray scores, DoubleValue quality)
       : base() {
       this.integerVector = integerVector;
       this.coordinates = coordinates;
+      this.startingPoint = startingPoint;
+      this.terminusPoint = terminusPoint;
       this.scores = scores;
       this.quality = quality;
@@ -98 +127 @@
       if (integerVector != null) RegisterIntegerVectorEvents();
       if (coordinates != null) RegisterCoordinatesEvents();
+      if (startingPoint != null) RegisterStartingPointEvents();
+      if (terminusPoint != null) RegisterTerminusPointEvents();
       if (scores != null) RegisterScoresEvents();
       if (quality != null) RegisterQualityEvents();
@@ -117 +148 @@
     }
 
+    public event EventHandler StartingPointChanged;
+    private void OnStartingPointChanged() {
+      var changed = StartingPointChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
+    public event EventHandler TerminusPointChanged;
+    private void OnTerminusPointChanged() {
+      var changed = TerminusPointChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
     public event EventHandler ScoresChanged;
     private void OnScoresChanged() {
@@ -147 +192 @@
       Coordinates.Reset -= new EventHandler(Coordinates_Reset);
     }
+    private void RegisterStartingPointEvents() {
+      StartingPoint.ValueChanged += new EventHandler(StartingPoint_ValueChanged);
+    }
+    private void DeregisterStartingPointEvents() {
+      StartingPoint.ValueChanged -= new EventHandler(StartingPoint_ValueChanged);
+    }
+    private void RegisterTerminusPointEvents() {
+      TerminusPoint.ValueChanged += new EventHandler(TerminusPoint_ValueChanged);
+    }
+    private void DeregisterTerminusPointEvents() {
+      TerminusPoint.ValueChanged -= new EventHandler(TerminusPoint_ValueChanged);
+    }
     private void RegisterScoresEvents() {
       Scores.ItemChanged += new EventHandler<EventArgs<int>>(Scores_ItemChanged);
@@ -174 +231 @@
       OnCoordinatesChanged();
     }
+    private void StartingPoint_ValueChanged(object sender, EventArgs e) {
+      OnStartingPointChanged();
+    }
+    private void TerminusPoint_ValueChanged(object sender, EventArgs e) {
+      OnTerminusPointChanged();
+    }
     private void Scores_ItemChanged(object sender, EventArgs<int> e) {
       OnCoordinatesChanged();