Changeset 3079 for trunk/sources/HeuristicLab.Algorithms.LS

Timestamp:

03/17/10 02:01:26 (14 years ago)

Author:

abeham

Message:

fixed linkage in TS and LS similar to r3076 #898

File:

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

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

@@ -254 +254 @@
           MoveEvaluatorParameter.ValidValues.Add(moveEvaluator);
       }
-      if (oldMoveMaker != null && MoveMakerParameter.ValidValues.Any(x => x.GetType() == oldMoveMaker.GetType()))
-        MoveMaker = MoveMakerParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMoveMaker.GetType());
-      if (oldMoveEvaluator != null && MoveEvaluatorParameter.ValidValues.Any(x => x.GetType() == oldMoveEvaluator.GetType()))
-        MoveEvaluator = MoveEvaluatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMoveEvaluator.GetType());
+      if (oldMoveMaker != null) {
+        IMoveMaker mm = MoveMakerParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMoveMaker.GetType());
+        if (mm != null) MoveMaker = mm;
+      }
+      if (oldMoveEvaluator != null) {
+        ISingleObjectiveMoveEvaluator me = MoveEvaluatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMoveEvaluator.GetType());
+        if (me != null) MoveEvaluator = me;
+      }
     }
     private void ClearMoveParameters() {