Changeset 15541 for branches/2864_PermutationProblems/HeuristicLab.Problems.LinearOrdering/3.3/Evaluators

Timestamp:

12/19/17 11:10:14 (7 years ago)

Author:

fholzing

Message:

#2864: CleanUp of old code, added LOP benchmark instances

Location:

branches/2864_PermutationProblems/HeuristicLab.Problems.LinearOrdering/3.3/Evaluators

Files:

• LOPEvaluator.cs (modified) (1 diff)
• MatrixTriangulationEvaluator.cs (modified) (5 diffs)
• SuperdiagonalMatrixTriangulationEvaluator.cs (added)

branches/2864_PermutationProblems/HeuristicLab.Problems.LinearOrdering/3.3/Evaluators/LOPEvaluator.cs

@@ -36 +36 @@
     public abstract class LOPEvaluator : InstrumentedOperator, ILOPEvaluator
     {
-        public override bool CanChangeName {
+        public override bool CanChangeName
+        {
             get { return false; }
         }
 
-        public ILookupParameter<DoubleValue> QualityParameter {
+        public ILookupParameter<DoubleValue> QualityParameter
+        {
             get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
         }

branches/2864_PermutationProblems/HeuristicLab.Problems.LinearOrdering/3.3/Evaluators/MatrixTriangulationEvaluator.cs

@@ -31 +31 @@
 {
     /// <summary>
-    /// A base class for operators which evaluate LOP solutions given in Matrix representation.
+    /// A base class for operators which evaluates LOP solutions given in Matrix representation.
     /// </summary>
     [Item("MatrixTriangulationEvaluator", "A base class for operators which evaluate LOP solutions given in Matrix representation.")]
@@ -37 +37 @@
     public abstract class MatrixTriangulationEvaluator : LOPEvaluator, IMatrixTriangulationEvaluator
     {
-        private object locker = new object();
-
         public ILookupParameter<Permutation> PermutationParameter { get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; } }
         public ILookupParameter<DoubleMatrix> MatrixParameter { get { return (ILookupParameter<DoubleMatrix>)Parameters["Matrix"]; } }
         public ILookupParameter<Permutation> BestKnownSolutionParameter { get { return (ILookupParameter<Permutation>)Parameters["BestKnownSolution"]; } }
         public ILookupParameter<DoubleValue> BestKnownQualityParameter { get { return (ILookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; } }
+
         [StorableConstructor]
         protected MatrixTriangulationEvaluator(bool deserializing) : base(deserializing) { }
@@ -49 +48 @@
           : base()
         {
-            Parameters.Add(new LookupParameter<Permutation>("Permutation", "The TSP solution given in path representation which should be evaluated."));
+            Parameters.Add(new LookupParameter<Permutation>("Permutation", "The LOP solution given in path representation which should be evaluated."));
             Parameters.Add(new LookupParameter<DoubleMatrix>("Matrix", "The matrix which contains the distances between the cities."));
             Parameters.Add(new LookupParameter<Permutation>("BestKnownSolution", "The currently best known solution."));
@@ -58 +57 @@
         private void AfterDeserialization()
         {
-            // BackwardsCompatibility3.3
-            #region Backwards compatible code (remove with 3.4)
-            LookupParameter<DoubleMatrix> oldDistanceMatrixParameter = Parameters["Matrix"] as LookupParameter<DoubleMatrix>;
-            if (oldDistanceMatrixParameter != null)
-            {
-                Parameters.Remove(oldDistanceMatrixParameter);
-                Parameters.Add(new LookupParameter<DoubleMatrix>("Matrix", "The matrix which contains the distances between the cities."));
-                MatrixParameter.ActualName = oldDistanceMatrixParameter.ActualName;
-            }
-            #endregion
+
         }
 
         public static double Apply(MatrixTriangulationEvaluator evaluator, DoubleMatrix matrix, Permutation permut)
         {
-            double length = evaluator.CalculateUpperTriangle(matrix, permut);
-            return length;
+            return evaluator.CalculateUpperTriangle(matrix, permut);
         }
 
@@ -80 +69 @@
             Permutation p = PermutationParameter.ActualValue;
             DoubleMatrix c = MatrixParameter.ActualValue;
-            if (c == null) throw new InvalidOperationException("No coordinates were given.");
+            if (c == null) throw new InvalidOperationException("No matrix was given.");
 
             double upperTriangle = CalculateUpperTriangle(c, p);