Changeset 14702 for branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs

Timestamp:

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

Author:

jschiess

Message:

#1836 SA reheating strategies: Added basic temperature reset strategy

File:

• branches/jschiess/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs (modified) (3 diffs)

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;