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

Timestamp:

09/19/19 20:35:46 (5 years ago)

Author:

abeham

Message:

#2521: Finished refactoring pTSP

File:

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

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

@@ -29 +29 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Parameters;
+using HeuristicLab.Problems.Instances;
 using HeuristicLab.Random;
 
@@ -189 +190 @@
     }
 
+    public override void Load(PTSPData data) {
+      base.Load(data);
+      UpdateRealizations();
+    }
+
     private void UpdateRealizations() {
       var data = new List<BoolArray>(Realizations);
-      var rng = new FastRandom(RealizationsSeed);
-      for (var i = 0; i < Realizations; i++) {
+      var rng = new MersenneTwister((uint)RealizationsSeed);
+      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.Cities];