Changeset 15315 for branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.4/SimulatedAnnealing.cs

Timestamp:

08/09/17 10:37:45 (7 years ago)

Author:

jschiess

Message:

#1836 SA reheating strategies:
+ Finalized strategies
+ Added temperature initializer mechanism

File:

• branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.4/SimulatedAnnealing.cs (modified) (7 diffs)

branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.4/SimulatedAnnealing.cs

@@ -51 +51 @@
         private const string MaximumIterationsName = "MaximumIterations";
         private const string InitialTemperatureName = "InitialTemperature";
-        private const string InitialAcceptanceRateName = "InitialAcceptanceRate";
         private const string LowerTemperatureName = "LowerTemperature";
         private const string AnalyzerName = "Analyzer";
@@ -65 +64 @@
         private const string TemperatureChartName = "Temperature Chart";
         private const string TemperatureAnalyzerName = "Temperature Analyzer";
+        private const string TemperatureInitializerName = "TemperatureInitializer";
         #endregion
 
@@ -111 +111 @@
             get { return (IConstrainedValueParameter<IReheatingOperator>)Parameters[ReheatingOperatorName]; }
         }
+        public IConstrainedValueParameter<ITemperatureInitializer> TemperatureInitializerParameter
+        {
+            get { return (IConstrainedValueParameter<ITemperatureInitializer>)Parameters[TemperatureInitializerName]; }
+        }
 
         private ValueParameter<IntValue> MaximumIterationsParameter
         {
             get { return (ValueParameter<IntValue>)Parameters[MaximumIterationsName]; }
-        }
-        private ValueParameter<DoubleValue> InitialAcceptanceRateParameter
-        {
-            get { return (ValueParameter<DoubleValue>)Parameters[InitialAcceptanceRateName]; }
         }
         private ValueParameter<DoubleValue> LowerTemperatureParameter
@@ -167 +167 @@
             set { ReheatingOperatorParameter.Value = value; }
         }
+        public ITemperatureInitializer TemperatureInitializer
+        {
+            get { return TemperatureInitializerParameter.Value; }
+            set { TemperatureInitializerParameter.Value = value; }
+        }
 
         public IntValue MaximumIterations
@@ -172 +177 @@
             get { return MaximumIterationsParameter.Value; }
             set { MaximumIterationsParameter.Value = value; }
-        }
-        public DoubleValue InitialAcceptanceRate
-        {
-            get { return InitialAcceptanceRateParameter.Value; }
-            set { InitialAcceptanceRateParameter.Value = value; }
         }
         public DoubleValue LowerTemperature
@@ -219 +219 @@
             Parameters.Add(new ConstrainedValueParameter<IDiscreteDoubleValueModifier>(AnnealingOperatorName, "The operator used to cool the temperature."));
             Parameters.Add(new ConstrainedValueParameter<IReheatingOperator>(ReheatingOperatorName, "The operator used to reheat the temperature, if necessary."));
+            Parameters.Add(new ConstrainedValueParameter<ITemperatureInitializer>(TemperatureInitializerName, "The operator used to initialize the temperature."));
             Parameters.Add(new ValueParameter<IntValue>(MaximumIterationsName, "The maximum number of generations which should be processed.", new IntValue(10000)));
-            Parameters.Add(new ValueParameter<DoubleValue>(InitialAcceptanceRateName, "The initial acceptance rate of average-sized hills used to calculate the initial temperature", new DoubleValue(0.4)));
             Parameters.Add(new ValueParameter<DoubleValue>(LowerTemperatureName, "The lower bound for the temperature.", new DoubleValue(1e-6)));
             Parameters.Add(new ValueParameter<MultiAnalyzer>(AnalyzerName, "The operator used to analyze each iteration.", new MultiAnalyzer()));
@@ -300 +300 @@
             {
                 AnnealingOperatorParameter.ValidValues.Add(op);
+            }
+
+            foreach(var op in ApplicationManager.Manager.GetInstances<ITemperatureInitializer>().OrderBy(x => x.Name))
+            {
+                TemperatureInitializerParameter.ValidValues.Add(op);
             }