Changeset 12228 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

Timestamp:

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

Author:

apolidur

Message:

#2221: Local improvement operator for VNS

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs (modified) (2 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/AnalyticalPTSP.cs

@@ -66 +66 @@
       for (int i = 0; i < p.Length - 1; i++) {
         for (int j = i + 1; j < p.Length - 1; j++) {
-          double sum1 = DistanceMatrix[p[i], p[j]] * ProbabilityMatrix[p[i]].Value * ProbabilityMatrix[p[j]].Value;
+          double sum1 = DistanceMatrix[p[i], p[j]] * ProbabilityMatrix[p[i]] * ProbabilityMatrix[p[j]];
           for (int k = i + 1; k < j; k++) {
-            sum1 = sum1 * (1 - ProbabilityMatrix[p[k]].Value);
+            sum1 = sum1 * (1 - ProbabilityMatrix[p[k]]);
           }
           A[i, j - 1] = sum1;
@@ -77 +77 @@
       for (int j = 0; j < p.Length - 1; j++) {
         for (int i = 0; i < j; i++) {
-          double sum2 = DistanceMatrix[p[j], p[i]] * ProbabilityMatrix[p[i]].Value * ProbabilityMatrix[p[j]].Value;
+          double sum2 = DistanceMatrix[p[j], p[i]] * ProbabilityMatrix[p[i]] * ProbabilityMatrix[p[j]];
           for (int k = j + 1; k < p.Length - 1; k++) {
-            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]].Value);
+            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]]);
           }
           for (int k = 1; k < i; k++) {
-            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]].Value);
+            sum2 = sum2 * (1 - ProbabilityMatrix[p[k]]);
           }
           B[i, j] = sum2;