Changeset 14555 for branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs
- Timestamp:
- 01/10/17 18:03:16 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs
r14452 r14555 39 39 private const string MoveMakerName = "MoveMaker"; 40 40 private const string AnnealingOperatorName = "AnnealingOperator"; 41 private const string HeatingStrategyOperatorName = "HeatingStrategyOperator";41 private const string ReheatingOperatorName = "ReheatingOperator"; 42 42 private const string MaximumIterationsName = "MaximumIterations"; 43 43 private const string LowerTemperatureName = "LowerTemperature"; … … 114 114 get { return (IValueLookupParameter<IOperator>)Parameters[AnnealingOperatorName]; } 115 115 } 116 public IValueLookupParameter<IOperator> HeatingStrategyOperatorParameter117 { 118 get { return (IValueLookupParameter<IOperator>)Parameters[ HeatingStrategyOperatorName]; }116 public IValueLookupParameter<IOperator> ReheatingOperatorParameter 117 { 118 get { return (IValueLookupParameter<IOperator>)Parameters[ReheatingOperatorName]; } 119 119 } 120 120 public IValueLookupParameter<IOperator> AnalyzerParameter … … 181 181 Parameters.Add(new ValueLookupParameter<IOperator>(MoveMakerName, "The operator that performs a move and updates the quality.")); 182 182 Parameters.Add(new ValueLookupParameter<IOperator>(AnnealingOperatorName, "The operator that cools the temperature.")); 183 Parameters.Add(new ValueLookupParameter<IOperator>( HeatingStrategyOperatorName, "The operator that heats the temperature."));183 Parameters.Add(new ValueLookupParameter<IOperator>(ReheatingOperatorName, "The operator that reheats the temperature if necessary.")); 184 184 185 185 Parameters.Add(new ValueLookupParameter<IOperator>(AnalyzerName, "The operator used to analyze each generation.")); … … 245 245 temperatureController.CoolingParameter.ActualName = CoolingParameter.Name; 246 246 temperatureController.EndTemperatureParameter.ActualName = EndTemperatureParameter.Name; 247 temperatureController. HeatingStrategyOperatorParameter.ActualName = HeatingStrategyOperatorParameter.Name;247 temperatureController.ReheatingOperatorParameter.ActualName = ReheatingOperatorParameter.Name; 248 248 temperatureController.IsAcceptedParameter.ActualName = IsAcceptedName; 249 249 temperatureController.IterationsParameter.ActualName = IterationsParameter.Name;
Note: See TracChangeset
for help on using the changeset viewer.