Changeset 12113 for trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

Timestamp:

03/04/15 09:29:58 (9 years ago)

Author:

jkarder

Message:

#2332: quality and no-similarity calculators are added only if they are not present

File:

• trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -410 +410 @@
         SimilarityCalculatorParameter.ValidValues.Add(similarityCalculator);
 
-      if (!SimilarityCalculatorParameter.ValidValues.Any()) {
-        SimilarityCalculatorParameter.ValidValues.Add(new QualitySimilarityCalculator { QualityVariableName = Problem.Evaluator.QualityParameter.ActualName });
+      if (!SimilarityCalculatorParameter.ValidValues.OfType<QualitySimilarityCalculator>().Any())
+        SimilarityCalculatorParameter.ValidValues.Add(new QualitySimilarityCalculator {
+          QualityVariableName = Problem.Evaluator.QualityParameter.ActualName
+        });
+      if (!SimilarityCalculatorParameter.ValidValues.OfType<NoSimilarityCalculator>().Any())
         SimilarityCalculatorParameter.ValidValues.Add(new NoSimilarityCalculator());
-      }
 
       if (oldSimilarityCalculator != null) {