Ignore:
Timestamp:
06/28/13 16:56:21 (7 years ago)
Author:
mkommend
Message:

#2038: Merged r9553:9555, r9569, r9591:r9592, r9618 into the stable branch.

Location:
stable
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • stable

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

    r9456 r9673  
    100100      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    101101    }
     102    private IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
     103      get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     104    }
    102105    private ValueLookupParameter<DoubleValue> SuccessRatioParameter {
    103106      get { return (ValueLookupParameter<DoubleValue>)Parameters["SuccessRatio"]; }
     
    192195      get { return ElitesParameter.Value; }
    193196      set { ElitesParameter.Value = value; }
     197    }
     198    public bool ReevaluteElites {
     199      get { return ReevaluateElitesParameter.Value.Value; }
     200      set { ReevaluateElitesParameter.Value.Value = value; }
    194201    }
    195202    private DoubleValue SuccessRatio {
     
    257264    [StorableHook(HookType.AfterDeserialization)]
    258265    private void AfterDeserialization() {
    259       #region Backwards Compatibility
     266      // BackwardsCompatibility3.3
     267      #region Backwards compatible code, remove with 3.4
    260268      if (successfulOffspringAnalyzer == null)
    261269        successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer();
     270      if (!Parameters.ContainsKey("ReevaluateElites")) {
     271        Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
     272      }
    262273      #endregion
    263274
     
    293304      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    294305      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
     306      Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
    295307      Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful to total children that should be achieved.", new DoubleValue(1)));
    296308      Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorLowerBound", "The lower bound of the comparison factor (start).", new DoubleValue(0)));
     
    355367      mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
    356368      mainLoop.ElitesParameter.ActualName = ElitesParameter.Name;
     369      mainLoop.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    357370      mainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
    358371      mainLoop.MutationProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs

    r9456 r9673  
    9090    public ValueLookupParameter<IntValue> ElitesParameter {
    9191      get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; }
     92    }
     93    public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {
     94      get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }
    9295    }
    9396    public ValueLookupParameter<ResultCollection> ResultsParameter {
     
    158161      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
    159162      Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation."));
     163      Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    160164      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection to store the results."));
    161165      Parameters.Add(new ValueLookupParameter<IOperator>("Visualizer", "The operator used to visualize solutions."));
     
    248252      mainOperator.CurrentSuccessRatioParameter.ActualName = "CurrentSuccessRatio";
    249253      mainOperator.ElitesParameter.ActualName = ElitesParameter.Name;
     254      mainOperator.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    250255      mainOperator.EvaluatedSolutionsParameter.ActualName = EvaluatedSolutionsParameter.Name;
    251256      mainOperator.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
     
    414419    }
    415420
     421    [StorableHook(HookType.AfterDeserialization)]
     422    private void AfterDeserialization() {
     423      // BackwardsCompatibility3.3
     424      #region Backwards compatible code, remove with 3.4
     425      if (!Parameters.ContainsKey("ReevaluateElites")) {
     426        Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
     427      }
     428      #endregion
     429    }
     430
    416431    public override IOperation Apply() {
    417432      if (CrossoverParameter.ActualValue == null)
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r9456 r9673  
    7979      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    8080    }
     81    private IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
     82      get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     83    }
    8184    private ValueParameter<IntValue> MaximumGenerationsParameter {
    8285      get { return (ValueParameter<IntValue>)Parameters["MaximumGenerations"]; }
     
    143146      get { return ElitesParameter.Value; }
    144147      set { ElitesParameter.Value = value; }
     148    }
     149    public bool ReevaluteElites {
     150      get { return ReevaluateElitesParameter.Value.Value; }
     151      set { ReevaluateElitesParameter.Value.Value = value; }
    145152    }
    146153    public IntValue MaximumGenerations {
     
    205212    [StorableHook(HookType.AfterDeserialization)]
    206213    private void AfterDeserialization() {
    207       #region Backwards Compatibility
     214      // BackwardsCompatibility3.3
     215      #region Backwards compatible code, remove with 3.4
    208216      if (successfulOffspringAnalyzer == null)
    209217        successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer();
     218      if (!Parameters.ContainsKey("ReevaluateElites")) {
     219        Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
     220      }
    210221      #endregion
    211222
     
    232243      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    233244      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
     245      Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
    234246      Parameters.Add(new ValueParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.", new IntValue(1000)));
    235247      Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful to total children that should be achieved.", new DoubleValue(1)));
     
    274286      mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
    275287      mainLoop.ElitesParameter.ActualName = ElitesParameter.Name;
     288      mainLoop.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    276289      mainLoop.EvaluatedSolutionsParameter.ActualName = "EvaluatedSolutions";
    277290      mainLoop.MaximumGenerationsParameter.ActualName = MaximumGenerationsParameter.Name;
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

    r9456 r9673  
    6363      get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; }
    6464    }
     65    public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {
     66      get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     67    }
    6568    public ValueLookupParameter<IntValue> MaximumGenerationsParameter {
    6669      get { return (ValueLookupParameter<IntValue>)Parameters["MaximumGenerations"]; }
     
    106109      : base() {
    107110      Initialize();
     111    }
     112
     113    [StorableHook(HookType.AfterDeserialization)]
     114    private void AfterDeserialization() {
     115      // BackwardsCompatibility3.3
     116      #region Backwards compatible code, remove with 3.4
     117      if (!Parameters.ContainsKey("ReevaluateElites")) {
     118        Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
     119      }
     120      #endregion
    108121    }
    109122
     
    120133      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
    121134      Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation."));
     135      Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    122136      Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed."));
    123137      Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
     
    170184      mainOperator.CurrentSuccessRatioParameter.ActualName = "CurrentSuccessRatio";
    171185      mainOperator.ElitesParameter.ActualName = ElitesParameter.Name;
     186      mainOperator.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    172187      mainOperator.EvaluatedSolutionsParameter.ActualName = EvaluatedSolutionsParameter.Name;
    173188      mainOperator.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainOperator.cs

    r9456 r9673  
    6767      get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; }
    6868    }
     69    public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {
     70      get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     71    }
    6972    public LookupParameter<DoubleValue> ComparisonFactorParameter {
    7073      get { return (LookupParameter<DoubleValue>)Parameters["ComparisonFactor"]; }
     
    98101      : base() {
    99102      Initialize();
     103    }
     104
     105    [StorableHook(HookType.AfterDeserialization)]
     106    private void AfterDeserialization() {
     107      // BackwardsCompatibility3.3
     108      #region Backwards compatible code, remove with 3.4
     109      if (!Parameters.ContainsKey("ReevaluateElites")) {
     110        Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
     111      }
     112      #endregion
    100113    }
    101114
     
    112125      Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of evaluated solutions."));
    113126      Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation."));
     127      Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    114128      Parameters.Add(new LookupParameter<DoubleValue>("ComparisonFactor", "The comparison factor is used to determine whether the offspring should be compared to the better parent, the worse parent or a quality value linearly interpolated between them. It is in the range [0;1]."));
    115129      Parameters.Add(new LookupParameter<DoubleValue>("CurrentSuccessRatio", "The current success ratio."));
     
    159173      LeftReducer leftReducer = new LeftReducer();
    160174      MergingReducer mergingReducer2 = new MergingReducer();
     175      ConditionalBranch reevaluateElitesBranch = new ConditionalBranch();
     176      UniformSubScopesProcessor uniformSubScopesProcessor7 = new UniformSubScopesProcessor();
     177      Placeholder evaluator4 = new Placeholder();
     178      SubScopesCounter subScopesCounter4 = new SubScopesCounter();
    161179
    162180      selector.Name = "Selector (placeholder)";
     
    253271      worstSelector.NumberOfSelectedSubScopesParameter.ActualName = ElitesParameter.Name;
    254272      worstSelector.QualityParameter.ActualName = QualityParameter.Name;
     273
     274      reevaluateElitesBranch.ConditionParameter.ActualName = "ReevaluateElites";
     275      reevaluateElitesBranch.Name = "Reevaluate elites ?";
     276
     277      uniformSubScopesProcessor7.Parallel.Value = true;
     278
     279      evaluator4.Name = "Evaluator (placeholder)";
     280      evaluator4.OperatorParameter.ActualName = EvaluatorParameter.Name;
     281
     282      subScopesCounter4.Name = "Increment EvaluatedSolutions";
     283      subScopesCounter4.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
    255284      #endregion
    256285
     
    310339      subScopesProcessor3.Successor = mergingReducer2;
    311340      bestSelector.Successor = rightReducer;
    312       rightReducer.Successor = null;
     341      rightReducer.Successor = reevaluateElitesBranch;
     342      reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor7;
     343      uniformSubScopesProcessor7.Operator = evaluator4;
     344      uniformSubScopesProcessor7.Successor = subScopesCounter4;
     345      subScopesCounter4.Successor = null;
     346      reevaluateElitesBranch.FalseBranch = null;
     347      reevaluateElitesBranch.Successor = null;
    313348      worstSelector.Successor = leftReducer;
    314349      leftReducer.Successor = null;
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs

    r9456 r9673  
    8585      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    8686    }
     87    private IFixedValueParameter<BoolValue> ReevaluateElitesParameter {
     88      get { return (IFixedValueParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     89    }
    8790    private ValueLookupParameter<DoubleValue> SuccessRatioParameter {
    8891      get { return (ValueLookupParameter<DoubleValue>)Parameters["SuccessRatio"]; }
     
    160163      get { return ElitesParameter.Value; }
    161164      set { ElitesParameter.Value = value; }
     165    }
     166    public bool ReevaluteElites {
     167      get { return ReevaluateElitesParameter.Value.Value; }
     168      set { ReevaluateElitesParameter.Value.Value = value; }
    162169    }
    163170    public DoubleValue SuccessRatio {
     
    233240    [StorableHook(HookType.AfterDeserialization)]
    234241    private void AfterDeserialization() {
    235       #region Backwards Compatibility
     242      // BackwardsCompatibility3.3
     243      #region Backwards compatible code, remove with 3.4
    236244      if (successfulOffspringAnalyzer == null)
    237245        successfulOffspringAnalyzer = new SuccessfulOffspringAnalyzer();
     246      if (!Parameters.ContainsKey("ReevaluateElites")) {
     247        Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", (BoolValue)new BoolValue(false).AsReadOnly()) { Hidden = true });
     248      }
    238249      #endregion
    239250
     
    264275      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    265276      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
     277      Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
    266278      Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful to total children that should be achieved.", new DoubleValue(1)));
    267279      Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorLowerBound", "The lower bound of the comparison factor (start).", new DoubleValue(0.3)));
     
    321333      mainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
    322334      mainLoop.ElitesParameter.ActualName = ElitesParameter.Name;
     335      mainLoop.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    323336      mainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
    324337      mainLoop.MutationProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
  • stable/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASAMainLoop.cs

    r9456 r9673  
    7373      get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; }
    7474    }
     75    public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {
     76      get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }
     77    }
    7578    public ValueLookupParameter<ResultCollection> ResultsParameter {
    7679      get { return (ValueLookupParameter<ResultCollection>)Parameters["Results"]; }
     
    134137      Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
    135138      Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation."));
     139      Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
    136140      Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection to store the results."));
    137141      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to the analyze the villages."));
     
    236240      mainOperator.CurrentSuccessRatioParameter.ActualName = "CurrentSuccessRatio";
    237241      mainOperator.ElitesParameter.ActualName = ElitesParameter.Name;
     242      mainOperator.ReevaluateElitesParameter.ActualName = ReevaluateElitesParameter.Name;
    238243      mainOperator.EvaluatedSolutionsParameter.ActualName = EvaluatedSolutionsParameter.Name;
    239244      mainOperator.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
     
    424429    }
    425430
     431    [StorableHook(HookType.AfterDeserialization)]
     432    private void AfterDeserialization() {
     433      // BackwardsCompatibility3.3
     434      #region Backwards compatible code, remove with 3.4
     435      if (!Parameters.ContainsKey("ReevaluateElites")) {
     436        Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
     437      }
     438      #endregion
     439    }
     440
    426441    public override IOperation Apply() {
    427442      if (CrossoverParameter.ActualValue == null)
Note: See TracChangeset for help on using the changeset viewer.