Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/03/12 16:46:35 (12 years ago)
Author:
gkronber
Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:
branches/GP-MoveOperators
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs

    r8085 r8206  
    7070      get { return (ValueParameter<PercentValue>)Parameters["MigrationRate"]; }
    7171    }
    72     private ConstrainedValueParameter<IMigrator> MigratorParameter {
    73       get { return (ConstrainedValueParameter<IMigrator>)Parameters["Migrator"]; }
    74     }
    75     private ConstrainedValueParameter<ISelector> EmigrantsSelectorParameter {
    76       get { return (ConstrainedValueParameter<ISelector>)Parameters["EmigrantsSelector"]; }
    77     }
    78     private ConstrainedValueParameter<IReplacer> ImmigrationReplacerParameter {
    79       get { return (ConstrainedValueParameter<IReplacer>)Parameters["ImmigrationReplacer"]; }
     72    public IConstrainedValueParameter<IMigrator> MigratorParameter {
     73      get { return (IConstrainedValueParameter<IMigrator>)Parameters["Migrator"]; }
     74    }
     75    public IConstrainedValueParameter<ISelector> EmigrantsSelectorParameter {
     76      get { return (IConstrainedValueParameter<ISelector>)Parameters["EmigrantsSelector"]; }
     77    }
     78    public IConstrainedValueParameter<IReplacer> ImmigrationReplacerParameter {
     79      get { return (IConstrainedValueParameter<IReplacer>)Parameters["ImmigrationReplacer"]; }
    8080    }
    8181    private ValueParameter<IntValue> PopulationSizeParameter {
     
    8585      get { return (ValueParameter<IntValue>)Parameters["MaximumGenerations"]; }
    8686    }
    87     private ConstrainedValueParameter<ISelector> SelectorParameter {
    88       get { return (ConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
    89     }
    90     private ConstrainedValueParameter<ICrossover> CrossoverParameter {
    91       get { return (ConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
     87    public IConstrainedValueParameter<ISelector> SelectorParameter {
     88      get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
     89    }
     90    public IConstrainedValueParameter<ICrossover> CrossoverParameter {
     91      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
    9292    }
    9393    private ValueParameter<PercentValue> MutationProbabilityParameter {
    9494      get { return (ValueParameter<PercentValue>)Parameters["MutationProbability"]; }
    9595    }
    96     private OptionalConstrainedValueParameter<IManipulator> MutatorParameter {
    97       get { return (OptionalConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     96    public IConstrainedValueParameter<IManipulator> MutatorParameter {
     97      get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
    9898    }
    9999    private ValueParameter<IntValue> ElitesParameter {
     
    109109      get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorUpperBound"]; }
    110110    }
    111     private OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
    112       get { return (OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
     111    public IConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
     112      get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
    113113    }
    114114    private ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
     
    205205      set { ComparisonFactorUpperBoundParameter.Value = value; }
    206206    }
    207     private IDiscreteDoubleValueModifier ComparisonFactorModifier {
     207    public IDiscreteDoubleValueModifier ComparisonFactorModifier {
    208208      get { return ComparisonFactorModifierParameter.Value; }
    209209      set { ComparisonFactorModifierParameter.Value = value; }
  • branches/GP-MoveOperators/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r8085 r8206  
    6464      get { return (ValueParameter<IntValue>)Parameters["PopulationSize"]; }
    6565    }
    66     public ConstrainedValueParameter<ISelector> SelectorParameter {
    67       get { return (ConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
    68     }
    69     public ConstrainedValueParameter<ICrossover> CrossoverParameter {
    70       get { return (ConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
     66    public IConstrainedValueParameter<ISelector> SelectorParameter {
     67      get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
     68    }
     69    public IConstrainedValueParameter<ICrossover> CrossoverParameter {
     70      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
    7171    }
    7272    private ValueParameter<PercentValue> MutationProbabilityParameter {
    7373      get { return (ValueParameter<PercentValue>)Parameters["MutationProbability"]; }
    7474    }
    75     public OptionalConstrainedValueParameter<IManipulator> MutatorParameter {
    76       get { return (OptionalConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     75    public IConstrainedValueParameter<IManipulator> MutatorParameter {
     76      get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
    7777    }
    7878    private ValueParameter<IntValue> ElitesParameter {
     
    9191      get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorUpperBound"]; }
    9292    }
    93     public OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
    94       get { return (OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
     93    public IConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
     94      get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
    9595    }
    9696    private ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
  • branches/GP-MoveOperators/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs

    r8085 r8206  
    7070      get { return (ValueParameter<IntValue>)Parameters["MaximumGenerations"]; }
    7171    }
    72     private ConstrainedValueParameter<ISelector> SelectorParameter {
    73       get { return (ConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
    74     }
    75     private ConstrainedValueParameter<ICrossover> CrossoverParameter {
    76       get { return (ConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
     72    public IConstrainedValueParameter<ISelector> SelectorParameter {
     73      get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
     74    }
     75    public IConstrainedValueParameter<ICrossover> CrossoverParameter {
     76      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
    7777    }
    7878    private ValueParameter<PercentValue> MutationProbabilityParameter {
    7979      get { return (ValueParameter<PercentValue>)Parameters["MutationProbability"]; }
    8080    }
    81     private OptionalConstrainedValueParameter<IManipulator> MutatorParameter {
    82       get { return (OptionalConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
     81    public IConstrainedValueParameter<IManipulator> MutatorParameter {
     82      get { return (IConstrainedValueParameter<IManipulator>)Parameters["Mutator"]; }
    8383    }
    8484    private ValueParameter<IntValue> ElitesParameter {
     
    9494      get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorUpperBound"]; }
    9595    }
    96     private OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
    97       get { return (OptionalConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
     96    public IConstrainedValueParameter<IDiscreteDoubleValueModifier> ComparisonFactorModifierParameter {
     97      get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["ComparisonFactorModifier"]; }
    9898    }
    9999    private ValueLookupParameter<DoubleValue> MaximumSelectionPressureParameter {
Note: See TracChangeset for help on using the changeset viewer.