Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/21/14 14:59:41 (10 years ago)
Author:
mkommend
Message:

#2172: Merged r10639 and r10643 into stable.

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs

    r9673 r10644  
    129129    public LookupParameter<IntValue> EvaluatedSolutionsParameter {
    130130      get { return (LookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     131    }
     132    public IValueLookupParameter<BoolValue> FillPopulationWithParentsParameter {
     133      get { return (IValueLookupParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
    131134    }
    132135    #endregion
     
    174177      Parameters.Add(new ValueLookupParameter<IOperator>("IslandAnalyzer", "The operator used to analyze each island."));
    175178      Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of times solutions have been evaluated."));
     179      Parameters.Add(new ValueLookupParameter<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."));
    176180      #endregion
    177181
     
    265269      mainOperator.SelectorParameter.ActualName = SelectorParameter.Name;
    266270      mainOperator.SuccessRatioParameter.ActualName = SuccessRatioParameter.Name;
     271      mainOperator.FillPopulationWithParentsParameter.ActualName = FillPopulationWithParentsParameter.Name;
    267272
    268273      islandAnalyzer2.Name = "Island Analyzer (placeholder)";
     
    426431        Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    427432      }
     433      if (!Parameters.ContainsKey("FillPopulationWithParents"))
     434        Parameters.Add(new ValueLookupParameter<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."));
    428435      #endregion
    429436    }
Note: See TracChangeset for help on using the changeset viewer.