Changeset 9756 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs
- Timestamp:
- 07/25/13 13:39:13 (11 years ago)
- Location:
- branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm (added) merged: 9456,9462,9569,9591-9592
- Property svn:mergeinfo changed
-
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs
r7259 r9756 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 2Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 63 63 get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; } 64 64 } 65 public IValueLookupParameter<BoolValue> ReevaluateElitesParameter { 66 get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; } 67 } 65 68 public ValueLookupParameter<IntValue> MaximumGenerationsParameter { 66 69 get { return (ValueLookupParameter<IntValue>)Parameters["MaximumGenerations"]; } … … 106 109 : base() { 107 110 Initialize(); 111 } 112 113 [StorableHook(HookType.AfterDeserialization)] 114 private void AfterDeserialization() { 115 // BackwardsCompatibility3.3 116 #region Backwards compatible code, remove with 3.4 117 if (!Parameters.ContainsKey("ReevaluateElites")) { 118 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)")); 119 } 120 #endregion 108 121 } 109 122 … … 120 133 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.")); 121 134 Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.")); 135 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)")); 122 136 Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.")); 123 137 Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored.")); … … 170 184 mainOperator.CurrentSuccessRatioParameter.ActualName = "CurrentSuccessRatio"; 171 185 mainOperator.ElitesParameter.ActualName = ElitesParameter.Name; 186 mainOperator.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name; 172 187 mainOperator.EvaluatedSolutionsParameter.ActualName = EvaluatedSolutionsParameter.Name; 173 188 mainOperator.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
Note: See TracChangeset
for help on using the changeset viewer.