Changeset 11327

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).

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringProblemView.cs (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.Designer.cs (modified) (13 diffs)
• HeuristicLab.Problems.Orienteering.Views/3.3/OrienteeringSolutionView.cs (modified) (5 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyser.cs (modified) (8 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs (modified) (5 diffs)
• HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringEvaluation.cs (added)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs (modified) (7 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;
     }
   }

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

@@ -54 +54 @@
       this.qualityGroupBox = new System.Windows.Forms.GroupBox();
       this.qualityViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.distanceGroupBox = new System.Windows.Forms.GroupBox();
+      this.distanceViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.penaltyGroupBox = new System.Windows.Forms.GroupBox();
+      this.penaltyViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
       this.tabControl.SuspendLayout();
@@ -64 +68 @@
       this.splitContainer.SuspendLayout();
       this.qualityGroupBox.SuspendLayout();
+      this.distanceGroupBox.SuspendLayout();
+      this.penaltyGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -75 +81 @@
       this.pictureBox.Location = new System.Drawing.Point(6, 6);
       this.pictureBox.Name = "pictureBox";
-      this.pictureBox.Size = new System.Drawing.Size(403, 322);
+      this.pictureBox.Size = new System.Drawing.Size(199, 362);
       this.pictureBox.TabIndex = 0;
       this.pictureBox.TabStop = false;
@@ -91 +97 @@
       this.tabControl.Name = "tabControl";
       this.tabControl.SelectedIndex = 0;
-      this.tabControl.Size = new System.Drawing.Size(423, 360);
+      this.tabControl.Size = new System.Drawing.Size(219, 396);
       this.tabControl.TabIndex = 0;
       // 
@@ -100 +106 @@
       this.visualizationTabPage.Name = "visualizationTabPage";
       this.visualizationTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.visualizationTabPage.Size = new System.Drawing.Size(415, 334);
+      this.visualizationTabPage.Size = new System.Drawing.Size(211, 370);
       this.visualizationTabPage.TabIndex = 0;
       this.visualizationTabPage.Text = "Visualization";
@@ -111 +117 @@
       this.valueTabPage.Name = "valueTabPage";
       this.valueTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.valueTabPage.Size = new System.Drawing.Size(415, 300);
+      this.valueTabPage.Size = new System.Drawing.Size(251, 370);
       this.valueTabPage.TabIndex = 1;
       this.valueTabPage.Text = "Value";
@@ -124 +130 @@
       this.tourGroupBox.Location = new System.Drawing.Point(6, 6);
       this.tourGroupBox.Name = "tourGroupBox";
-      this.tourGroupBox.Size = new System.Drawing.Size(403, 288);
+      this.tourGroupBox.Size = new System.Drawing.Size(239, 358);
       this.tourGroupBox.TabIndex = 0;
       this.tourGroupBox.TabStop = false;
@@ -140 +146 @@
       this.tourViewHost.Name = "tourViewHost";
       this.tourViewHost.ReadOnly = false;
-      this.tourViewHost.Size = new System.Drawing.Size(391, 263);
+      this.tourViewHost.Size = new System.Drawing.Size(227, 333);
       this.tourViewHost.TabIndex = 0;
       this.tourViewHost.ViewsLabelVisible = true;
@@ -148 +154 @@
       // 
       this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
       this.splitContainer.Location = new System.Drawing.Point(0, 0);
       this.splitContainer.Name = "splitContainer";
-      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
       // 
       // splitContainer.Panel1
       // 
       this.splitContainer.Panel1.Controls.Add(this.qualityGroupBox);
+      this.splitContainer.Panel1.Controls.Add(this.distanceGroupBox);
+      this.splitContainer.Panel1.Controls.Add(this.penaltyGroupBox);
+      this.splitContainer.Panel1.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0);
+      this.splitContainer.Panel1MinSize = 0;
       // 
       // splitContainer.Panel2
@@ -160 +170 @@
       this.splitContainer.Panel2.Controls.Add(this.tabControl);
       this.splitContainer.Size = new System.Drawing.Size(423, 402);
-      this.splitContainer.SplitterDistance = 35;
+      this.splitContainer.SplitterDistance = 200;
       this.splitContainer.TabIndex = 0;
       // 
       // qualityGroupBox
       // 
-      this.qualityGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.qualityGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.qualityGroupBox.Controls.Add(this.qualityViewHost);
       this.qualityGroupBox.Location = new System.Drawing.Point(0, 0);
       this.qualityGroupBox.Name = "qualityGroupBox";
-      this.qualityGroupBox.Size = new System.Drawing.Size(423, 32);
+      this.qualityGroupBox.Size = new System.Drawing.Size(194, 46);
       this.qualityGroupBox.TabIndex = 0;
       this.qualityGroupBox.TabStop = false;
@@ -178 +187 @@
       // qualityViewHost
       // 
-      this.qualityViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
       this.qualityViewHost.Caption = "View";
       this.qualityViewHost.Content = null;
+      this.qualityViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.qualityViewHost.Enabled = false;
-      this.qualityViewHost.Location = new System.Drawing.Point(6, 19);
+      this.qualityViewHost.Location = new System.Drawing.Point(3, 16);
       this.qualityViewHost.Name = "qualityViewHost";
       this.qualityViewHost.ReadOnly = false;
-      this.qualityViewHost.Size = new System.Drawing.Size(411, 7);
+      this.qualityViewHost.Size = new System.Drawing.Size(188, 27);
       this.qualityViewHost.TabIndex = 0;
       this.qualityViewHost.ViewsLabelVisible = true;
       this.qualityViewHost.ViewType = null;
+      // 
+      // distanceGroupBox
+      // 
+      this.distanceGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.distanceGroupBox.Controls.Add(this.distanceViewHost);
+      this.distanceGroupBox.Location = new System.Drawing.Point(0, 49);
+      this.distanceGroupBox.Name = "distanceGroupBox";
+      this.distanceGroupBox.Size = new System.Drawing.Size(194, 46);
+      this.distanceGroupBox.TabIndex = 1;
+      this.distanceGroupBox.TabStop = false;
+      this.distanceGroupBox.Text = "Distance";
+      // 
+      // distanceViewHost
+      // 
+      this.distanceViewHost.Caption = "View";
+      this.distanceViewHost.Content = null;
+      this.distanceViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.distanceViewHost.Enabled = false;
+      this.distanceViewHost.Location = new System.Drawing.Point(3, 16);
+      this.distanceViewHost.Name = "distanceViewHost";
+      this.distanceViewHost.ReadOnly = false;
+      this.distanceViewHost.Size = new System.Drawing.Size(188, 27);
+      this.distanceViewHost.TabIndex = 0;
+      this.distanceViewHost.ViewsLabelVisible = true;
+      this.distanceViewHost.ViewType = null;
+      // 
+      // penaltyGroupBox
+      // 
+      this.penaltyGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.penaltyGroupBox.Controls.Add(this.penaltyViewHost);
+      this.penaltyGroupBox.Location = new System.Drawing.Point(0, 101);
+      this.penaltyGroupBox.Name = "penaltyGroupBox";
+      this.penaltyGroupBox.Size = new System.Drawing.Size(194, 46);
+      this.penaltyGroupBox.TabIndex = 2;
+      this.penaltyGroupBox.TabStop = false;
+      this.penaltyGroupBox.Text = "Penalty";
+      // 
+      // penaltyViewHost
+      // 
+      this.penaltyViewHost.Caption = "View";
+      this.penaltyViewHost.Content = null;
+      this.penaltyViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.penaltyViewHost.Enabled = false;
+      this.penaltyViewHost.Location = new System.Drawing.Point(3, 16);
+      this.penaltyViewHost.Name = "penaltyViewHost";
+      this.penaltyViewHost.ReadOnly = false;
+      this.penaltyViewHost.Size = new System.Drawing.Size(188, 27);
+      this.penaltyViewHost.TabIndex = 0;
+      this.penaltyViewHost.ViewsLabelVisible = true;
+      this.penaltyViewHost.ViewType = null;
       // 
       // OrienteeringSolutionView
@@ -208 +267 @@
       this.splitContainer.ResumeLayout(false);
       this.qualityGroupBox.ResumeLayout(false);
+      this.distanceGroupBox.ResumeLayout(false);
+      this.penaltyGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -223 +284 @@
     private System.Windows.Forms.GroupBox qualityGroupBox;
     private HeuristicLab.MainForm.WindowsForms.ViewHost qualityViewHost;
+    private System.Windows.Forms.GroupBox distanceGroupBox;
+    private MainForm.WindowsForms.ViewHost distanceViewHost;
+    private System.Windows.Forms.GroupBox penaltyGroupBox;
+    private MainForm.WindowsForms.ViewHost penaltyViewHost;
   }
 }

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

