Changeset 3187 for trunk/sources/HeuristicLab.Algorithms.TabuSearch

Timestamp:

03/22/10 22:58:43 (14 years ago)

Author:

abeham

Message:

Added move operators for real encoding and test functions #890

File:

• trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.cs (modified) (2 diffs)

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

@@ -188 +188 @@
       ParameterizeSolutionsCreator();
       ParameterizeMainLoop();
+      UpdateMoveGenerator();
+      UpdateMoveParameters();
       ParameterizeMoveGenerators();
       ParameterizeMoveEvaluator();
       ParameterizeMoveMaker();
-      UpdateMoveGenerator();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       base.OnProblemChanged();
@@ -227 +228 @@
         op.MoveTabuParameter.ActualNameChanged += new EventHandler(TabuMoveEvaluator_MoveTabuParameter_ActualNameChanged);
       }
-      IMoveGenerator oldMoveGenerator = MoveGenerator;
       UpdateMoveGenerator();
-      if (oldMoveGenerator == MoveGenerator) // in this case MoveGeneratorParameter_ValueChanged did not fire
-        UpdateMoveParameters();
+      UpdateMoveParameters();
       ParameterizeMainLoop();
       ParameterizeMoveGenerators();