Changeset 6594 for branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs
- Timestamp:
- 07/25/11 23:27:44 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/QAPAlgorithms/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs
r6593 r6594 139 139 Parameters.Add(new FixedValueParameter<IntValue>("MaximumTabuTenure", "The maximum tabu tenure.", new IntValue(20))); 140 140 Parameters.Add(new FixedValueParameter<BoolValue>("UseAlternativeAspiration", "True if the alternative aspiration condition should be used that takes moves that have not been made for some time above others.", new BoolValue(false))); 141 Parameters.Add(new FixedValueParameter<IntValue>("AlternativeAspirationTenure", "The time t that a move will be remembered for the alternative aspiration condition.", new IntValue( 10000)));141 Parameters.Add(new FixedValueParameter<IntValue>("AlternativeAspirationTenure", "The time t that a move will be remembered for the alternative aspiration condition.", new IntValue(int.MaxValue))); 142 142 Parameters.Add(new FixedValueParameter<BoolValue>("TerminateOnOptimalSolution", "True when the algorithm should stop if it reached a quality equal or smaller to the BestKnownQuality.", new BoolValue(true))); 143 143 Parameters.Add(new FixedValueParameter<BoolValue>("UseNewTabuTenureAdaptionScheme", @"In an updated version of his implementation, Eric Taillard introduced a different way to change the tabu tenure. … … 284 284 285 285 private void MaximumIterationsParameter_ValueChanged(object sender, EventArgs e) { 286 if (MaximumIterations >=AlternativeAspirationTenure && UseAlternativeAspiration) {286 if (MaximumIterations < AlternativeAspirationTenure && UseAlternativeAspiration) { 287 287 SetSilentlyUseAlternativeAspirationParameter(false); 288 } else if (MaximumIterations <AlternativeAspirationTenure && !UseAlternativeAspiration) {288 } else if (MaximumIterations >= AlternativeAspirationTenure && !UseAlternativeAspiration) { 289 289 SetSilentlyUseAlternativeAspirationParameter(true); 290 290 }
Note: See TracChangeset
for help on using the changeset viewer.