Changeset 11191

Timestamp:

07/15/14 16:14:09 (10 years ago)

Author:

pfleck

Message:

#2208 Implemented GreedyOrienteeringTourCreator

Location:

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3

Files:

• Creators (added)
• Creators/GreedyOrienteeringTourCreator.cs (added)
• Evaluators/OrienteeringEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (1 diff)
• OrienteeringProblem.cs (modified) (11 diffs)

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

@@ -34 +34 @@
     }
     public ILookupParameter<IntegerVector> SolutionParameter {
-      get { return (ILookupParameter<IntegerVector>)Parameters["Solution"]; }
+      get { return (ILookupParameter<IntegerVector>)Parameters["IntegerVector"]; }
     }
     public ILookupParameter<DoubleArray> ScoresParameter {
@@ -53 +53 @@
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The evaluated quality of the Orienteering solution."));
-      Parameters.Add(new LookupParameter<IntegerVector>("Solution", "The Orienteering Solution given in path representation."));
+      Parameters.Add(new LookupParameter<IntegerVector>("IntegerVector", "The Orienteering Solution given in path representation."));
       Parameters.Add(new LookupParameter<DoubleArray>("Scores", "The scores of the points."));
     }

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

@@ -47 +47 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestOrienteeringSolutionAnalyser.cs" />
+    <Compile Include="Creators\GreedyOrienteeringTourCreator.cs" />
     <Compile Include="DistanceMatrix.cs" />
     <Compile Include="Interfaces\IOrienteeringEvaluator.cs" />

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

@@ -22 +22 @@
 using System;
 using System.Linq;
-using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.Instances;
 
@@ -47 +47 @@
       get { return (OptionalValueParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
-    public OptionalValueParameter<DistanceMatrix> DistanceMatrixParameter {
-      get { return (OptionalValueParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; }
-    }
-    public ValueParameter<BoolValue> UseDistanceMatrixParameter {
-      get { return (ValueParameter<BoolValue>)Parameters["UseDistanceMatrix"]; }
+    public ValueParameter<DistanceMatrix> DistanceMatrixParameter {
+      get { return (ValueParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; }
     }
 
@@ -84 +81 @@
       set { DistanceMatrixParameter.Value = value; }
     }
-    public BoolValue UseDistanceMatrix {
-      get { return UseDistanceMatrixParameter.Value; }
-      set { UseDistanceMatrixParameter.Value = value; }
-    }
     public IntValue StartingPoint {
       get { return StartingPointParameter.Value; }
@@ -115 +108 @@
       get { return Operators.OfType<BestOrienteeringSolutionAnalyser>().SingleOrDefault(); }
     }
-    private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer {
-      get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().SingleOrDefault(); }
-    }
     #endregion
 
@@ -132 +122 @@
     }
     public OrienteeringProblem()
-      : base(new OrienteeringEvaluator(), new UniformRandomIntegerVectorCreator()) { // TODO: Greedy route creator for solution creator
+      : base(new OrienteeringEvaluator(), new GreedyOrienteeringTourCreator()) {
       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."));
-      Parameters.Add(new ValueParameter<BoolValue>("UseDistanceMatrix", "True if the coordinates based evaluators should calculate the distance matrix from the coordinates and use it for evaluation similar to the distance matrix evaluator, otherwise false.", new BoolValue(true)));
+      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)));
       Parameters.Add(new ValueParameter<IntValue>("TerminusPoint", "Index of the ending point.", new IntValue(0)));
@@ -182 +171 @@
       }
       ParameterizeSolutionCreator();
