Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/29/10 18:49:55 (15 years ago)
Author:
abeham
Message:

Renamed operators according to the underlying operation #889

Location:
trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators
Files:
8 moved

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveEuclideanPathEvaluator.cs

    r3229 r3232  
    2626namespace HeuristicLab.Problems.TravelingSalesman {
    2727  /// <summary>
    28   /// An operator to evaluate 3-opt moves.
     28  /// An operator to evaluate translocation or insertion moves (3-opt).
    2929  /// </summary>
    30   [Item("TSPThreeOptEuclideanPathMoveEvaluator", "Operator for evaluating a 3-opt move based on euclidean distances.")]
     30  [Item("TSPTranslocationMoveEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on euclidean distances.")]
    3131  [StorableClass]
    32   public class TSPThreeOptEuclideanPathMoveEvaluator : TSPThreeOptPathMoveEvaluator {
     32  public class TSPTranslocationMoveEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
    3333    public override Type EvaluatorType {
    3434      get { return typeof(TSPEuclideanPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveGeoPathEvaluator.cs

    r3229 r3232  
    2626namespace HeuristicLab.Problems.TravelingSalesman {
    2727  /// <summary>
    28   /// An operator to evaluate 3-opt moves.
     28  /// An operator to evaluate translocation or insertion moves (3-opt).
    2929  /// </summary>
    30   [Item("TSPThreeOptGeoPathMoveEvaluator", "Operator for evaluating a 3-opt move based on geo (world) distances.")]
     30  [Item("TSPTranslocationMoveGeoPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on geo (world) distances.")]
    3131  [StorableClass]
    32   public class TSPThreeOptGeoPathMoveEvaluator : TSPThreeOptPathMoveEvaluator {
     32  public class TSPTranslocationMoveGeoPathEvaluator : TSPTranslocationMovePathEvaluator {
    3333    public override Type EvaluatorType {
    3434      get { return typeof(TSPGeoPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMovePathEvaluator.cs

    r3229 r3232  
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    3131  /// <summary>
    32   /// An operator to evaluate 3-opt moves.
     32  /// An operator to evaluate a translocation or insertion move.
    3333  /// </summary>
    34   [Item("TSPThreeOptPathMoveEvaluator", "Evaluates a 3-opt move by summing up the length of all added edges and subtracting the length of all deleted edges.")]
     34  [Item("TSPTranslocationMovePathEvaluator", "Evaluates a translocation or insertion move (3-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    3535  [StorableClass]
    36   public abstract class TSPThreeOptPathMoveEvaluator : TSPPathMoveEvaluator, IThreeOptPermutationMoveOperator {
    37     public ILookupParameter<ThreeOptMove> ThreeOptMoveParameter {
    38       get { return (ILookupParameter<ThreeOptMove>)Parameters["ThreeOptMove"]; }
     36  public abstract class TSPTranslocationMovePathEvaluator : TSPPathMoveEvaluator, IPermutationTranslocationMoveOperator {
     37    public ILookupParameter<TranslocationMove> TranslocationMoveParameter {
     38      get { return (ILookupParameter<TranslocationMove>)Parameters["TranslocationMove"]; }
    3939    }
    4040
    41     public TSPThreeOptPathMoveEvaluator()
     41    public TSPTranslocationMovePathEvaluator()
    4242      : base() {
    43       Parameters.Add(new LookupParameter<ThreeOptMove>("ThreeOptMove", "The move to evaluate."));
     43      Parameters.Add(new LookupParameter<TranslocationMove>("TranslocationMove", "The move to evaluate."));
    4444    }
    4545
    4646    protected override double EvaluateByCoordinates(Permutation permutation, DoubleMatrix coordinates) {
    47       ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
     47      TranslocationMove move = TranslocationMoveParameter.ActualValue;
    4848      int edge1source = permutation.GetCircular(move.Index1 - 1);
    4949      int edge1target = permutation[move.Index1];
    … …  
    8181
    8282    protected override double EvaluateByDistanceMatrix(Permutation permutation, DoubleMatrix distanceMatrix) {
    83       ThreeOptMove move = ThreeOptMoveParameter.ActualValue;
     83      TranslocationMove move = TranslocationMoveParameter.ActualValue;
    8484      int edge1source = permutation.GetCircular(move.Index1 - 1);
    8585      int edge1target = permutation[move.Index1];

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/ThreeOpt/TSPTranslocationMoveRoundedEuclideanPathEvaluator.cs

    r3229 r3232  
    2626namespace HeuristicLab.Problems.TravelingSalesman {
    2727  /// <summary>
    28   /// An operator to evaluate 3-opt moves.
     28  /// An operator to evaluate translocation or insertion moves (3-opt).
    2929  /// </summary>
    30   [Item("TSPThreeOptRoundedEuclideanPathMoveEvaluator", "Operator for evaluating a 3-opt move based on rounded euclidean distances.")]
     30  [Item("TSPTranslocationMoveRoundedEuclideanPathEvaluator", "Operator for evaluating a translocation or insertion move (3-opt) based on rounded euclidean distances.")]
    3131  [StorableClass]
    32   public class TSPThreeOptRoundedEuclideanPathMoveEvaluator : TSPThreeOptPathMoveEvaluator {
     32  public class TSPTranslocationMoveRoundedEuclideanPathEvaluator : TSPTranslocationMovePathEvaluator {
    3333    public override Type EvaluatorType {
    3434      get { return typeof(TSPRoundedEuclideanPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveEuclideanPathEvaluator.cs

    r3229 r3232  
    2828  /// An operator to evaluate 2-opt moves.
    2929  /// </summary>
    30   [Item("TSPTwoOptEuclideanPathMoveEvaluator", "Operator for evaluating a 2-opt move based on euclidean distances.")]
     30  [Item("TSPInversionMoveEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on euclidean distances.")]
    3131  [StorableClass]
    32   public class TSPTwoOptEuclideanPathMoveEvaluator : TSPTwoOptPathMoveEvaluator {
     32  public class TSPInversionMoveEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
    3333    public override Type EvaluatorType {
    3434      get { return typeof(TSPEuclideanPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveGeoPathEvaluator.cs

    r3229 r3232  
    2626namespace HeuristicLab.Problems.TravelingSalesman {
    2727  /// <summary>
    28   /// An operator to evaluate 2-opt moves.
     28  /// An operator to evaluate inversion moves (2-opt).
    2929  /// </summary>
    30   [Item("TSPTwoOptGeoPathMoveEvaluator", "Operator for evaluating a 2-opt move based on geo (world) distances.")]
     30  [Item("TSPInversionMoveGeoPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on geo (world) distances.")]
    3131  [StorableClass]
    32   public class TSPTwoOptGeoPathMoveEvaluator : TSPTwoOptPathMoveEvaluator {
     32  public class TSPInversionMoveGeoPathEvaluator : TSPInversionMovePathEvaluator {
    3333    public override Type EvaluatorType {
    3434      get { return typeof(TSPGeoPathEvaluator); }

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMovePathEvaluator.cs

    r3229 r3232  
    3030namespace HeuristicLab.Problems.TravelingSalesman {
    3131  /// <summary>
    32   /// An operator to evaluate 2-opt moves.
     32  /// An operator to evaluate inversion moves (2-opt).
    3333  /// </summary>
    34   [Item("TSPTwoOptPathMoveEvaluator", "Evaluates a 2-opt move by summing up the length of all added edges and subtracting the length of all deleted edges.")]
     34  [Item("TSPInversionMovePathEvaluator", "Evaluates an inversion move (2-opt) by summing up the length of all added edges and subtracting the length of all deleted edges.")]
    3535  [StorableClass]
    36   public abstract class TSPTwoOptPathMoveEvaluator : TSPPathMoveEvaluator, ITwoOptPermutationMoveOperator {
    37     public ILookupParameter<TwoOptMove> TwoOptMoveParameter {
    38       get { return (ILookupParameter<TwoOptMove>)Parameters["TwoOptMove"]; }
     36  public abstract class TSPInversionMovePathEvaluator : TSPPathMoveEvaluator, IPermutationInversionMoveOperator {
     37    public ILookupParameter<InversionMove> InversionMoveParameter {
     38      get { return (ILookupParameter<InversionMove>)Parameters["InversionMove"]; }
    3939    }
    4040
    41     public TSPTwoOptPathMoveEvaluator()
     41    public TSPInversionMovePathEvaluator()
    4242      : base() {
    43       Parameters.Add(new LookupParameter<TwoOptMove>("TwoOptMove", "The move to evaluate."));
     43      Parameters.Add(new LookupParameter<InversionMove>("InversionMove", "The move to evaluate."));
    4444    }
    4545
    4646    protected override double EvaluateByCoordinates(Permutation permutation, DoubleMatrix coordinates) {
    47       TwoOptMove move = TwoOptMoveParameter.ActualValue;
     47      InversionMove move = InversionMoveParameter.ActualValue;
    4848      int edge1source = permutation.GetCircular(move.Index1 - 1);
    4949      int edge1target = permutation[move.Index1];
    … …  
    6666
    6767    protected override double EvaluateByDistanceMatrix(Permutation permutation, DoubleMatrix distanceMatrix) {
    68       TwoOptMove move = TwoOptMoveParameter.ActualValue;
     68      InversionMove move = InversionMoveParameter.ActualValue;
    6969      int edge1source = permutation.GetCircular(move.Index1 - 1);
    7070      int edge1target = permutation[move.Index1];

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TwoOpt/TSPInversionMoveRoundedEuclideanPathEvaluator.cs

    r3229 r3232  
    2626namespace HeuristicLab.Problems.TravelingSalesman {
    2727  /// <summary>
    28   /// An operator to evaluate 2-opt moves.
     28  /// An operator to evaluate inversion moves (2-opt).
    2929  /// </summary>
    30   [Item("TSPTwoOptRoundedEuclideanPathMoveEvaluator", "Operator for evaluating a 2-opt move based on rounded euclidean distances.")]
     30  [Item("TSPInversionMoveRoundedEuclideanPathEvaluator", "Operator for evaluating an inversion move (2-opt) based on rounded euclidean distances.")]
    3131  [StorableClass]
    32   public class TSPTwoOptRoundedEuclideanPathMoveEvaluator : TSPTwoOptPathMoveEvaluator {
     32  public class TSPInversionMoveRoundedEuclideanPathEvaluator : TSPInversionMovePathEvaluator {
    3333    public override Type EvaluatorType {
    3434      get { return typeof(TSPRoundedEuclideanPathEvaluator); }
Note: See TracChangeset for help on using the changeset viewer.