Changeset 12272 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators

Timestamp:

03/31/15 16:57:05 (10 years ago)

Author:

apolidur

Message:

#2221: Adding 2.5-opt-EEs operators to PTSP

Location:

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators

Files:

• OneShift/PTSPEstimatedInsertionEvaluator.cs (modified) (1 diff)
• TwoOpt/PTSPEstimatedInversionMovePathEvaluator.cs (modified) (1 diff)
• TwoPointFiveOpt (added)
• TwoPointFiveOpt/PTSP25MoveEvaluator.cs (added)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/OneShift/PTSPEstimatedInsertionEvaluator.cs

@@ -157 +157 @@
       }
       // return average of cost differences
-      return Math.Abs(moveQuality) / realizations.Capacity;
+      return moveQuality / realizations.Capacity;
     }
 

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoOpt/PTSPEstimatedInversionMovePathEvaluator.cs

@@ -119 +119 @@
       }
       // return average of cost differences
-      return Math.Abs(moveQuality) / realizations.Capacity;
+      return moveQuality / realizations.Capacity;
     }