Changeset 9673 for stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 9553-9555,9569,9591-9592,9618
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs
r9456 r9673 90 90 public ValueLookupParameter<IntValue> ElitesParameter { 91 91 get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; } 92 } 93 public IValueLookupParameter<BoolValue> ReevaluateElitesParameter { 94 get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; } 92 95 } 93 96 public ValueLookupParameter<ResultCollection> ResultsParameter { … … 158 161 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.")); 159 162 Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.")); 163 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)")); 160 164 Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection to store the results.")); 161 165 Parameters.Add(new ValueLookupParameter<IOperator>("Visualizer", "The operator used to visualize solutions.")); … … 248 252 mainOperator.CurrentSuccessRatioParameter.ActualName = "CurrentSuccessRatio"; 249 253 mainOperator.ElitesParameter.ActualName = ElitesParameter.Name; 254 mainOperator.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name; 250 255 mainOperator.EvaluatedSolutionsParameter.ActualName = EvaluatedSolutionsParameter.Name; 251 256 mainOperator.EvaluatorParameter.ActualName = EvaluatorParameter.Name; … … 414 419 } 415 420 421 [StorableHook(HookType.AfterDeserialization)] 422 private void AfterDeserialization() { 423 // BackwardsCompatibility3.3 424 #region Backwards compatible code, remove with 3.4 425 if (!Parameters.ContainsKey("ReevaluateElites")) { 426 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)")); 427 } 428 #endregion 429 } 430 416 431 public override IOperation Apply() { 417 432 if (CrossoverParameter.ActualValue == null)
Note: See TracChangeset
for help on using the changeset viewer.