Changeset 12721 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs
- Timestamp:
- 07/10/15 16:38:17 (9 years ago)
- Location:
- branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3
- Property svn:ignore
-
old new 2 2 obj 3 3 Plugin.cs 4 *.DotSettings
-
- Property svn:ignore
-
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs
r11327 r12721 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 30 30 31 31 namespace HeuristicLab.Problems.Orienteering { 32 [Item("OrienteeringEvaluator", "Operator to evaluate a solution to the orienteering problem.")] 33 [StorableClass] 32 34 public class OrienteeringEvaluator : InstrumentedOperator, IOrienteeringEvaluator { 33 35 … … 82 84 } 83 85 84 public static OrienteeringEvaluation Apply(IntegerVector solution, DoubleArray scores,86 public static OrienteeringEvaluationResult Apply(IntegerVector solution, DoubleArray scores, 85 87 DistanceMatrix distances, double maximumDistance, double pointVisitingCosts, double distancePenaltyFactor) { 86 88 … … 95 97 double quality = score - penalty; 96 98 97 return new OrienteeringEvaluation {99 return new OrienteeringEvaluationResult { 98 100 Quality = new DoubleValue(quality), 99 101 Penalty = new DoubleValue(penalty), … … 113 115 } 114 116 115 public OrienteeringEvaluation Evaluate(IntegerVector solution, DoubleArray scores,117 public OrienteeringEvaluationResult Evaluate(IntegerVector solution, DoubleArray scores, 116 118 DistanceMatrix distances, double maximumDistance, double pointVisitingCosts) { 117 119 return Apply(solution, scores, distances, maximumDistance, pointVisitingCosts,
Note: See TracChangeset
for help on using the changeset viewer.