Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/25/13 13:39:13 (11 years ago)
Author:
mkommend
Message:

#1997: Merged trunk changes in data analysis island GA branch.

Location:
branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm

  • branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r8121 r9756  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    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;
Note: See TracChangeset for help on using the changeset viewer.