@@ -43 +43 @@
       Content.QualityChanged -= new EventHandler(Content_QualityChanged);
       Content.PenaltyChanged -= new EventHandler(Content_PenaltyChanged);
+      Content.DistanceChanged -= new EventHandler(Content_DistanceChanged);
       Content.CoordinatesChanged -= new EventHandler(Content_CoordinatesChanged);
       Content.StartingPointChanged -= new EventHandler(Content_StartingPointChanged);
@@ -54 +55 @@
       Content.QualityChanged += new EventHandler(Content_QualityChanged);
       Content.PenaltyChanged += new EventHandler(Content_PenaltyChanged);
+      Content.DistanceChanged += new EventHandler(Content_DistanceChanged);
       Content.CoordinatesChanged += new EventHandler(Content_CoordinatesChanged);
       Content.StartingPointChanged += new EventHandler(Content_StartingPointChanged);
@@ -65 +67 @@
       if (Content == null) {
         qualityViewHost.Content = null;
+        penaltyViewHost.Content = null;
+        distanceViewHost.Content = null;
         pictureBox.Image = null;
         tourViewHost.Content = null;
       } else {
         qualityViewHost.Content = Content.Quality;
+        penaltyViewHost.Content = Content.Penalty;
+        distanceViewHost.Content = Content.Distance;
         GenerateImage();
         tourViewHost.Content = Content.IntegerVector;
@@ -77 +83 @@
       base.SetEnabledStateOfControls();
       qualityGroupBox.Enabled = Content != null;
+      penaltyGroupBox.Enabled = Content != null;
+      distanceGroupBox.Enabled = Content != null;
       pictureBox.Enabled = Content != null;
       tourGroupBox.Enabled = Content != null;
@@ -162 +170 @@
       if (InvokeRequired)
         Invoke(new EventHandler(Content_PenaltyChanged), sender, e);
-      else
-        GenerateImage();
+      else {
+        penaltyViewHost.Content = Content.Penalty;
+        GenerateImage();
+      }
+    }
+
+    private void Content_DistanceChanged(object sender, EventArgs e) {
+      if (InvokeRequired)
+        Invoke(new EventHandler(Content_DistanceChanged), sender, e);
+      else
+        distanceViewHost.Content = Content.Distance;
     }
     private void Content_CoordinatesChanged(object sender, EventArgs e) {

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

@@ -39 +39 @@
       get { return (IScopeTreeLookupParameter<IntegerVector>)Parameters["IntegerVector"]; }
     }
