Changeset 15315 for branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.4/SimulatedAnnealingMainLoop.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/SimulatedAnnealingMainLoop.cs (modified) (8 diffs)

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

@@ -49 +49 @@
         private const string CoolingName = "Cooling";
         private const string InitialTemperatureName = "InitialTemperature";
-        private const string InitialAcceptanceRateName = "InitialAcceptanceRate";
         private const string StartTemperatureName = "StartTemperature";
         private const string EndTemperatureName = "EndTemperature";
@@ -65 +64 @@
         private const string LastQualityName = "LastQuality";
         private const string UphillMovesMemoryName = "UphillMovesMemory";
+        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";
+        private const string TemperatureInitializedName = "TemperatureInitialized";
+
         #endregion
 
@@ -91 +97 @@
         {
             get { return (ILookupParameter<DoubleValue>)Parameters[InitialTemperatureName]; }
-        }
-        public ILookupParameter<DoubleValue> InitialAcceptanceRateParameter
-        {
-            get { return (ILookupParameter<DoubleValue>)Parameters[InitialAcceptanceRateName]; }
         }
         public ILookupParameter<DoubleValue> MoveQualityParameter
@@ -200 +202 @@
             Parameters.Add(new ValueLookupParameter<IOperator>(AnnealingOperatorName, "The operator that cools the temperature."));
             Parameters.Add(new ValueLookupParameter<IOperator>(ReheatingOperatorName, "The operator that reheats the temperature if necessary."));
+            Parameters.Add(new ValueLookupParameter<IOperator>(TemperatureInitializerName, "The operator that initialized the temperature."));
 
             Parameters.Add(new ValueLookupParameter<IOperator>(AnalyzerName, "The operator used to analyze each generation."));
@@ -206 +209 @@
 
             Parameters.Add(new LookupParameter<DoubleValue>(InitialTemperatureName, "The initial temperature."));
-            Parameters.Add(new LookupParameter<DoubleValue>(InitialAcceptanceRateName, "The initial acceptance rate of average-sized hills used to calculate the initial temperature."));
             Parameters.Add(new LookupParameter<IntValue>(TemperatureStartIndexName, "The index where the annealing or heating was last changed."));
             Parameters.Add(new LookupParameter<BoolValue>(CoolingName, "True when the temperature should be cooled, false otherwise."));
             Parameters.Add(new LookupParameter<DoubleValue>(StartTemperatureName, "The temperature from which cooling or reheating should occur."));
             Parameters.Add(new LookupParameter<DoubleValue>(EndTemperatureName, "The temperature to which should be cooled or heated."));
+
 
             #endregion
@@ -237 +240 @@
 
             variableCreator.Name = "Initialize Memory";
+            variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>(TemperatureInitializedName, new BoolValue(false)));
             variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>(AverageAcceptanceRatioName, new DoubleValue(0d)));
             variableCreator.CollectedValues.Add(new ValueParameter<IntValue>(ConsecutiveRejectedSolutionsCountName, new IntValue(0)));
@@ -242 +246 @@
             variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>(LastQualityName, new DoubleValue(-1)));
             variableCreator.CollectedValues.Add(new ValueParameter<ItemList<DoubleValue>>(UphillMovesMemoryName, new ItemList<DoubleValue>()));
+            variableCreator.CollectedValues.Add(new ValueParameter<IntValue>(CurrentRandomWalkStepName, new IntValue(0)));
+            variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>(TemperatureBeforeReheatName, new DoubleValue(0)));
+            variableCreator.CollectedValues.Add(new ValueParameter<ItemList<DoubleValue>>(QualitiesBeforeReheatingName, new ItemList<DoubleValue>()));
+            variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>(LastAcceptedQualityName, new DoubleValue(-1)));
 
             analyzer1.Name = "Analyzer";
@@ -267 +275 @@
 
            
-
             subScopesRemover.RemoveAllSubScopes = true;