Changeset 13723 for branches/IslandALPS
- Timestamp:
- 03/24/16 11:01:41 (9 years ago)
- Location:
- branches/IslandALPS/IslandALPS/3.3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/IslandALPS/IslandALPS/3.3/IslandALPSAlgorithm.cs
r13686 r13723 381 381 #region ALPSParameter 382 382 383 Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue( 5)));383 Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue(20))); 384 384 Parameters.Add(new ValueParameter<DoubleValue>("AgeInheritance", "A weight that determines the age of a child after crossover based on the older (1.0) and younger (0.0) parent.", new DoubleValue(1))); 385 385 Parameters.Add(new ValueParameter<IntArray>("AgeLimits", "The maximum age an individual is allowed to reach in a certain layer.", new IntArray(new int[0])) {Hidden = true}); … … 387 387 Parameters.Add(new ValueParameter<BoolValue>("ReduceToPopulationSize", ".", new BoolValue(true))); 388 388 389 Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(10000 0)));389 Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(10000))); 390 390 Parameters.Add(new ValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer())); 391 391 Parameters.Add(new ValueParameter<MultiAnalyzer>("GroupAnalyzer", "The operator used to analyze each layergroup.", new MultiAnalyzer())); -
branches/IslandALPS/IslandALPS/3.3/IslandAlpsAlgorithmMainLoop.cs
r13686 r13723 268 268 #endregion 269 269 270 globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue( 0)));270 globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue(1))); 271 271 globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(MigrationsParametername, new IntValue(0))); 272 272 … … 296 296 incrementEvaluatedSolutionDr.TargetParameter.ActualName = EvaluatedSolutions.Name; 297 297 incrementEvaluatedSolutionDr.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum); 298 incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations. Sum);298 incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign); 299 299 300 300 setIslandEvaluatedSolutions.ParameterToReduce.ActualName = LayerEvaluatedSolutionsParameter.Name; … … 535 535 var updateLayerNumber = new Assigner {Name = "Layer = OpenLayers"}; 536 536 var historyWiper = new ResultsHistoryWiper {Name = "Clear History in Results"}; 537 var evaluatedSolutionsWiper = new Assigner() {Name = "Clear evaluated Solutions"}; 537 538 var createChildrenViaCrossover = new AlpsGeneticAlgorithmMainOperator(); 538 539 var incrEvaluatedSolutionsForNewLayer = new SubScopesCounter {Name = "Update EvaluatedSolutions"}; … … 569 570 570 571 historyWiper.ResultsParameter.ActualName = LayerResultsParametername; 571 historyWiper.Successor = createChildrenViaCrossover; 572 historyWiper.Successor = evaluatedSolutionsWiper; 573 evaluatedSolutionsWiper.LeftSideParameter.ActualName = LayerEvaluatedSolutionsParameterName; 574 evaluatedSolutionsWiper.RightSideParameter.Value = new IntValue(0); 575 evaluatedSolutionsWiper.Successor = createChildrenViaCrossover; 572 576 573 577 // Maybe use only crossover and no elitism instead of "default operator" -
branches/IslandALPS/IslandALPS/3.3/Offspring Selection/IslandAlpsOffspringSelectionAlgorithm.cs
r13686 r13723 389 389 #region ALPSParameter 390 390 391 Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue( 5)));391 Parameters.Add(new ValueParameter<IntValue>("AgeGap", "The frequency of reseeding the lowest layer and scaling factor for the age-limits for the layers.", new IntValue(20))); 392 392 Parameters.Add(new ValueParameter<DoubleValue>("AgeInheritance", "A weight that determines the age of a child after crossover based on the older (1.0) and younger (0.0) parent.", new DoubleValue(1))); 393 393 Parameters.Add(new ValueParameter<IntArray>("AgeLimits", "The maximum age an individual is allowed to reach in a certain layer.", new IntArray(new int[0])) {Hidden = true}); … … 395 395 Parameters.Add(new ValueParameter<BoolValue>("ReduceToPopulationSize", ".", new BoolValue(true))); 396 396 397 Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(10000 0)));397 Parameters.Add(new ValueParameter<IntValue>("NumberOfLayers", "", new IntValue(10000))); 398 398 Parameters.Add(new ValueParameter<MultiAnalyzer>("LayerAnalyzer", "The operator used to analyze each layer.", new MultiAnalyzer())); 399 399 Parameters.Add(new ValueParameter<MultiAnalyzer>("GroupAnalyzer", "The operator used to analyze each layergroup.", new MultiAnalyzer())); -
branches/IslandALPS/IslandALPS/3.3/Offspring Selection/IslandAlpsOffspringSelectionAlgorithmMainLoop.cs
r13686 r13723 294 294 #endregion 295 295 296 globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue( 0)));296 globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(GenerationsParametername, new IntValue(1))); 297 297 globalVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>(MigrationsParametername, new IntValue(0))); 298 298 … … 322 322 incrementEvaluatedSolutionDr.TargetParameter.ActualName = EvaluatedSolutions.Name; 323 323 incrementEvaluatedSolutionDr.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum); 324 incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations. Sum);324 incrementEvaluatedSolutionDr.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign); 325 325 326 326 setIslandEvaluatedSolutions.ParameterToReduce.ActualName = LayerEvaluatedSolutionsParameter.Name; … … 577 577 var updateLayerNumber = new Assigner {Name = "Layer = OpenLayers"}; 578 578 var historyWiper = new ResultsHistoryWiper {Name = "Clear History in Results"}; 579 var evaluatedSolutionsWiper = new Assigner() { Name = "Clear evaluated Solutions" }; 579 580 var createChildrenViaCrossover = new AlpsOffspringSelectionGeneticAlgorithmMainOperator(); 580 581 var incrEvaluatedSolutionsForNewLayer = new SubScopesCounter {Name = "Update EvaluatedSolutions"}; … … 612 613 613 614 historyWiper.ResultsParameter.ActualName = "LayerResults"; 614 historyWiper.Successor = createChildrenViaCrossover; 615 historyWiper.Successor = evaluatedSolutionsWiper; 616 evaluatedSolutionsWiper.LeftSideParameter.ActualName = LayerEvaluatedSolutionsParameterName; 617 evaluatedSolutionsWiper.RightSideParameter.Value = new IntValue(0); 618 evaluatedSolutionsWiper.Successor = createChildrenViaCrossover; 615 619 616 620 // Maybe use only crossover and no elitism instead of "default operator"
Note: See TracChangeset
for help on using the changeset viewer.