Changeset 17034 for branches/2435-alglib_3_15/HeuristicLab.Algorithms.ALPS
- Timestamp:
- 06/25/19 23:14:06 (5 years ago)
- Location:
- branches/2435-alglib_3_15
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2435-alglib_3_15
- Property svn:mergeinfo changed
-
branches/2435-alglib_3_15/HeuristicLab.Algorithms.ALPS
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Algorithms.ALPS (added) merged: 16782-16783,16861,16875
- Property svn:mergeinfo changed
-
branches/2435-alglib_3_15/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs
r16565 r17034 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Analysis; 26 27 using HeuristicLab.Collections; … … 32 33 using HeuristicLab.Optimization.Operators; 33 34 using HeuristicLab.Parameters; 34 using HEAL.Attic;35 35 using HeuristicLab.PluginInfrastructure; 36 36 using HeuristicLab.Random; … … 444 444 base.OnProblemChanged(); 445 445 ParameterizeStochasticOperator(Problem.SolutionCreator); 446 ParameterizeStochasticOperatorForLayer(Problem.Evaluator);447 446 foreach (var @operator in Problem.Operators.OfType<IOperator>()) 448 447 ParameterizeStochasticOperator(@operator); 448 ParameterizeStochasticOperatorForLayer(Problem.Evaluator); 449 449 450 450 ParameterizeIterationBasedOperators(); … … 478 478 base.Problem_SolutionCreatorChanged(sender, e); 479 479 ParameterizeStochasticOperator(Problem.SolutionCreator); 480 ParameterizeStochasticOperatorForLayer(Problem.Evaluator);481 480 482 481 Problem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged; … … 487 486 protected override void Problem_EvaluatorChanged(object sender, EventArgs e) { 488 487 base.Problem_EvaluatorChanged(sender, e); 489 490 488 ParameterizeStochasticOperatorForLayer(Problem.Evaluator); 491 492 foreach (var @operator in Problem.Operators.OfType<IOperator>())493 ParameterizeStochasticOperator(@operator);494 489 495 490 UpdateAnalyzers(); … … 501 496 protected override void Problem_OperatorsChanged(object sender, EventArgs e) { 502 497 base.Problem_OperatorsChanged(sender, e); 498 foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op); 499 ParameterizeStochasticOperatorForLayer(Problem.Evaluator); 503 500 ParameterizeIterationBasedOperators(); 504 501 UpdateCrossovers(); -
branches/2435-alglib_3_15/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithm.cs
r16565 r17034 23 23 using System.Collections.Generic; 24 24 using System.Linq; 25 using HEAL.Attic; 25 26 using HeuristicLab.Analysis; 26 27 using HeuristicLab.Collections; … … 32 33 using HeuristicLab.Optimization.Operators; 33 34 using HeuristicLab.Parameters; 34 using HEAL.Attic;35 35 using HeuristicLab.PluginInfrastructure; 36 36 using HeuristicLab.Random; … … 507 507 base.OnProblemChanged(); 508 508 ParameterizeStochasticOperator(Problem.SolutionCreator); 509 ParameterizeStochasticOperatorForLayer(Problem.Evaluator);510 509 foreach (var @operator in Problem.Operators.OfType<IOperator>()) 511 510 ParameterizeStochasticOperator(@operator); 511 ParameterizeStochasticOperatorForLayer(Problem.Evaluator); 512 512 513 513 ParameterizeIterationBasedOperators(); … … 541 541 base.Problem_SolutionCreatorChanged(sender, e); 542 542 ParameterizeStochasticOperator(Problem.SolutionCreator); 543 ParameterizeStochasticOperatorForLayer(Problem.Evaluator);544 543 545 544 Problem.Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged; … … 550 549 protected override void Problem_EvaluatorChanged(object sender, EventArgs e) { 551 550 base.Problem_EvaluatorChanged(sender, e); 552 foreach (var @operator in Problem.Operators.OfType<IOperator>()) 553 ParameterizeStochasticOperator(@operator); 551 ParameterizeStochasticOperatorForLayer(Problem.Evaluator); 554 552 555 553 UpdateAnalyzers(); … … 561 559 protected override void Problem_OperatorsChanged(object sender, EventArgs e) { 562 560 base.Problem_OperatorsChanged(sender, e); 561 foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op); 562 ParameterizeStochasticOperatorForLayer(Problem.Evaluator); 563 563 ParameterizeIterationBasedOperators(); 564 564 UpdateCrossovers(); -
branches/2435-alglib_3_15/HeuristicLab.Algorithms.ALPS/3.3/AlpsOffspringSelectionGeneticAlgorithmMainOperator.cs
r16565 r17034 20 20 #endregion 21 21 22 using HEAL.Attic; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; … … 26 27 using HeuristicLab.Optimization.Operators; 27 28 using HeuristicLab.Parameters; 28 using HEAL.Attic;29 29 using HeuristicLab.Selection; 30 30 … … 266 266 267 267 variableCreator1.Name = "MutatedOffspring = true"; 268 variableCreator1.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(true) , false));268 variableCreator1.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(true)) { GetsCollected = false }); 269 269 variableCreator1.Successor = null; 270 270 271 271 variableCreator2.Name = "MutatedOffspring = false"; 272 variableCreator2.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(false) , false));272 variableCreator2.CollectedValues.Add(new ValueParameter<BoolValue>("MutatedOffspring", null, new BoolValue(false)) { GetsCollected = false }); 273 273 variableCreator2.Successor = null; 274 274
Note: See TracChangeset
for help on using the changeset viewer.