Changeset 15049 for trunk/sources
- Timestamp:
- 06/23/17 15:39:35 (7 years ago)
- Location:
- trunk/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs
r14185 r15049 211 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 212 } 213 var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>; 214 if (optionalMutatorParameter != null) { 215 Parameters.Remove(optionalMutatorParameter); 216 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 217 foreach (var m in optionalMutatorParameter.ValidValues) 218 MutatorParameter.ValidValues.Add(m); 219 if (optionalMutatorParameter.Value == null) MutationProbability.Value = 0; // to guarantee that the old configuration results in the same behavior 220 else Mutator = optionalMutatorParameter.Value; 221 optionalMutatorParameter.ValidValues.Clear(); // to avoid dangling references to the old parameter its valid values are cleared 222 } 213 223 #endregion 214 224 … … 240 250 Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions.")); 241 251 Parameters.Add(new ValueParameter<PercentValue>("MutationProbability", "The probability that the mutation operator is applied on a solution.", new PercentValue(0.05))); 242 Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));252 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 243 253 Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1))); 244 254 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 }); … … 551 561 IManipulator oldMutator = MutatorParameter.Value; 552 562 MutatorParameter.ValidValues.Clear(); 563 IManipulator defaultMutator = Problem.Operators.OfType<IManipulator>().FirstOrDefault(); 564 553 565 foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name)) { 554 566 ParameterizeStochasticOperatorForIsland(mutator); … … 558 570 IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType()); 559 571 if (mutator != null) MutatorParameter.Value = mutator; 560 } 572 else oldMutator = null; 573 } 574 575 if (oldMutator == null && defaultMutator != null) 576 MutatorParameter.Value = defaultMutator; 561 577 } 562 578 private void UpdateAnalyzers() { -
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs
r14185 r15049 280 280 if (!Parameters.ContainsKey("FillPopulationWithParents")) 281 281 Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individual or false if worse children should be used when the maximum selection pressure is exceeded.", new BoolValue(false)) { Hidden = true }); 282 283 var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>; 284 if (optionalMutatorParameter != null) { 285 Parameters.Remove(optionalMutatorParameter); 286 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 287 foreach (var m in optionalMutatorParameter.ValidValues) 288 MutatorParameter.ValidValues.Add(m); 289 if (optionalMutatorParameter.Value == null) MutationProbability.Value = 0; // to guarantee that the old configuration results in the same behavior 290 else Mutator = optionalMutatorParameter.Value; 291 optionalMutatorParameter.ValidValues.Clear(); // to avoid dangling references to the old parameter its valid values are cleared 292 } 282 293 #endregion 283 294 … … 311 322 Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions.")); 312 323 Parameters.Add(new ValueParameter<PercentValue>("MutationProbability", "The probability that the mutation operator is applied on a solution.", new PercentValue(0.05))); 313 Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));324 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 314 325 Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1))); 315 326 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 }); … … 642 653 IManipulator oldMutator = MutatorParameter.Value; 643 654 MutatorParameter.ValidValues.Clear(); 655 IManipulator defaultMutator = Problem.Operators.OfType<IManipulator>().FirstOrDefault(); 656 644 657 foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name)) 645 658 MutatorParameter.ValidValues.Add(mutator); 659 646 660 if (oldMutator != null) { 647 661 IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType()); 648 662 if (mutator != null) MutatorParameter.Value = mutator; 649 } 663 else oldMutator = null; 664 } 665 666 if (oldMutator == null && defaultMutator != null) 667 MutatorParameter.Value = defaultMutator; 650 668 } 651 669 private void UpdateAnalyzers() { -
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs
r14185 r15049 228 228 if (!Parameters.ContainsKey("FillPopulationWithParents")) 229 229 Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individual or false if worse children should be used when the maximum selection pressure is exceeded.", new BoolValue(false)) { Hidden = true }); 230 231 var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>; 232 if (optionalMutatorParameter != null) { 233 Parameters.Remove(optionalMutatorParameter); 234 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 235 foreach (var m in optionalMutatorParameter.ValidValues) 236 MutatorParameter.ValidValues.Add(m); 237 if (optionalMutatorParameter.Value == null) MutationProbability.Value = 0; // to guarantee that the old configuration results in the same behavior 238 else Mutator = optionalMutatorParameter.Value; 239 optionalMutatorParameter.ValidValues.Clear(); // to avoid dangling references to the old parameter its valid values are cleared 240 } 230 241 #endregion 231 242 … … 250 261 Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions.")); 251 262 Parameters.Add(new ValueParameter<PercentValue>("MutationProbability", "The probability that the mutation operator is applied on a solution.", new PercentValue(0.05))); 252 Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));263 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 253 264 Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1))); 254 265 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 }); … … 487 498 IManipulator oldMutator = MutatorParameter.Value; 488 499 MutatorParameter.ValidValues.Clear(); 500 IManipulator defaultMutator = Problem.Operators.OfType<IManipulator>().FirstOrDefault(); 501 489 502 foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name)) 490 503 MutatorParameter.ValidValues.Add(mutator); 504 491 505 if (oldMutator != null) { 492 506 IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType()); 493 507 if (mutator != null) MutatorParameter.Value = mutator; 494 } 508 else oldMutator = null; 509 } 510 511 if (oldMutator == null && defaultMutator != null) 512 MutatorParameter.Value = defaultMutator; 495 513 } 496 514 private void UpdateAnalyzers() { -
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs
r14185 r15049 256 256 if (!Parameters.ContainsKey("FillPopulationWithParents")) 257 257 Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individual or false if worse children should be used when the maximum selection pressure is exceeded.", new BoolValue(false)) { Hidden = true }); 258 259 var optionalMutatorParameter = MutatorParameter as OptionalConstrainedValueParameter<IManipulator>; 260 if (optionalMutatorParameter != null) { 261 Parameters.Remove(optionalMutatorParameter); 262 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 263 foreach (var m in optionalMutatorParameter.ValidValues) 264 MutatorParameter.ValidValues.Add(m); 265 if (optionalMutatorParameter.Value == null) MutationProbability.Value = 0; // to guarantee that the old configuration results in the same behavior 266 else Mutator = optionalMutatorParameter.Value; 267 optionalMutatorParameter.ValidValues.Clear(); // to avoid dangling references to the old parameter its valid values are cleared 268 } 258 269 #endregion 259 270 … … 282 293 Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions.")); 283 294 Parameters.Add(new ValueParameter<PercentValue>("MutationProbability", "The probability that the mutation operator is applied on a solution.", new PercentValue(0.05))); 284 Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));295 Parameters.Add(new ConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions.")); 285 296 Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1))); 286 297 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 }); … … 561 572 ICrossover oldCrossover = CrossoverParameter.Value; 562 573 CrossoverParameter.ValidValues.Clear(); 574 ICrossover defaultCrossover = Problem.Operators.OfType<ICrossover>().FirstOrDefault(); 575 563 576 foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name)) 564 577 CrossoverParameter.ValidValues.Add(crossover); 578 565 579 if (oldCrossover != null) { 566 580 ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType()); 567 581 if (crossover != null) CrossoverParameter.Value = crossover; 568 } 582 else oldCrossover = null; 583 } 584 if (oldCrossover == null && defaultCrossover != null) 585 CrossoverParameter.Value = defaultCrossover; 569 586 } 570 587 private void UpdateMutators() { 571 588 IManipulator oldMutator = MutatorParameter.Value; 572 589 MutatorParameter.ValidValues.Clear(); 590 IManipulator defaultMutator = Problem.Operators.OfType<IManipulator>().FirstOrDefault(); 591 573 592 foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name)) 574 593 MutatorParameter.ValidValues.Add(mutator); 594 575 595 if (oldMutator != null) { 576 596 IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType()); 577 597 if (mutator != null) MutatorParameter.Value = mutator; 578 } 598 else oldMutator = null; 599 } 600 601 if (oldMutator == null && defaultMutator != null) 602 MutatorParameter.Value = defaultMutator; 579 603 } 580 604 private void UpdateAnalyzers() {
Note: See TracChangeset
for help on using the changeset viewer.