Changeset 17533 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

Timestamp:

05/08/20 16:55:51 (4 years ago)

Author:

abeham

Message:

#2521: Unified architecture

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

@@ -119 +119 @@
       foreach (var r in realizations) {
         int singleRealization = -1, firstNode = -1;
-        for (var j = 0; j < data.TSPData.Cities; j++) {
+        for (var j = 0; j < data.Cities; j++) {
           if (r[tour[j]]) {
             if (singleRealization != -1) {
-              estimatedSum += data.TSPData.GetDistance(singleRealization, tour[j]);
+              estimatedSum += data.GetDistance(singleRealization, tour[j]);
             } else {
               firstNode = tour[j];
@@ -130 +130 @@
         }
         if (singleRealization != -1)
-          estimatedSum += data.TSPData.GetDistance(singleRealization, firstNode);
+          estimatedSum += data.GetDistance(singleRealization, firstNode);
         count++;
       }
@@ -153 +153 @@
         var pSum = 0.0;
         int singleRealization = -1, firstNode = -1;
-        for (var j = 0; j < data.TSPData.Cities; j++) {
+        for (var j = 0; j < data.Cities; j++) {
           if (r[tour[j]]) {
             if (singleRealization != -1) {
-              pSum += data.TSPData.GetDistance(singleRealization, tour[j]);
+              pSum += data.GetDistance(singleRealization, tour[j]);
             } else {
               firstNode = tour[j];
@@ -164 +164 @@
         }
         if (singleRealization != -1) {
-          pSum += data.TSPData.GetDistance(singleRealization, firstNode);
+          pSum += data.GetDistance(singleRealization, firstNode);
         }
         estimatedSum += pSum;
@@ -201 +201 @@
       var data = new List<BoolArray>(Realizations);
       var rng = new MersenneTwister((uint)RealizationsSeed);
-      if (Enumerable.Range(0, ProbabilisticTSPData.TSPData.Cities).All(c => ProbabilisticTSPData.GetProbability(c) <= 0))
+      if (Enumerable.Range(0, ProbabilisticTSPData.Cities).All(c => ProbabilisticTSPData.GetProbability(c) <= 0))
         throw new InvalidOperationException("All probabilities are zero.");
       while (data.Count < Realizations) {
         var cities = 0;
-        var r = new bool[ProbabilisticTSPData.TSPData.Cities];
-        for (var j = 0; j < ProbabilisticTSPData.TSPData.Cities; j++) {
+        var r = new bool[ProbabilisticTSPData.Cities];
+        for (var j = 0; j < ProbabilisticTSPData.Cities; j++) {
           if (rng.NextDouble() < ProbabilisticTSPData.GetProbability(j)) {
             r[j] = true;