- Timestamp:
- 06/28/13 16:56:21 (11 years ago)
- Location:
- stable
- Files:
-
- 2 edited
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.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs
r9456 r9673 100 100 get { return (ValueParameter<IntValue>)Parameters["Elites"]; } 101 101 } 102 private IFixedValueParameter<BoolValue> ReevaluateElitesParameter { 103 get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; } 104 } 102 105 private ValueParameter<MultiAnalyzer> AnalyzerParameter { 103 106 get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; } … … 168 171 get { return ElitesParameter.Value; } 169 172 set { ElitesParameter.Value = value; } 173 } 174 public bool ReevaluteElites { 175 get { return ReevaluateElitesParameter.Value.Value; } 176 set { ReevaluateElitesParameter.Value.Value = value; } 170 177 } 171 178 public MultiAnalyzer Analyzer { … … 199 206 [StorableHook(HookType.AfterDeserialization)] 200 207 private void AfterDeserialization() { 208 // BackwardsCompatibility3.3 209 #region Backwards compatible code, remove with 3.4 210 if (!Parameters.ContainsKey("ReevaluateElites")) { 211 Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true }); 212 } 213 #endregion 214 201 215 Initialize(); 202 216 } … … 228 242 Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 229 243 Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1))); 244 Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true }); 230 245 Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the islands.", new MultiAnalyzer())); 231 246 Parameters.Add(new ValueParameter<MultiAnalyzer>("IslandAnalyzer", "The operator used to analyze each island.", new MultiAnalyzer())); … … 301 316 mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name; 302 317 mainLoop.ElitesParameter.ActualName = ElitesParameter.Name; 318 mainLoop.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name; 303 319 mainLoop.MutatorParameter.ActualName = MutatorParameter.Name; 304 320 mainLoop.MutationProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
Note: See TracChangeset
for help on using the changeset viewer.