-    public LookupParameter<DoubleMatrix> CoordinatesParameter {
-      get { return (LookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
+    public ILookupParameter<DoubleMatrix> CoordinatesParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Coordinates"]; }
+    }
+    public ILookupParameter<DistanceMatrix> DistanceMatrixParameter {
+      get { return (ILookupParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; }
     }
     public ILookupParameter<IntValue> StartingPointParameter {
@@ -51 +54 @@
       get { return (ILookupParameter<DoubleArray>)Parameters["Scores"]; }
     }
+    public ILookupParameter<DoubleValue> PointVisitingCostsParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["PointVisitingCosts"]; }
+    }
 
-    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
+    public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
+      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public ScopeTreeLookupParameter<DoubleValue> PenaltyParameter {
-      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Penalty"]; }
+    public IScopeTreeLookupParameter<DoubleValue> PenaltyParameter {
+      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Penalty"]; }
     }
-    public LookupParameter<OrienteeringSolution> BestSolutionParameter {
-      get { return (LookupParameter<OrienteeringSolution>)Parameters["BestSolution"]; }
+    public ILookupParameter<OrienteeringSolution> BestSolutionParameter {
+      get { return (ILookupParameter<OrienteeringSolution>)Parameters["BestSolution"]; }
     }
-    public ValueLookupParameter<ResultCollection> ResultsParameter {
-      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
+    public IValueLookupParameter<ResultCollection> ResultsParameter {
+      get { return (IValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     }
-    public LookupParameter<DoubleValue> BestKnownQualityParameter {
-      get { return (LookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
+    public ILookupParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
     }
-    public LookupParameter<IntegerVector> BestKnownSolutionParameter {
-      get { return (LookupParameter<IntegerVector>)Parameters["BestKnownSolution"]; }
-    }
-    public LookupParameter<DoubleValue> BestKnownSolutionPenaltyParameter {
-      get { return (LookupParameter<DoubleValue>)Parameters["BestKnownSolutionPenalty"]; }
+    public ILookupParameter<IntegerVector> BestKnownSolutionParameter {
+      get { return (ILookupParameter<IntegerVector>)Parameters["BestKnownSolution"]; }
     }
 
@@ -84 +87 @@
       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<DistanceMatrix>("DistanceMatrix", "The matrix which contains the distances between the points."));
       Parameters.Add(new LookupParameter<IntValue>("StartingPoint", "Index of the starting point."));
       Parameters.Add(new LookupParameter<IntValue>("TerminalPoint", "Index of the ending point."));
       Parameters.Add(new LookupParameter<DoubleArray>("Scores", "The scores of the points."));
+      Parameters.Add(new LookupParameter<DoubleValue>("PointVisitingCosts", "The costs for visiting a point."));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The qualities of the Orienteering solutions which should be analyzed."));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Penalty", "The applied penalty of the Orienteering solutions."));
@@ -93 +98 @@
       Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this Orienteering instance."));
       Parameters.Add(new LookupParameter<IntegerVector>("BestKnownSolution", "The best known solution of this Orienteering instance."));
-      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownSolutionPenalty", "The penalty of the best known solution of this Orienteering instance."));
     }
 
@@ -108 +112 @@
         BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[bestIndex].Value);
         BestKnownSolutionParameter.ActualValue = (IntegerVector)solutions[bestIndex].Clone();
-        BestKnownSolutionPenaltyParameter.ActualValue = new DoubleValue(penalties[bestIndex].Value);
       }
 
@@ -116 +119 @@
       var terminalPoint = TerminalPointParameter.ActualValue;
       var scores = ScoresParameter.ActualValue;
+      var pointVisitingCosts = PointVisitingCostsParameter.ActualValue;
+      var distances = DistanceMatrixParameter.ActualValue;
+      double distance = distances.CalculateTourLength(solutions[bestIndex].ToList(), pointVisitingCosts.Value);
+
       if (solution == null) {
         solution = new OrienteeringSolution(
@@ -124 +131 @@
           scores,
           new DoubleValue(qualities[bestIndex].Value),
-          new DoubleValue(penalties[bestIndex].Value));
+          new DoubleValue(penalties[bestIndex].Value),
+          new DoubleValue(distance));
         BestSolutionParameter.ActualValue = solution;
         results.Add(new Result("Best Orienteering Solution", solution));
-        results.Add(new Result("BestKnownSolutionPenalty", solution.Penalty));
       } else {
         if (solution.Quality.Value < qualities[bestIndex].Value) {
@@ -135 +142 @@
           solution.Quality.Value = qualities[bestIndex].Value;
           solution.Penalty.Value = penalties[bestIndex].Value;
-          results["BestKnownSolutionPenalty"].Value = solution.Penalty;
+          solution.Distance.Value = distance;
         }
       }

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs

@@ -21 +21 @@
 
 using System.Linq;
-using System.Security.Permissions;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -83 +82 @@
     }
 
-    public class OrienteeringEvaluation {
-      public DoubleValue Quality;
-      public DoubleValue Penalty;
-    }
-
     public static OrienteeringEvaluation Apply(IntegerVector solution, DoubleArray scores,
-      DistanceMatrix distances, DoubleValue maximumDistance, DoubleValue pointVisitingCosts, DoubleValue distancePenaltyFactor) {
+      DistanceMatrix distances, double maximumDistance, double pointVisitingCosts, double distancePenaltyFactor) {
 
       double score = solution.Sum(t => scores[t]);
-      double distance = distances.CalculateTourLength(solution.ToList(), pointVisitingCosts.Value);
+      double distance = distances.CalculateTourLength(solution.ToList(), pointVisitingCosts);
 
-      double distanceViolation = distance - maximumDistance.Value;
+      double distanceViolation = distance - maximumDistance;
 
       double penalty = 0.0;
-      penalty += distanceViolation > 0 ? distanceViolation * distancePenaltyFactor.Value : 0;
+      penalty += distanceViolation > 0 ? distanceViolation * distancePenaltyFactor : 0;
 
       double quality = score - penalty;
@@ -103 +97 @@
       return new OrienteeringEvaluation {
         Quality = new DoubleValue(quality),
-        Penalty = new DoubleValue(penalty)
+        Penalty = new DoubleValue(penalty),
+        Distance = new DoubleValue(distance)
       };
     }
@@ -109 +104 @@
     public override IOperation InstrumentedApply() {
       var evaluation = Apply(IntegerVectorParameter.ActualValue, ScoresParameter.ActualValue,
-        DistanceMatrixParameter.ActualValue, MaximumDistanceParameter.ActualValue,
-        PointVisitingCostsParameter.ActualValue, DistancePenaltyFactorParameter.ActualValue);
+        DistanceMatrixParameter.ActualValue, MaximumDistanceParameter.ActualValue.Value,
+        PointVisitingCostsParameter.ActualValue.Value, DistancePenaltyFactorParameter.ActualValue.Value);
 
       QualityParameter.ActualValue = evaluation.Quality;
@@ -117 +112 @@
       return base.InstrumentedApply();
     }
