- Timestamp:
- 03/24/16 11:01:41 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
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"
Note: See TracChangeset
for help on using the changeset viewer.