Changeset 11270

Timestamp:

08/05/14 15:52:58 (10 years ago)

Author:

pfleck

Message:

#2208 fixed dimension bug and wrong initial endpoint when loading CVPR data

File:

• branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (3 diffs)

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

@@ -303 +303 @@
       var coordinates = Coordinates;
       int dimension = coordinates.Rows;
-      var distances = DistanceMatrix;
+      var distances = new double[dimension, dimension];
       for (int i = 0; i < dimension - 1; i++) {
         for (int j = i + 1; j < dimension; j++) {
@@ -314 +314 @@
         }
       }
+      DistanceMatrix = new DistanceMatrix(distances);
     }
 
@@ -353 +354 @@
 
       StartingPoint = new IntValue(0); // Depot is interpreted as start point
-      TerminusPoint = new IntValue(0); // Last city is interpreted als end point
+      TerminusPoint = new IntValue(data.Dimension - 1); // Last city is interpreted als end point
 
       MaximumDistance = new DoubleValue(data.Capacity * 2); // capacity is interpreted as max distance