+
+    public OrienteeringEvaluation Evaluate(IntegerVector solution, DoubleArray scores,
+      DistanceMatrix distances, double maximumDistance, double pointVisitingCosts) {
+      return Apply(solution, scores, distances, maximumDistance, pointVisitingCosts,
+        ((IValueParameter<DoubleValue>)DistancePenaltyFactorParameter).Value.Value);
+    }
   }
 }

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

@@ -85 +85 @@
     <Compile Include="Creators\GreedyOrienteeringTourCreator.cs" />
     <Compile Include="DistanceMatrix.cs" />
+    <Compile Include="OrienteeringEvaluation.cs" />
     <Compile Include="Improvers\OrienteeringLocalImprovementOperator.cs" />
     <Compile Include="Interfaces\IOrienteeringEvaluator.cs" />

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringEvaluator.cs

@@ -33 +33 @@
     ILookupParameter<DoubleValue> PointVisitingCostsParameter { get; }
     ILookupParameter<DoubleValue> PenaltyParameter { get; }
+
+    OrienteeringEvaluation Evaluate(IntegerVector solution, DoubleArray scores,
+      DistanceMatrix distances, double maximumDistance, double pointVisitingCosts);
   }
 }

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

@@ -103 +103 @@
           if (penalty != null) RegisterPenaltyEvents();
           OnPenaltyChanged();
