Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/10/15 16:38:17 (9 years ago)
Author:
abeham
Message:

#2208:

  • Added missing license headers
  • Updates copyright year
  • Renamed analyzer (us spelling)
  • Removed script
  • Implemented samples unit test
  • Changed solution view to use horizontal splitting, removed viewhosts
  • Updated instance provider to use .NET45 zip compression
  • Restructuring and reformatting
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  
        22obj
        33Plugin.cs
         4*.DotSettings

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

    r11327 r12721  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3030
    3131namespace HeuristicLab.Problems.Orienteering {
     32  [Item("OrienteeringEvaluator", "Operator to evaluate a solution to the orienteering problem.")]
     33  [StorableClass]
    3234  public class OrienteeringEvaluator : InstrumentedOperator, IOrienteeringEvaluator {
    3335
    … …  
    8284    }
    8385
    84     public static OrienteeringEvaluation Apply(IntegerVector solution, DoubleArray scores,
     86    public static OrienteeringEvaluationResult Apply(IntegerVector solution, DoubleArray scores,
    8587      DistanceMatrix distances, double maximumDistance, double pointVisitingCosts, double distancePenaltyFactor) {
    8688
    … …  
    9597      double quality = score - penalty;
    9698
    97       return new OrienteeringEvaluation {
     99      return new OrienteeringEvaluationResult {
    98100        Quality = new DoubleValue(quality),
    99101        Penalty = new DoubleValue(penalty),
    … …  
    113115    }
    114116
    115     public OrienteeringEvaluation Evaluate(IntegerVector solution, DoubleArray scores,
     117    public OrienteeringEvaluationResult Evaluate(IntegerVector solution, DoubleArray scores,
    116118      DistanceMatrix distances, double maximumDistance, double pointVisitingCosts) {
    117119      return Apply(solution, scores, distances, maximumDistance, pointVisitingCosts,
Note: See TracChangeset for help on using the changeset viewer.