-      DistanceMatrix = null;
+      CalculateDistanceMatrix();
     }
     private void CoordinatesValue_ItemChanged(object sender, EventArgs<int, int> e) {
-      DistanceMatrix = null;
+      CalculateDistanceMatrix();
     }
     private void CoordinatesValue_Reset(object sender, EventArgs e) {
       ParameterizeSolutionCreator();
-      DistanceMatrix = null;
+      CalculateDistanceMatrix();
     }
     private void StartingPointParameter_ValueChanged(object sender, EventArgs e) {
@@ -245 +234 @@
 
     private void ParameterizeSolutionCreator() {
-      if (SolutionCreator is UniformRandomIntegerVectorCreator) {
-        if (SolutionCreator.LengthParameter.Value == null || SolutionCreator.LengthParameter.Value.Value != Scores.Length) {
-          SolutionCreator.LengthParameter.Value = new IntValue(Scores.Length);
-        }
+      if (SolutionCreator is GreedyOrienteeringTourCreator) {
+        var creator = (GreedyOrienteeringTourCreator)SolutionCreator;
+        creator.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
+        creator.ScoresParameter.ActualName = ScoresParameter.Name;
+        creator.MaximumDistanceParameter.ActualName = MaximumDistanceParameter.Name;
+        creator.StartingPointParameter.ActualName = StartingPointParameter.Name;
+        creator.TerminusPointParameter.ActualName = TerminusPointParameter.Name;
+        creator.FixedPenaltyParameter.ActualName = FixedPenaltyParameter.Name;
       }
     }
@@ -259 +252 @@
     }
     private void ParameterizeAnalyzer() {
-      // TODO
+      if (BestOrienteeringSolutionAnalyser != null) {
+        BestOrienteeringSolutionAnalyser.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+
+        BestOrienteeringSolutionAnalyser.IntegerVector.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        BestOrienteeringSolutionAnalyser.CoordinatesParameter.ActualName = CoordinatesParameter.Name;
+        BestOrienteeringSolutionAnalyser.ScoresParameter.ActualName = ScoresParameter.Name;
+
+        BestOrienteeringSolutionAnalyser.ResultsParameter.ActualName = "Results";
+        BestOrienteeringSolutionAnalyser.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
+        BestOrienteeringSolutionAnalyser.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
+      }
     }
     private void InitializeOperators() {
-      // TODO
+      Operators.Add(new BestOrienteeringSolutionAnalyser());
+      ParameterizeAnalyzer();
+
+      var operators = ApplicationManager.Manager.GetInstances<IIntegerVectorOperator>();
+      Operators.AddRange(operators);
+      ParameterizeOperators();
     }
     private void ParameterizeOperators() {
-      // TODO
+      //foreach (var op in Operators.OfType<IIntegerVectorManipulator>())
+      //  op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+      foreach (var op in Operators.OfType<IIntegerVectorMultiNeighborhoodShakingOperator>())
+        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+      foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>())
+        op.SolutionParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
     }
     #endregion
+
+    private void CalculateDistanceMatrix() {
+      var distances = new double[Coordinates.Rows, Coordinates.Rows];
+      for (int i = 0; i < Coordinates.Rows; i++) {
+        for (int j = 0; j < Coordinates.Rows; j++) {
+          double distanceX = Math.Abs(Coordinates[i, 0] - Coordinates[j, 0]);
+          double distanceY = Math.Abs(Coordinates[i, 1] - Coordinates[j, 1]);
+          distances[i, j] = Math.Sqrt(Math.Pow(distanceX, 2) + Math.Pow(distanceY, 2));
+        }
+      }
+      DistanceMatrix = new DistanceMatrix(distances);
+    }
 
     private void InitializeInitialOrienteeringInstance() {
@@ -277 +302 @@
         {  5.00,  5.60 }
       });
-      UseDistanceMatrix.Value = false;
+      CalculateDistanceMatrix();
 
       StartingPoint.Value = 0;
@@ -296 +321 @@
 
       Coordinates = data.Coordinates != null ? new DoubleMatrix(data.Coordinates) : null;
-      UseDistanceMatrix.Value = data.Distances != null;
-      DistanceMatrix = data.Distances != null ? new DistanceMatrix(data.Distances) : null;
+      if (Coordinates == null)
+        DistanceMatrix = new DistanceMatrix(data.Distances);
       StartingPoint = new IntValue(0);// Depot is interpreted as start and endpoint (default)
       TerminusPoint = new IntValue(0);