+        }
+      }
+    }
+    [Storable]
+    private DoubleValue distance;
+    public DoubleValue Distance {
+      get { return distance; }
+      set {
+        if (distance != value) {
+          if (distance != null) DeregisterDistanceEvents();
+          distance = value;
+          if (distance != null) RegisterDistanceEvents();
+          OnDistanceChanged();
         }
       }
@@ -119 +132 @@
     }
     public OrienteeringSolution(IntegerVector integerVector, DoubleMatrix coordinates, IntValue startingPoint, IntValue terminalPoint,
-      DoubleArray scores, DoubleValue quality, DoubleValue penalty)
+      DoubleArray scores, DoubleValue quality = null, DoubleValue penalty = null, DoubleValue distance = null)
       : base() {
       this.integerVector = integerVector;
@@ -128 +141 @@
       this.quality = quality;
       this.penalty = penalty;
+      this.distance = distance;
       Initialize();
     }
@@ -148 +162 @@
       if (quality != null) RegisterQualityEvents();
       if (penalty != null) RegisterPenaltyEvents();
+      if (distance != null) RegisterDistanceEvents();
     }
 
@@ -200 +215 @@
     }
 
+    public event EventHandler DistanceChanged;
+    private void OnDistanceChanged() {
+      var changed = DistanceChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
     private void RegisterIntegerVectorEvents() {
       IntegerVector.ItemChanged += new EventHandler<EventArgs<int>>(IntegerVector_ItemChanged);
@@ -248 +270 @@
       Penalty.ValueChanged -= new EventHandler(Penalty_ValueChanged);
     }
+    private void RegisterDistanceEvents() {
+      Distance.ValueChanged += new EventHandler(Distance_ValueChanged);
+    }
+    private void DeregisterDistanceEvents() {
+      Distance.ValueChanged -= new EventHandler(Distance_ValueChanged);
+    }
 
     private void IntegerVector_ItemChanged(object sender, EventArgs<int> e) {
@@ -278 +306 @@
     private void Penalty_ValueChanged(object sender, EventArgs e) {
       OnPenaltyChanged();
+    }
+    private void Distance_ValueChanged(object sender, EventArgs e) {
+      OnDistanceChanged();
     }
     #endregion