Changeset 11314 for branches/HeuristicLab.Problems.Orienteering

Timestamp:

08/27/14 13:28:18 (10 years ago)

Author:

pfleck

Message:

#2208

• Uses average distance as maximum distance when interpreting VRP as OP.
• Add offset to "Begin" label position in visualization so that it does not overlap with the "End" label when start- and endpoint are the same.

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (1 diff)

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

@@ -130 +130 @@
                 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);
+              var beginSize = graphics.MeasureString("Begin", font);
+              graphics.DrawString("Begin", font, Brushes.Black, points[startingPoint].X - beginSize.Width, points[startingPoint].Y - beginSize.Height);
               graphics.DrawString("End", font, Brushes.Black, points[terminusPoint].X, points[terminusPoint].Y);
             }

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

@@ -383 +383 @@
       TerminusPoint = new IntValue(data.Dimension - 1); // Last city is interpreted als end point
 
-      MaximumDistance = new DoubleValue(DistanceMatrix[0, data.Dimension - 1] * 10.0); // distance from start to end first to last city is interpreted as maximum distance
+      MaximumDistance = new DoubleValue(DistanceMatrix.Average() * 5.0); // distance from start to end first to last city is interpreted as maximum distance
       Scores = new DoubleArray(Enumerable.Repeat(1.0, data.Dimension).ToArray()); // all scores are 1
     }