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

Timestamp:

07/22/15 13:50:12 (9 years ago)

Author:

apolidur

Message:

#2221: Adding path Analyzers and some other fixes

Location:

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

Files:

• OneShift/PTSPEstimatedInsertionEvaluator.cs (modified) (1 diff)
• TwoOpt/PTSPEstimatedInversionEvaluator.cs (modified) (1 diff)
• TwoPointFiveOpt/PTSP25MoveEvaluator.cs (modified) (2 diffs)

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

@@ -157 +157 @@
       }
       // return average of cost differences
-      return moveQuality / realizations.Capacity;
+      return moveQuality / realizations.Count;
     }
 

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

@@ -119 +119 @@
       }
       // return average of cost differences
-      return moveQuality / realizations.Capacity;
+      return moveQuality / realizations.Count;
     }
 

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoPointFiveOpt/PTSP25MoveEvaluator.cs

@@ -175 +175 @@
       }
       // return average of cost differences
-      return moveQuality / realizations.Capacity;
+      return moveQuality / realizations.Count;
     }
     public static double EvaluateInsertionByDistanceMatrix(Permutation permutation, TwoPointFiveMove move, DistanceMatrix distanceMatrix, ItemList<ItemList<IntValue>> realizations) {
@@ -258 +258 @@
       }
       // return average of cost differences
-      return moveQuality / realizations.Capacity;
+      return moveQuality / realizations.Count;
     }
     protected double EvaluateByDistanceMatrix(Permutation permutation, DistanceMatrix distanceMatrix) {