Changeset 9756 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs
- Timestamp:
- 07/25/13 13:39:13 (11 years ago)
- Location:
- branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm (added) merged: 9076,9456,9462,9553-9555,9569,9591-9592
- Property svn:mergeinfo changed
-
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs
r8351 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. … … 79 79 get { return (ValueParameter<IntValue>)Parameters["Elites"]; } 80 80 } 81 private IFixedValueParameter<BoolValue> ReevaluateElitesParameter { 82 get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; } 83 } 81 84 private ValueParameter<MultiAnalyzer> AnalyzerParameter { 82 85 get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; } … … 119 122 get { return ElitesParameter.Value; } 120 123 set { ElitesParameter.Value = value; } 124 } 125 public bool ReevaluteElites { 126 get { return ReevaluateElitesParameter.Value.Value; } 127 set { ReevaluateElitesParameter.Value.Value = value; } 121 128 } 122 129 public MultiAnalyzer Analyzer { … … 151 158 Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 152 159 Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1))); 160 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 }); 153 161 Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer())); 154 162 Parameters.Add(new ValueParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.", new IntValue(1000))); … … 182 190 mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name; 183 191 mainLoop.ElitesParameter.ActualName = ElitesParameter.Name; 192 mainLoop.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name; 184 193 mainLoop.MaximumGenerationsParameter.ActualName = MaximumGenerationsParameter.Name; 185 194 mainLoop.MutatorParameter.ActualName = MutatorParameter.Name; … … 207 216 [StorableHook(HookType.AfterDeserialization)] 208 217 private void AfterDeserialization() { 218 // BackwardsCompatibility3.3 219 #region Backwards compatible code, remove with 3.4 220 if (!Parameters.ContainsKey("ReevaluateElites")) { 221 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 }); 222 } 223 #endregion 224 209 225 Initialize(); 210 226 } 227 228 211 229 212 230 private GeneticAlgorithm(GeneticAlgorithm original, Cloner cloner)
Note: See TracChangeset
for help on using the changeset viewer.