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

Timestamp:

03/19/15 17:16:39 (10 years ago)

Author:

apolidur

Message:

#2221: Local improvement operator for VNS

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveEvaluators/TwoOpt/PTSPAnalyticalInversionMovePathEvaluator.cs (modified) (4 diffs)

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

@@ -35 +35 @@
   public class PTSPAnalyticalInversionMovePathEvaluator : PTSPPathMoveEvaluator, IPermutationInversionMoveOperator {
 
-    private static ItemList<DoubleValue> probabilities;
+    private static DoubleArray probabilities;
     private static DoubleMatrix A;
     private static DoubleMatrix B;
@@ -46 +46 @@
     }
 
-    public IValueParameter<ItemList<DoubleValue>> ProbabilitiesParameter {
-      get { return (IValueParameter<ItemList<DoubleValue>>)Parameters["Probabilities"]; }
+    public IValueParameter<DoubleArray> ProbabilitiesParameter {
+      get { return (IValueParameter<DoubleArray>)Parameters["Probabilities"]; }
     }
 
@@ -103 +103 @@
         case 1:
           if (j == i + 1) {
-            return (1/(1-probabilities[i+1].Value))*A[i,2]+(1 - probabilities[i].Value)*(A[i+1,1]-A[i+1,probabilities.Capacity-1]);
+            return (1/(1-probabilities[i+1]))*A[i,2]+(1 - probabilities[i])*(A[i+1,1]-A[i+1,probabilities.Length-1]);
           } else if (i == j) {
             return A[i,1];
           } else {
             // Equation 25
-            return ((1 - probabilities[i].Value) / (1 - probabilities[j].Value)) * RecursiveExpectedCost(1, i + 1, j - 1) + (1 - probabilities[i].Value) * (1);
+            return ((1 - probabilities[i]) / (1 - probabilities[j])) * RecursiveExpectedCost(1, i + 1, j - 1) + (1 - probabilities[i]) * (1);
           }
           
         case 2:
           if (j == i + 1) {
-            return (1 - probabilities[i + 1].Value) * (B[i, 1] - B[i, probabilities.Capacity - 1]) + (1 / (1 - probabilities[i].Value)) * (B[i + 1, 2]);
+            return (1 - probabilities[i + 1]) * (B[i, 1] - B[i, probabilities.Length - 1]) + (1 / (1 - probabilities[i])) * (B[i + 1, 2]);
           } else if (i == j) {
             return B[i,1];
@@ -123 +123 @@
         case 3:
           if (j == i + 1) {
-            return A[i, 2] + A[i + 1, 1] - A[i + 1, probabilities.Capacity - 1] + B[i, 1] - B[i, probabilities.Capacity - 1] + B[i + 1, 2];
+            return A[i, 2] + A[i + 1, 1] - A[i + 1, probabilities.Length - 1] + B[i, 1] - B[i, probabilities.Length - 1] + B[i + 1, 2];
           } else if (i == j) {
             return A[i,1]+B[i,1];