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

Timestamp:

03/19/15 17:16:39 (9 years ago)

Author:

apolidur

Message:

#2221: Local improvement operator for VNS

File:

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

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

@@ -56 +56 @@
       Operators.Add(new PTSPEstimatedInversionMovePathEvaluator());
       Operators.Add(new PTSPEstimatedInsertionEvaluator());
+      Operators.Add(new PTSPExhaustiveInversionLocalImprovement());
+      Operators.Add(new PTSPExhaustiveInsertionLocalImprovement());
       Encoding.ConfigureOperators(Operators.OfType<IOperator>());
     }
@@ -68 +70 @@
         realizations.Add(new ItemList<IntValue>());
         for (int j = 0; j < data.Dimension; j++) {
-          if (ProbabilityMatrix[j].Value > r.NextDouble()) {
+          if (ProbabilityMatrix[j] > r.NextDouble()) {
             realizations.ElementAt(i).Add(new IntValue(1));
           } else {
@@ -76 +78 @@
         
       }
+
       foreach (var op in Operators.OfType<PTSPPathMoveEvaluator>()) {
+        op.RealizationsParameter.Value = realizations;
+      }
+      foreach (var op in Operators.OfType<PTSPExhaustiveInversionLocalImprovement>()) {
         op.RealizationsParameter.Value = realizations;
       }