Changeset 14702 for branches

Timestamp:

02/24/17 18:48:57 (8 years ago)

Author:

jschiess

Message:

#1836 SA reheating strategies: Added basic temperature reset strategy

Location:

branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.3

Files:

• ConsecutiveRejectionReheatingOperator.cs (modified) (1 diff)
• ConsecutiveRejectionTemperatureResetOperator.cs (added)
• SimulatedAnnealingMainLoop.cs (modified) (3 diffs)
• TemperatureController.cs (modified) (3 diffs)

branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/ConsecutiveRejectionReheatingOperator.cs

@@ -16 +16 @@
 namespace HeuristicLab.Algorithms.SimulatedAnnealing
 {
-    [Item("ConsecutiveRejectionReheatingOperator", "The operator reheats the temperature by x when n consecutive solutions are rejected.")]
+    [Item("ConsecutiveRejectionReheatingOperator", "The operator reheats the temperature by X when N consecutive solutions are rejected.")]
     [StorableClass]
     public class ConsecutiveRejectionReheatingOperator : SingleSuccessorOperator, IReheatingOperator

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

@@ -59 +59 @@
         private const string TerminateName = "Terminate";
         private const string AcceptanceMemoryName = "AcceptanceMemory";
+        private const string ReheatCountName = "ReheatCount";
         #endregion
 
@@ -217 +218 @@
             variableCreator.Name = "Initialize Memory";
             variableCreator.CollectedValues.Add(new ValueParameter<ItemList<BoolValue>>(AcceptanceMemoryName, new ItemList<BoolValue>()));
+            variableCreator.CollectedValues.Add(new ValueParameter<IntValue>(ReheatCountName, new IntValue(0)));
 
             analyzer1.Name = "Analyzer";
@@ -241 +243 @@
             moveMaker.OperatorParameter.ActualName = MoveMakerParameter.Name;
 
-            temperatureController.AnnealingOperatorParameter.ActualName = AnnealingOperatorParameter.Name;
-            temperatureController.AcceptanceMemoryParameter.ActualName = AcceptanceMemoryName;
-            temperatureController.CoolingParameter.ActualName = CoolingParameter.Name;
-            temperatureController.EndTemperatureParameter.ActualName = EndTemperatureParameter.Name;
-            temperatureController.ReheatingOperatorParameter.ActualName = ReheatingOperatorParameter.Name;
-            temperatureController.IsAcceptedParameter.ActualName = IsAcceptedName;
-            temperatureController.IterationsParameter.ActualName = IterationsParameter.Name;
-            temperatureController.LowerTemperatureParameter.ActualName = LowerTemperatureParameter.Name;
-            temperatureController.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
-            temperatureController.StartTemperatureParameter.ActualName = StartTemperatureParameter.Name;
-            temperatureController.TemperatureParameter.ActualName = TemperatureParameter.Name;
-            temperatureController.TemperatureStartIndexParameter.ActualName = TemperatureStartIndexParameter.Name;
+           
 
             subScopesRemover.RemoveAllSubScopes = true;

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

@@ -50 +50 @@
         private const string IsAcceptedName = "IsAccepted";
         private const string AcceptanceMemoryName = "AcceptanceMemory";
+        private const string ReheatCountName = "ReheatCount";
         #endregion
 
@@ -101 +102 @@
             get { return (ILookupParameter<ItemList<BoolValue>>)Parameters[AcceptanceMemoryName]; }
         }
+        public ILookupParameter<IntValue> ReheatCountParameter
+        {
+            get { return (ILookupParameter<IntValue>)Parameters[ReheatCountName]; }
+        }
         #endregion
 
@@ -121 +126 @@
             Parameters.Add(new LookupParameter<BoolValue>(IsAcceptedName, "Whether the move was accepted or not."));
             Parameters.Add(new LookupParameter<ItemList<BoolValue>>(AcceptanceMemoryName, "Memorizes the last N acceptance decisions."));
+            Parameters.Add(new LookupParameter<IntValue>(ReheatCountName, "The number of reheats."));
         }