Changeset 8085 for branches/GP-MoveOperators/HeuristicLab.Algorithms.LocalSearch

Timestamp:

06/21/12 18:02:33 (13 years ago)

Author:

gkronber

Message:

#1847: merged trunk changes r7800:HEAD into gp move operators branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs (modified) (1 diff)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs (modified) (1 diff)

branches/GP-MoveOperators ¶

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/GP-MoveOperators/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs ¶

@@ -203 +203 @@
       ParameterizeStochasticOperator(Problem.SolutionCreator);
       ParameterizeStochasticOperator(Problem.Evaluator);
-      foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
+      foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
       foreach (ISingleObjectiveMoveEvaluator op in Problem.Operators.OfType<ISingleObjectiveMoveEvaluator>()) {
         op.MoveQualityParameter.ActualNameChanged += new EventHandler(MoveEvaluator_MoveQualityParameter_ActualNameChanged);

branches/GP-MoveOperators/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs ¶

@@ -292 +292 @@
       if (MoveGenerator != null && Problem != null) {
         IMoveGenerator generator = MoveGeneratorParameter.Value;
-        foreach (IMoveMaker moveMaker in MoveHelper.GetCompatibleMoveMakers(generator, Problem.Operators).OrderBy(x => x.Name))
+        foreach (IMoveMaker moveMaker in MoveHelper.GetCompatibleMoveMakers(generator, Problem.Operators.OfType<IOperator>()).OrderBy(x => x.Name))
           MoveMakerParameter.ValidValues.Add(moveMaker);
-        foreach (ISingleObjectiveMoveEvaluator moveEvaluator in MoveHelper.GetCompatibleSingleObjectiveMoveEvaluators(generator, Problem.Operators).OrderBy(x => x.Name))
+        foreach (ISingleObjectiveMoveEvaluator moveEvaluator in MoveHelper.GetCompatibleSingleObjectiveMoveEvaluators(generator, Problem.Operators.OfType<IOperator>()).OrderBy(x => x.Name))
           MoveEvaluatorParameter.ValidValues.Add(moveEvaluator);
 

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests