Changeset 15333 for branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.4/TemperatureController.cs

Timestamp:

08/21/17 11:17:24 (7 years ago)

Author:

jschiess

Message:

#1836 SA reheating strategies
+ added an adaptive temperature control strategy
+ some refactorings

File:

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

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

@@ -58 +58 @@
         private const string MaximizationName = "Maximization";
         private const string MoveQualityName = "MoveQuality";
-        private const string TemperatureBeforeReheatName = "TemperatureBeforeReheat";
         private const string CurrentRandomWalkStepName = "CurrentRandomWalkStep";
-        private const string QualitiesBeforeReheatingName = "QualitiesBeforeReheating";
         private const string LastAcceptedQualityName = "LastAcceptedQuality";
         private const string TemperatureInitializerName = "TemperatureInitializer";
@@ -92 +90 @@
             Parameters.Add(new ValueLookupParameter<IntValue>(MaximumIterationsName, "The maximum number of iterations which should be processed."));
             Parameters.Add(new ValueLookupParameter<BoolValue>(MaximizationName, "True if the problem is a maximization problem, otherwise false."));
-            Parameters.Add(new ValueLookupParameter<IOperator>(AnnealingOperatorName, "The operator that cools the temperature."));
+            Parameters.Add(new ValueLookupParameter<IDiscreteDoubleValueModifier>(AnnealingOperatorName, "The operator that cools the temperature."));
             Parameters.Add(new ValueLookupParameter<IReheatingOperator>(ReheatingOperatorName, "The operator that reheats the temperature if necessary."));
             Parameters.Add(new LookupParameter<IntValue>(TemperatureStartIndexName, "The index where the annealing or heating was last changed."));
@@ -108 +106 @@
             Parameters.Add(new LookupParameter<DoubleValue>(AverageAcceptanceRatioName, "Average acceptance over full acceptance memory."));
             Parameters.Add(new LookupParameter<IntValue>(CurrentRandomWalkStepName, "Current random walk step."));
-            Parameters.Add(new LookupParameter<DoubleValue>(TemperatureBeforeReheatName, "Temperature before the reheat occured."));
-            Parameters.Add(new LookupParameter<ItemList<DoubleValue>>(QualitiesBeforeReheatingName, "List of qualities where the algorithm has been stuck."));
             Parameters.Add(new LookupParameter<DoubleValue>(LastAcceptedQualityName, "Quality of last accepted solution."));