Changeset 6046 for branches/histogram/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs
- Timestamp:
- 04/23/11 10:00:31 (13 years ago)
- Location:
- branches/histogram
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/histogram
- Property svn:ignore
-
old new 10 10 protoc.exe 11 11 HeuristicLab 3.3.5.1.ReSharper.user 12 *.psess 13 *.vsp
-
- Property svn:mergeinfo changed
/trunk/sources merged: 6026,6029-6031,6035-6037,6042-6045
- Property svn:ignore
-
branches/histogram/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs
r5753 r6046 61 61 } 62 62 public LookupParameter<IntValue> IterationsParameter { 63 get { return (LookupParameter<IntValue>)Parameters[" LocalIterations"]; }63 get { return (LookupParameter<IntValue>)Parameters["Iterations"]; } 64 64 } 65 65 public ValueLookupParameter<IntValue> MaximumIterationsParameter { … … 112 112 Parameters.Add(new ValueLookupParameter<DoubleValue>("EndTemperature", "The end temperature.")); 113 113 Parameters.Add(new ValueLookupParameter<IntValue>("InnerIterations", "The amount of inner iterations (number of moves before temperature is adjusted again).")); 114 Parameters.Add(new LookupParameter<IntValue>(" LocalIterations", "The number of generations."));114 Parameters.Add(new LookupParameter<IntValue>("Iterations", "The number of iterations.")); 115 115 Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "The maximum number of iterations which should be processed.")); 116 116 … … 231 231 } 232 232 233 [StorableHook(HookType.AfterDeserialization)] 234 private void AfterDeserialization() { 235 // BackwardsCompatibility3.3 236 #region Backwards compatible code (remove with 3.4) 237 if (!Parameters.ContainsKey("Iterations")) 238 Parameters.Add(new LookupParameter<IntValue>("Iterations", "The number of iterations.")); 239 #endregion 240 } 241 233 242 public override IOperation Apply() { 234 243 if (MoveGeneratorParameter.ActualValue == null || MoveEvaluatorParameter.ActualValue == null || MoveMakerParameter.ActualValue == null)
Note: See TracChangeset
for help on using the changeset viewer.