Changeset 7658 for trunk

Timestamp:

03/23/12 11:03:20 (13 years ago)

Author:

mkommend

Message:

#1691: Corrected GetHashCode in TypeEqualityComparer and updated operator discovery in TSP.

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.3/TypeEqualityComparer.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Common/3.3/TypeEqualityComparer.cs

@@ -31 +31 @@
     int IEqualityComparer<T>.GetHashCode(T obj) {
       if (obj == null) return 0;
-      return obj.GetHashCode();
+      return obj.GetType().GetHashCode();
     }
   }

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -226 +226 @@
       Operators.Add(new TSPPopulationDiversityAnalyzer());
       ParameterizeAnalyzers();
-      var defaultOperators = new HashSet<IPermutationOperator>(new IPermutationOperator[] {
+      var operators = new HashSet<IPermutationOperator>(new IPermutationOperator[] {
         new OrderCrossover2(),
         new InversionManipulator(),
         new StochasticInversionMultiMoveGenerator()
-      });
-      Operators.AddRange(defaultOperators);
-      Operators.AddRange(ApplicationManager.Manager.GetInstances<IPermutationOperator>().Except(defaultOperators, new TypeEqualityComparer<IPermutationOperator>()));
+      }, new TypeEqualityComparer<IPermutationOperator>());
+      foreach (var op in ApplicationManager.Manager.GetInstances<IPermutationOperator>())
+        operators.Add(op);
+      Operators.AddRange(operators);
       ParameterizeOperators();
       UpdateMoveEvaluators();
@@ -399 +400 @@
         try {
           EvaluateAndLoadTour(data.BestKnownTour);
-        } catch (InvalidOperationException) {
+        }
+        catch (InvalidOperationException) {
           if (data.BestKnownQuality.HasValue)
             BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);