Changeset 9616 for branches/HivePerformance/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASAMainLoop.cs
- Timestamp:
- 06/12/13 15:02:47 (11 years ago)
- Location:
- branches/HivePerformance/sources
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HivePerformance/sources
- Property svn:mergeinfo changed
/trunk/sources merged: 9540,9542-9544,9552-9555,9568-9569,9587,9590-9592,9600,9607-9608,9610-9611,9613
- Property svn:mergeinfo changed
-
branches/HivePerformance/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASAMainLoop.cs
r9539 r9616 73 73 get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; } 74 74 } 75 public IValueLookupParameter<BoolValue> ReevaluateElitesParameter { 76 get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; } 77 } 75 78 public ValueLookupParameter<ResultCollection> ResultsParameter { 76 79 get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; } … … 134 137 Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization.")); 135 138 Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.")); 139 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)")); 136 140 Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection to store the results.")); 137 141 Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to the analyze the villages.")); … … 236 240 mainOperator.CurrentSuccessRatioParameter.ActualName = "CurrentSuccessRatio"; 237 241 mainOperator.ElitesParameter.ActualName = ElitesParameter.Name; 242 mainOperator.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name; 238 243 mainOperator.EvaluatedSolutionsParameter.ActualName = EvaluatedSolutionsParameter.Name; 239 244 mainOperator.EvaluatorParameter.ActualName = EvaluatorParameter.Name; … … 424 429 } 425 430 431 [StorableHook(HookType.AfterDeserialization)] 432 private void AfterDeserialization() { 433 // BackwardsCompatibility3.3 434 #region Backwards compatible code, remove with 3.4 435 if (!Parameters.ContainsKey("ReevaluateElites")) { 436 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)")); 437 } 438 #endregion 439 } 440 426 441 public override IOperation Apply() { 427 442 if (CrossoverParameter.ActualValue == null)
Note: See TracChangeset
for help on using the changeset viewer.