Changeset 12306 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

Timestamp:

04/13/15 17:43:28 (9 years ago)

Author:

apolidur

Message:

#2221: Prepared PTSP for instance input

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs (modified) (6 diffs)

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

@@ -19 +19 @@
   [StorableClass]
   public sealed class EstimatedProbabilisticTravelingSalesmanProblem : ProbabilisticTravelingSalesmanProblem, IStorableContent,
-  IProblemInstanceConsumer<TSPData> {
+  IProblemInstanceConsumer<PTSPData> {
 
-    private ItemList<ItemList<IntValue>> realizations;
+
+    #region Parameter Properties
+    public IValueParameter<ItemList<ItemList<IntValue>>> RealizationsParameter {
+      get { return (IValueParameter<ItemList<ItemList<IntValue>>>)Parameters["Realizations"]; }
+    }
+    #endregion
+
+    #region Properties
+    public ItemList<ItemList<IntValue>> Realizations {
+      get { return RealizationsParameter.Value; }
+      set { RealizationsParameter.Value = value; }
+    }
+    #endregion
 
     [StorableConstructor]
@@ -38 +50 @@
       MersenneTwister r = new MersenneTwister();
       double estimatedSum = 0;
-      for (int i = 0; i < realizations.Count; i++) {
+      for (int i = 0; i < Realizations.Count; i++) {
         int singleRealization = -1, firstNode = -1;
-        for (int j = 0; j < realizations[i].Count; j++) {
-          if (realizations[i][p[j]].Value == 1) {
+        for (int j = 0; j < Realizations[i].Count; j++) {
+          if (Realizations[i][p[j]].Value == 1) {
             if (singleRealization != -1) {
               estimatedSum += DistanceMatrix[singleRealization, p[j]];
@@ -54 +66 @@
         }
       }
-      return estimatedSum / SampleSize.Value;
+      return estimatedSum / RealizationsSize.Value;
     }
 
@@ -90 +102 @@
 
     public EstimatedProbabilisticTravelingSalesmanProblem() {
-      Parameters.Add(new ValueParameter<IntValue>("SampleSize", "Size of the sample for the estimation-based evaluation"));
+      Parameters.Add(new ValueParameter<IntValue>("RealizationsSize", "Size of the sample for the estimation-based evaluation"));
+      Parameters.Add(new ValueParameter<ItemList<ItemList<IntValue>>>("Realizations", "The concrete..."));
       Operators.Add(new PTSPEstimatedInversionMovePathEvaluator());
       Operators.Add(new PTSPEstimatedInsertionEvaluator());
@@ -134 +147 @@
     }
 
-    public override void Load(TSPData data) {
+    public override void Load(PTSPData data) {
       base.Load(data);
       // For now uses sample size of 20 but should use Student's t-test
       //Ttest(data.Dimension);
-      SampleSize = new IntValue(100);
+      RealizationsSize = new IntValue(100);
       MersenneTwister r = new MersenneTwister();
       int countOnes = 0;
-      realizations = new ItemList<ItemList<IntValue>>(SampleSize.Value);
-      for (int i = 0; i < SampleSize.Value; i++) {
+      Realizations = new ItemList<ItemList<IntValue>>(RealizationsSize.Value);
+      for (int i = 0; i < RealizationsSize.Value; i++) {
         ItemList<IntValue> newRealization = new ItemList<IntValue>();
         while (countOnes < 4) { //only generate realizations with at least 4 cities visited
@@ -157 +170 @@
         }
         countOnes = 0;
-        realizations.Add(newRealization);
+        Realizations.Add(newRealization);
       }
 
       foreach (var op in Operators.OfType<PTSPPathMoveEvaluator>()) {
-        op.RealizationsParameter.Value = realizations;
+        op.RealizationsParameter.Value = Realizations;
       }
       foreach (var op in Operators.OfType<PTSPExhaustiveInversionLocalImprovement>()) {
-        op.RealizationsParameter.Value = realizations;
+        op.RealizationsParameter.Value = Realizations;
       }
       foreach (var op in Operators.OfType<PTSP25MoveEvaluator>()) {
-        op.RealizationsParameter.Value = realizations;
+        op.RealizationsParameter.Value = Realizations;
       }