Changeset 15315 for branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.4/SimulatedAnnealing.cs
- Timestamp:
- 08/09/17 10:37:45 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.4/SimulatedAnnealing.cs
r15001 r15315 51 51 private const string MaximumIterationsName = "MaximumIterations"; 52 52 private const string InitialTemperatureName = "InitialTemperature"; 53 private const string InitialAcceptanceRateName = "InitialAcceptanceRate";54 53 private const string LowerTemperatureName = "LowerTemperature"; 55 54 private const string AnalyzerName = "Analyzer"; … … 65 64 private const string TemperatureChartName = "Temperature Chart"; 66 65 private const string TemperatureAnalyzerName = "Temperature Analyzer"; 66 private const string TemperatureInitializerName = "TemperatureInitializer"; 67 67 #endregion 68 68 … … 111 111 get { return (IConstrainedValueParameter<IReheatingOperator>)Parameters[ReheatingOperatorName]; } 112 112 } 113 public IConstrainedValueParameter<ITemperatureInitializer> TemperatureInitializerParameter 114 { 115 get { return (IConstrainedValueParameter<ITemperatureInitializer>)Parameters[TemperatureInitializerName]; } 116 } 113 117 114 118 private ValueParameter<IntValue> MaximumIterationsParameter 115 119 { 116 120 get { return (ValueParameter<IntValue>)Parameters[MaximumIterationsName]; } 117 }118 private ValueParameter<DoubleValue> InitialAcceptanceRateParameter119 {120 get { return (ValueParameter<DoubleValue>)Parameters[InitialAcceptanceRateName]; }121 121 } 122 122 private ValueParameter<DoubleValue> LowerTemperatureParameter … … 167 167 set { ReheatingOperatorParameter.Value = value; } 168 168 } 169 public ITemperatureInitializer TemperatureInitializer 170 { 171 get { return TemperatureInitializerParameter.Value; } 172 set { TemperatureInitializerParameter.Value = value; } 173 } 169 174 170 175 public IntValue MaximumIterations … … 172 177 get { return MaximumIterationsParameter.Value; } 173 178 set { MaximumIterationsParameter.Value = value; } 174 }175 public DoubleValue InitialAcceptanceRate176 {177 get { return InitialAcceptanceRateParameter.Value; }178 set { InitialAcceptanceRateParameter.Value = value; }179 179 } 180 180 public DoubleValue LowerTemperature … … 219 219 Parameters.Add(new ConstrainedValueParameter<IDiscreteDoubleValueModifier>(AnnealingOperatorName, "The operator used to cool the temperature.")); 220 220 Parameters.Add(new ConstrainedValueParameter<IReheatingOperator>(ReheatingOperatorName, "The operator used to reheat the temperature, if necessary.")); 221 Parameters.Add(new ConstrainedValueParameter<ITemperatureInitializer>(TemperatureInitializerName, "The operator used to initialize the temperature.")); 221 222 Parameters.Add(new ValueParameter<IntValue>(MaximumIterationsName, "The maximum number of generations which should be processed.", new IntValue(10000))); 222 Parameters.Add(new ValueParameter<DoubleValue>(InitialAcceptanceRateName, "The initial acceptance rate of average-sized hills used to calculate the initial temperature", new DoubleValue(0.4)));223 223 Parameters.Add(new ValueParameter<DoubleValue>(LowerTemperatureName, "The lower bound for the temperature.", new DoubleValue(1e-6))); 224 224 Parameters.Add(new ValueParameter<MultiAnalyzer>(AnalyzerName, "The operator used to analyze each iteration.", new MultiAnalyzer())); … … 300 300 { 301 301 AnnealingOperatorParameter.ValidValues.Add(op); 302 } 303 304 foreach(var op in ApplicationManager.Manager.GetInstances<ITemperatureInitializer>().OrderBy(x => x.Name)) 305 { 306 TemperatureInitializerParameter.ValidValues.Add(op); 302 307 } 303 308
Note: See TracChangeset
for help on using the changeset viewer.