Changeset 11189 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs

Timestamp:

07/14/14 15:27:11 (10 years ago)

Author:

pfleck

Message:

#2208

• Implemented OrienteeringProblem as CVRPData ProblemInstanceInterpreter.
• Added OrienteeringProblemView.

File:

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

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

@@ -28 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.Orienteering {
@@ -36 +37 @@
   public class OrienteeringProblem
     : SingleObjectiveHeuristicOptimizationProblem<IOrienteeringEvaluator, IIntegerVectorCreator>,
-    IStorableContent {
+    IStorableContent, IProblemInstanceConsumer<CVRPData> {
 
     public string Filename { get; set; }
@@ -85 +86 @@
       set { UseDistanceMatrixParameter.Value = value; }
     }
+    public IntValue StartingPoint {
+      get { return StartingPointParameter.Value; }
+      set { StartingPointParameter.Value = value; }
+    }
+    public IntValue TerminusPoint {
+      get { return TerminusPointParameter.Value; }
+      set { TerminusPointParameter.Value = value; }
+    }
     public DoubleValue MaximumDistance {
       get { return MaximumDistanceParameter.Value; }
@@ -93 +102 @@
       set { ScoresParameter.Value = value; }
     }
+    public DoubleValue FixedPenalty {
+      get { return FixedPenaltyParameter.Value; }
+      set { FixedPenaltyParameter.Value = value; }
+    }
     public IntegerVector BestKnownSolution {
       get { return BestKnownSolutionParameter.Value; }
@@ -115 +128 @@
 
     public OrienteeringProblem()
-      : base(new OrienteeringEvaluator(), new UniformRandomIntegerVectorCreator()) {
+      : base(new OrienteeringEvaluator(), new UniformRandomIntegerVectorCreator()) { // TODO: Greedy route creator for solution creator
       Parameters.Add(new OptionalValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the points."));
       Parameters.Add(new OptionalValueParameter<DistanceMatrix>("DistanceMatrix", "The matrix which contains the distances between the points."));
@@ -197 +210 @@
       // TODO
     }
+
+    public void Load(CVRPData data) {
+      if (data.Coordinates == null && data.Distances == null)
+        throw new System.IO.InvalidDataException("The given instance specifies neither coordinates nor distances!");
+      if (data.Coordinates != null && data.Coordinates.GetLength(1) != 2)
+        throw new System.IO.InvalidDataException("The coordinates of the given instance are not in the right format, there need to be one row for each customer and two columns for the x and y coordinates.");
+
+      Name = data.Name;
+      Description = data.Description;
+
+      Coordinates = data.Coordinates != null ? new DoubleMatrix(data.Coordinates) : null;
+      UseDistanceMatrix.Value = data.Distances != null;
+      DistanceMatrix = data.Distances != null ? new DistanceMatrix(data.Distances) : null;
+      StartingPoint = new IntValue(0);// Depot is interpreted as start and endpoint (default)
+      TerminusPoint = new IntValue(0);
+
+      MaximumDistance = new DoubleValue(data.Capacity); // capacity is interpreted as max distance
+      Scores = new DoubleArray(data.Demands); // demands are interpreted as scores
+
+      BestKnownQuality = null;
+      BestKnownSolution = null;
+    }
   }
 }