Changeset 12247 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Algorithms.ScatterSearch

Timestamp:

03/24/15 11:17:08 (10 years ago)

Author:

mkommend

Message:

#2276: Merged trunk changes into dataset refactoring branch.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

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

branches/HeuristicLab.DatasetRefactor/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) {