Changeset 7401 for branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs
- Timestamp:
- 01/24/12 13:33:38 (12 years ago)
- Location:
- branches/HiveHiveEngine
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveHiveEngine
- Property svn:mergeinfo changed
/trunk/sources merged: 7395,7397,7400
- Property svn:mergeinfo changed
-
branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs
r7392 r7401 242 242 OperatorGraph.InitialOperator = randomCreator; 243 243 244 randomCreator.RandomParameter.ActualName = " Random";244 randomCreator.RandomParameter.ActualName = "GlobalRandom"; 245 245 randomCreator.SeedParameter.ActualName = SeedParameter.Name; 246 246 randomCreator.SeedParameter.Value = null; … … 256 256 257 257 solutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name; 258 //don't create solutions in parallel because the hive engine would distribute these tasks 259 solutionsCreator.ParallelParameter.Value = new BoolValue(false); 258 260 solutionsCreator.Successor = null; 259 261 … … 416 418 } 417 419 } 420 private void ParameterizeStochasticOperatorForIsland(IOperator op) { 421 IStochasticOperator stochasticOp = op as IStochasticOperator; 422 if (stochasticOp != null) { 423 stochasticOp.RandomParameter.ActualName = "LocalRandom"; 424 stochasticOp.RandomParameter.Hidden = true; 425 } 426 } 418 427 private void ParameterizeSelectors() { 419 428 foreach (ISelector selector in SelectorParameter.ValidValues) { … … 421 430 selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize.Value - Elites.Value)); 422 431 selector.NumberOfSelectedSubScopesParameter.Hidden = true; 423 ParameterizeStochasticOperator (selector);432 ParameterizeStochasticOperatorForIsland(selector); 424 433 } 425 434 foreach (ISelector selector in EmigrantsSelectorParameter.ValidValues) { … … 489 498 ICrossover oldCrossover = CrossoverParameter.Value; 490 499 CrossoverParameter.ValidValues.Clear(); 491 foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name)) 500 foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name)) { 501 ParameterizeStochasticOperatorForIsland(crossover); 492 502 CrossoverParameter.ValidValues.Add(crossover); 503 } 493 504 if (oldCrossover != null) { 494 505 ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType()); … … 499 510 IManipulator oldMutator = MutatorParameter.Value; 500 511 MutatorParameter.ValidValues.Clear(); 501 foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name)) 512 foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name)) { 513 ParameterizeStochasticOperatorForIsland(mutator); 502 514 MutatorParameter.ValidValues.Add(mutator); 515 } 503 516 if (oldMutator != null) { 504 517 IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());
Note: See TracChangeset
for help on using the changeset viewer.