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

Timestamp:

05/04/15 18:30:26 (9 years ago)

Author:

apolidur

Message:

#2221: Small refactoring and code cleaning

File:

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

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

@@ -104 +104 @@
       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 PTSPEstimatedInversionEvaluator());
       Operators.Add(new PTSPEstimatedInsertionEvaluator());
       Operators.Add(new PTSPExhaustiveInversionLocalImprovement());
@@ -121 +121 @@
     }
 
-    private int Ttest(int ProblemSize) {
-      MersenneTwister random = new MersenneTwister();
-      Permutation p1 = new Permutation(PermutationTypes.RelativeUndirected, ProblemSize, random);
-      Permutation p2 = new Permutation(PermutationTypes.RelativeUndirected, ProblemSize, random);
-      ItemList<ItemList<IntValue>> realizations = new ItemList<ItemList<IntValue>>();
-      int index = -1;
-      while (true) {
-        for (int i = index+1; i < index+5; i++) {
-          realizations.Add(new ItemList<IntValue>());
-          for (int j = 0; j < ProblemSize; j++) {
-            if (ProbabilityMatrix[j] > random.NextDouble()) {
-              realizations.ElementAt(i).Add(new IntValue(1));
-            } else {
-              realizations.ElementAt(i).Add(new IntValue(0));
-            }
-          }
-        }
-        index += 4;
-        double[] eval1 = EvaluateWithParams(DistanceMatrix, ProbabilityMatrix, realizations, p1);
-        double[] eval2 = EvaluateWithParams(DistanceMatrix, ProbabilityMatrix, realizations, p2);
-        double sx1x2 = Math.Sqrt((eval1[1]+eval2[1])/2);
-        int degrees = 2 * realizations.Count - 2;
-        double t = (eval1[0]-eval2[0])/(sx1x2*Math.Sqrt(2.0/(double)realizations.Count));
-      }
-    }
-
     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);
       RealizationsSize = new IntValue(100);
       MersenneTwister r = new MersenneTwister();
+
+      // TODO : This should be made in another function and attached to a listener
       int countOnes = 0;
       Realizations = new ItemList<ItemList<IntValue>>(RealizationsSize.Value);
@@ -173 +147 @@
       }
 
-      foreach (var op in Operators.OfType<PTSPPathMoveEvaluator>()) {
+      foreach (var op in Operators.OfType<PTSPMoveEvaluator>()) {
         op.RealizationsParameter.Value = Realizations;
       }