Changeset 11321

Timestamp:

09/01/14 12:15:49 (10 years ago)

Author:

pfleck

Message:

#2208

• Added IOrienteeringEvaluator interface
• Defined parameters in IOrienteeringEvaluator

Location:

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

Files:

• Creators/GreedyOrienteeringTourCreator.cs (modified) (1 diff)
• HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (1 diff)
• Interfaces/IOrienteeringEvaluator.cs (modified) (1 diff)
• Interfaces/IOrienteeringSolutionCreator.cs (added)
• OrienteeringProblem.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs

@@ -36 +36 @@
 points from this list at the first position in which they can feasibly be inserted. (Schilde et. al. 2009)")]
   [StorableClass]
-  public sealed class GreedyOrienteeringTourCreator : IntegerVectorCreator {
+  public sealed class GreedyOrienteeringTourCreator : IntegerVectorCreator, IOrienteeringSolutionCreator {
     public override bool CanChangeName { get { return false; } }
 

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

@@ -88 +88 @@
     <Compile Include="Interfaces\IOrienteeringEvaluator.cs" />
     <Compile Include="Evaluators\OrienteeringEvaluator.cs" />
+    <Compile Include="Interfaces\IOrienteeringSolutionCreator.cs" />
     <Compile Include="OrienteeringProblem.cs" />
     <Compile Include="OrienteeringScript.cs" />

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Problems.Orienteering {
-  public interface IOrienteeringEvaluator : ISingleObjectiveEvaluator { }
+  public interface IOrienteeringEvaluator : ISingleObjectiveEvaluator {
+    ILookupParameter<IntegerVector> IntegerVectorParameter { get; }
+    ILookupParameter<DoubleArray> ScoresParameter { get; }
+    ILookupParameter<DistanceMatrix> DistanceMatrixParameter { get; }
+    ILookupParameter<DoubleValue> MaximumDistanceParameter { get; }
+    ILookupParameter<DoubleValue> PointVisitingCostsParameter { get; }
+    ILookupParameter<DoubleValue> PenaltyParameter { get; }
+  }
 }

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

@@ -39 +39 @@
   [StorableClass]
   public sealed class OrienteeringProblem
-    : SingleObjectiveHeuristicOptimizationProblem<IOrienteeringEvaluator, IIntegerVectorCreator>,
+    : SingleObjectiveHeuristicOptimizationProblem<IOrienteeringEvaluator, IOrienteeringSolutionCreator>,
     IStorableContent, IProblemInstanceConsumer<OPData>, IProblemInstanceConsumer<TSPData>, IProblemInstanceConsumer<CVRPData> {
 
@@ -235 +235 @@
 
     private void ParameterizeSolutionCreator() {
-      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.TerminalPointParameter.ActualName = TerminalPointParameter.Name;
-        creator.PointVisitingCostsParameter.ActualName = PointVisitingCostsParameter.Name;
-      }
+      SolutionCreator.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
+      SolutionCreator.ScoresParameter.ActualName = ScoresParameter.Name;
+      SolutionCreator.MaximumDistanceParameter.ActualName = MaximumDistanceParameter.Name;
+      SolutionCreator.StartingPointParameter.ActualName = StartingPointParameter.Name;
+      SolutionCreator.TerminalPointParameter.ActualName = TerminalPointParameter.Name;
+      SolutionCreator.PointVisitingCostsParameter.ActualName = PointVisitingCostsParameter.Name;
     }
     private void ParameterizeEvaluator() {
-      if (Evaluator is OrienteeringEvaluator) {
-        var evaluator = (OrienteeringEvaluator)Evaluator;
-        evaluator.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-        evaluator.ScoresParameter.ActualName = ScoresParameter.Name;
-      }
+      Evaluator.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+      Evaluator.ScoresParameter.ActualName = ScoresParameter.Name;
+      Evaluator.DistanceMatrixParameter.ActualName = DistanceMatrixParameter.Name;
+      Evaluator.MaximumDistanceParameter.ActualName = MaximumDistanceParameter.Name;
+      Evaluator.PointVisitingCostsParameter.ActualName = PointVisitingCostsParameter.Name;
     }
     private void ParameterizeAnalyzer() {