Changeset 13412 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/StochasticTwoPointFiveMultiMoveGenerator.cs

Timestamp:

11/28/15 23:38:51 (8 years ago)

Author:

abeham

Message:

#2221:

• Completely refactored PTSP branch
  • Added two sets of problem instances based on TSPLIB: homogeneous and heterogeneous
  • Implemented missing EvaluateByCoordinates for 1-shift moves
  • Made it clear that move evaluators are for estimated PTSP only
  • Changed parameter realization from a rather strange list of list of ints to a list of bool arrays
  • Reusing code of the 2-opt and 1-shift move evaluators in 2.5 move evaluator
  • Introducing distance calculators to properly handle the case when no distance matrix is given (previous code only worked with distance matrix and without only with euclidean distance in some settings)
  • Fixed several smaller code issues: protected, static, method parameters, copy & paste, interfaces, naming, parameters, serialization hooks, license headers, doc comments, data types

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/StochasticTwoPointFiveMultiMoveGenerator.cs (copied) (copied from branches/PTSP/HeuristicLab.Problems.PTSP/3.3/MoveGenerators/Stochastic25MultiMoveGenerator.cs) (5 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/Moves/TwoPointFiveOpt/StochasticTwoPointFiveMultiMoveGenerator.cs

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -30 +29 @@
 
 namespace HeuristicLab.Problems.PTSP {
-  [Item("Stochastic25MultiMoveGenerator", "Randomly samples n from all possible inversion and shift moves (2.5-opt) from a given permutation.")]
+  [Item("Stochastic 2.5-MultiMoveGenerator", "Randomly samples n from all possible inversion and shift moves (2.5-opt) from a given permutation.")]
   [StorableClass]
-  class Stochastic25MultiMoveGenerator : TwoPointFiveMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
+  public sealed class StochasticTwoPointFiveMultiMoveGenerator : TwoPointFiveMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
@@ -46 +45 @@
 
     [StorableConstructor]
-    protected Stochastic25MultiMoveGenerator(bool deserializing) : base(deserializing) { }
-    protected Stochastic25MultiMoveGenerator(Stochastic25MultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
-    public Stochastic25MultiMoveGenerator()
+    private StochasticTwoPointFiveMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    private StochasticTwoPointFiveMultiMoveGenerator(StochasticTwoPointFiveMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
+    public StochasticTwoPointFiveMultiMoveGenerator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator."));
@@ -55 +54 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new Stochastic25MultiMoveGenerator(this, cloner);
+      return new StochasticTwoPointFiveMultiMoveGenerator(this, cloner);
     }
 
     public static TwoPointFiveMove[] Apply(Permutation permutation, IRandom random, int sampleSize) {
-      int length = permutation.Length;
-      TwoPointFiveMove[] moves = new TwoPointFiveMove[sampleSize];
-      for (int i = 0; i < sampleSize; i++) {
-        moves[i] = Stochastic25SingleMoveGenerator.Apply(permutation, random);
+      var moves = new TwoPointFiveMove[sampleSize];
+      for (var i = 0; i < sampleSize; i++) {
+        moves[i] = StochasticTwoPointFiveSingleMoveGenerator.Apply(permutation, random);
       }
       return moves;
@@ -68 +66 @@
 
     protected override TwoPointFiveMove[] GenerateMoves(Permutation permutation) {
-      IRandom random = RandomParameter.ActualValue;
-      return Apply(permutation, random, SampleSizeParameter.ActualValue.Value);
+      return Apply(permutation, RandomParameter.ActualValue, SampleSizeParameter.ActualValue.Value);
     }
   }