Changeset 11316 for branches/HeuristicLab.Problems.Orienteering

Timestamp:

08/27/14 14:08:56 (10 years ago)

Author:

pfleck

Message:

#2208

• Changed Coordinates to OptionalValueParameter so that distance matrix-only instances can be executed (but not visualized).
• Updated VNS-OP sample.

Location:

branches/HeuristicLab.Problems.Orienteering

Files:

• HeuristicLab.Optimizer/3.3/Documents/VNS_OP.hl (modified) (previous)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (3 diffs)

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

@@ -45 +45 @@
 
     #region Parameter Properties
-    public ValueParameter<DoubleMatrix> CoordinatesParameter {
-      get { return (ValueParameter<DoubleMatrix>)Parameters["Coordinates"]; }
+    public OptionalValueParameter<DoubleMatrix> CoordinatesParameter {
+      get { return (OptionalValueParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
     public ValueParameter<DistanceMatrix> DistanceMatrixParameter {
@@ -124 +124 @@
     public OrienteeringProblem()
       : base(new OrienteeringEvaluator(), new GreedyOrienteeringTourCreator()) {
-      Parameters.Add(new ValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the points."));
+      Parameters.Add(new OptionalValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the points."));
       Parameters.Add(new ValueParameter<DistanceMatrix>("DistanceMatrix", "The matrix which contains the distances between the points."));
       Parameters.Add(new ValueParameter<IntValue>("StartingPoint", "Index of the starting point.", new IntValue(0)));
@@ -301 +301 @@
     }
     private void UpdateDistanceMatrix() {
+      if (Coordinates == null) {
+        DistanceMatrix = new DistanceMatrix(0, 0);
+        return;
+      }
+
       var coordinates = Coordinates;
       int dimension = coordinates.Rows;