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

Timestamp:

03/29/10 18:49:55 (14 years ago)

Author:

abeham

Message:

Renamed operators according to the underlying operation #889

File:

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

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

@@ -63 +63 @@
       get { return (ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
     }
-    private ConstrainedValueParameter<ITabuMoveEvaluator> TabuMoveEvaluatorParameter {
-      get { return (ConstrainedValueParameter<ITabuMoveEvaluator>)Parameters["TabuMoveEvaluator"]; }
-    }
-    private ConstrainedValueParameter<ITabuMoveMaker> TabuMoveMakerParameter {
-      get { return (ConstrainedValueParameter<ITabuMoveMaker>)Parameters["TabuMoveMaker"]; }
+    private ConstrainedValueParameter<ITabuChecker> TabuMoveEvaluatorParameter {
+      get { return (ConstrainedValueParameter<ITabuChecker>)Parameters["TabuMoveEvaluator"]; }
+    }
+    private ConstrainedValueParameter<ITabuMaker> TabuMoveMakerParameter {
+      get { return (ConstrainedValueParameter<ITabuMaker>)Parameters["TabuMoveMaker"]; }
     }
     private ValueParameter<IntValue> TabuTenureParameter {
@@ -101 +101 @@
       set { MoveEvaluatorParameter.Value = value; }
     }
-    public ITabuMoveEvaluator TabuMoveEvaluator {
+    public ITabuChecker TabuMoveEvaluator {
       get { return TabuMoveEvaluatorParameter.Value; }
       set { TabuMoveEvaluatorParameter.Value = value; }
     }
-    public ITabuMoveMaker TabuMoveMaker {
+    public ITabuMaker TabuMoveMaker {
       get { return TabuMoveMakerParameter.Value; }
       set { TabuMoveMakerParameter.Value = value; }
@@ -137 +137 @@
       Parameters.Add(new ConstrainedValueParameter<IMoveMaker>("MoveMaker", "The operator used to perform a move."));
       Parameters.Add(new ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>("MoveEvaluator", "The operator used to evaluate a move."));
-      Parameters.Add(new ConstrainedValueParameter<ITabuMoveEvaluator>("TabuMoveEvaluator", "The operator to evaluate whether a move is tabu or not."));
-      Parameters.Add(new ConstrainedValueParameter<ITabuMoveMaker>("TabuMoveMaker", "The operator used to insert attributes of a move into the tabu list."));
+      Parameters.Add(new ConstrainedValueParameter<ITabuChecker>("TabuMoveEvaluator", "The operator to evaluate whether a move is tabu or not."));
+      Parameters.Add(new ConstrainedValueParameter<ITabuMaker>("TabuMoveMaker", "The operator used to insert attributes of a move into the tabu list."));
       Parameters.Add(new ValueParameter<IntValue>("TabuTenure", "The length of the tabu list.", new IntValue(10)));
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed.", new IntValue(1000)));
@@ -193 +193 @@
         op.MoveQualityParameter.ActualNameChanged += new EventHandler(MoveEvaluator_MoveQualityParameter_ActualNameChanged);
       }
-      foreach (ITabuMoveEvaluator op in Problem.Operators.OfType<ITabuMoveEvaluator>()) {
+      foreach (ITabuChecker op in Problem.Operators.OfType<ITabuChecker>()) {
         op.MoveTabuParameter.ActualNameChanged += new EventHandler(TabuMoveEvaluator_MoveTabuParameter_ActualNameChanged);
       }
@@ -234 +234 @@
         op.MoveQualityParameter.ActualNameChanged += new EventHandler(MoveEvaluator_MoveQualityParameter_ActualNameChanged);
       }
-      foreach (ITabuMoveEvaluator op in Problem.Operators.OfType<ITabuMoveEvaluator>()) {
+      foreach (ITabuChecker op in Problem.Operators.OfType<ITabuChecker>()) {
         op.MoveTabuParameter.ActualNameChanged -= new EventHandler(TabuMoveEvaluator_MoveTabuParameter_ActualNameChanged);
         op.MoveTabuParameter.ActualNameChanged += new EventHandler(TabuMoveEvaluator_MoveTabuParameter_ActualNameChanged);
@@ -310 +310 @@
       IMoveMaker oldMoveMaker = MoveMaker;
       ISingleObjectiveMoveEvaluator oldMoveEvaluator = MoveEvaluator;
-      ITabuMoveEvaluator oldTabuMoveEvaluator = TabuMoveEvaluator;
-      ITabuMoveMaker oldTabuMoveMaker = TabuMoveMaker;
+      ITabuChecker oldTabuMoveEvaluator = TabuMoveEvaluator;
+      ITabuMaker oldTabuMoveMaker = TabuMoveMaker;
       ClearMoveParameters();
       if (MoveGenerator != null) {
@@ -325 +325 @@
           foreach (ISingleObjectiveMoveEvaluator moveEvaluator in operators.OfType<ISingleObjectiveMoveEvaluator>())
             MoveEvaluatorParameter.ValidValues.Add(moveEvaluator);
-          foreach (ITabuMoveEvaluator tabuMoveEvaluator in operators.OfType<ITabuMoveEvaluator>())
+          foreach (ITabuChecker tabuMoveEvaluator in operators.OfType<ITabuChecker>())
             TabuMoveEvaluatorParameter.ValidValues.Add(tabuMoveEvaluator);
-          foreach (ITabuMoveMaker tabuMoveMaker in operators.OfType<ITabuMoveMaker>())
+          foreach (ITabuMaker tabuMoveMaker in operators.OfType<ITabuMaker>())
             TabuMoveMakerParameter.ValidValues.Add(tabuMoveMaker);
         }
@@ -339 +339 @@
         }
         if (oldTabuMoveMaker != null) {
-          ITabuMoveMaker tmm = TabuMoveMakerParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldTabuMoveMaker.GetType());
+          ITabuMaker tmm = TabuMoveMakerParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldTabuMoveMaker.GetType());
           if (tmm != null) TabuMoveMaker = tmm;
         }
         if (oldTabuMoveEvaluator != null) {
-          ITabuMoveEvaluator tme = TabuMoveEvaluatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldTabuMoveEvaluator.GetType());
+          ITabuChecker tme = TabuMoveEvaluatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldTabuMoveEvaluator.GetType());
           if (tme != null) TabuMoveEvaluator = tme;
         }