Changeset 12306 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PTSP.cs
- Timestamp:
- 04/13/15 17:43:28 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PTSP.cs
r12261 r12306 40 40 [StorableClass] 41 41 public abstract class ProbabilisticTravelingSalesmanProblem : SingleObjectiveBasicProblem<PermutationEncoding>, IStorableContent, 42 IProblemInstanceConsumer< TSPData> {42 IProblemInstanceConsumer<PTSPData> { 43 43 private static readonly int DistanceMatrixSizeLimit = 1000; 44 44 … … 59 59 get { return (ValueParameter<DoubleArray>)Parameters["ProbabilityMatrix"]; } 60 60 } 61 public ValueParameter<IntValue> SampleSizeParameter {62 get { return (ValueParameter<IntValue>)Parameters[" SampleSize"]; }61 public ValueParameter<IntValue> RealizationsSizeParameter { 62 get { return (ValueParameter<IntValue>)Parameters["RealizationsSize"]; } 63 63 } 64 64 … … 86 86 set { ProbabilityMatrixParameter.Value = value; } 87 87 } 88 public IntValue SampleSize {89 get { return SampleSizeParameter.Value; }90 set { SampleSizeParameter.Value = value; }88 public IntValue RealizationsSize { 89 get { return RealizationsSizeParameter.Value; } 90 set { RealizationsSizeParameter.Value = value; } 91 91 } 92 92 #endregion … … 121 121 } 122 122 123 public virtual void Load( TSPData data) {123 public virtual void Load(PTSPData data) { 124 124 if (data.Coordinates == null && data.Distances == null) 125 125 throw new System.IO.InvalidDataException("The given instance specifies neither coordinates nor distances!"); … … 134 134 Description = data.Description; 135 135 136 // Get Probabilities of cities using random with seed from hash function on the Name of the instance 137 double[] tempMatrix = new double[data.Dimension]; 138 MersenneTwister r = new MersenneTwister((uint)data.Name.GetHashCode()); 139 for (int i = 0; i < data.Dimension; i++) { 140 tempMatrix[i] = r.NextDouble(); 141 } 142 ProbabilityMatrix = new DoubleArray(tempMatrix); 136 ProbabilityMatrix = new DoubleArray(data.Probabilities); 143 137 144 138 if (data.BestKnownTour != null) {
Note: See TracChangeset
for help on using the changeset viewer.