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

Timestamp:

11/28/15 23:38:51 (9 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/TwoPointFiveMove.cs (modified) (3 diffs)

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

@@ -1 @@
-using HeuristicLab.Common;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
@@ -5 +26 @@
 
 namespace HeuristicLab.Problems.PTSP {
-  public class TwoPointFiveMove : Item {
-    
+  [Item("2.5-Move", "Represents a 2.5-move.")]
+  [StorableClass]
+  public sealed class TwoPointFiveMove : Item {
+    [Storable]
+    public int Index1 { get; protected set; }
+    [Storable]
+    public int Index2 { get; protected set; }
+    [Storable]
+    public Permutation Permutation { get; protected set; }
+    [Storable]
+    public bool IsInvert { get; protected set; }
+
     [StorableConstructor]
-    public TwoPointFiveMove() : this(-1, -1,null, true) { }
-    protected TwoPointFiveMove(bool deserializing) : base(deserializing) { }
-    protected TwoPointFiveMove(TwoPointFiveMove original, Cloner cloner)
+    public TwoPointFiveMove() : this(-1, -1, null, true) { }
+    private TwoPointFiveMove(bool deserializing) : base(deserializing) { }
+    private TwoPointFiveMove(TwoPointFiveMove original, Cloner cloner)
       : base(original, cloner) {
       this.Index1 = original.Index1;
       this.Index2 = original.Index2;
       this.IsInvert = original.IsInvert;
-      if (original.Permutation != null)
-        this.Permutation = cloner.Clone(original.Permutation);
+      this.Permutation = cloner.Clone(original.Permutation);
     }
     public TwoPointFiveMove(int index1, int index2, Permutation permutation, bool isinvert)
@@ -34 +64 @@
     }
 
-    [Storable]
-    public int Index1 { get; protected set; }
-    [Storable]
-    public int Index2 { get; protected set; }
-    [Storable]
-    public Permutation Permutation { get; protected set; }
-    [Storable]
-    public bool IsInvert { get; protected set; }
-
     public override IDeepCloneable Clone(Cloner cloner) {
       return new TwoPointFiveMove(this, cloner);