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

Timestamp:

05/06/10 00:47:32 (14 years ago)

Author:

swagner

Message:

Worked on refactoring of algorithm analysis and tracing (#999)

• removed SubScopesSubScopesLookupParameter
• adapted SubScopesLookupParameter and renamed it into ScopeTreeLookupParameter

Location:

trunk/sources/HeuristicLab.Algorithms.TabuSearch/3.3

Files:

• TabuNeighborhoodAnalyzer.cs (modified) (2 diffs)
• TabuSelector.cs (modified) (1 diff)

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

@@ -29 +29 @@
 namespace HeuristicLab.Algorithms.TabuSearch {
   public class TabuNeighborhoodAnalyzer : SingleSuccessorOperator, IAnalyzer {
-    public SubScopesLookupParameter<BoolValue> IsTabuParameter {
-      get { return (SubScopesLookupParameter<BoolValue>)Parameters["IsTabu"]; }
+    public ScopeTreeLookupParameter<BoolValue> IsTabuParameter {
+      get { return (ScopeTreeLookupParameter<BoolValue>)Parameters["IsTabu"]; }
     }
     public LookupParameter<PercentValue> PercentTabuParameter {
@@ -41 +41 @@
     public TabuNeighborhoodAnalyzer()
       : base() {
-      Parameters.Add(new SubScopesLookupParameter<BoolValue>("IsTabu", "A value that determines if a move is tabu or not."));
+      Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("IsTabu", "A value that determines if a move is tabu or not."));
       Parameters.Add(new LookupParameter<PercentValue>("PercentTabu", "Indicates how much of the neighborhood is tabu."));
       Parameters.Add(new LookupParameter<ResultCollection>("Results", "The result collection where the value should be stored."));

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

@@ -91 +91 @@
       Parameters.Add(new ValueLookupParameter<BoolValue>("Aspiration", "Whether the default aspiration criterion should be used or not. The default aspiration criterion accepts a tabu move if it results in a better solution than the best solution found so far.", new BoolValue(true)));
       Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "Whether the problem is a maximization or minimization problem (used to decide whether a solution is better"));
-      Parameters.Add(new SubScopesLookupParameter<DoubleValue>("MoveQuality", "The quality of the move."));
-      Parameters.Add(new SubScopesLookupParameter<BoolValue>("MoveTabu", "The tabu status of the move."));
+      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("MoveQuality", "The quality of the move."));
+      Parameters.Add(new ScopeTreeLookupParameter<BoolValue>("MoveTabu", "The tabu status of the move."));
       Parameters.Add(new ValueLookupParameter<BoolValue>("CopySelected", "True if the selected move should be copied.", new BoolValue(false)));
       Parameters.Add(new LookupParameter<BoolValue>("EmptyNeighborhood", "Will be set to true if the neighborhood didn't contain any non-tabu moves, otherwise it is set to false."));