Changeset 3704


Ignore:
Timestamp:
05/07/10 15:34:08 (12 years ago)
Author:
abeham
Message:

#839

  • removed parallel parameter from multipopulation algorithms
Location:
trunk/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

    r3689 r3704  
    101101      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    102102    }
    103     private ValueParameter<BoolValue> ParallelParameter {
    104       get { return (ValueParameter<BoolValue>)Parameters["Parallel"]; }
    105     }
    106103    private ValueParameter<MultiAnalyzer> AnalyzerParameter {
    107104      get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     
    172169      get { return ElitesParameter.Value; }
    173170      set { ElitesParameter.Value = value; }
    174     }
    175     public BoolValue Parallel {
    176       get { return ParallelParameter.Value; }
    177       set { ParallelParameter.Value = value; }
    178171    }
    179172    public MultiAnalyzer Analyzer {
     
    222215      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    223216      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
    224       Parameters.Add(new ValueParameter<BoolValue>("Parallel", "True if the islands should be run in parallel (also requires a parallel engine)", new BoolValue(false)));
    225217      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the islands.", new MultiAnalyzer()));
    226218      Parameters.Add(new ValueParameter<MultiAnalyzer>("IslandAnalyzer", "The operator used to analyze each island.", new MultiAnalyzer()));
     
    243235      populationCreator.Successor = ussp1;
    244236
    245       ussp1.Parallel = null;
    246       ussp1.ParallelParameter.ActualName = ParallelParameter.Name;
    247237      ussp1.Operator = solutionsCreator;
    248238      ussp1.Successor = mainLoop;
  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs

    r3700 r3704  
    100100      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    101101    }
    102     private ValueParameter<BoolValue> ParallelParameter {
    103       get { return (ValueParameter<BoolValue>)Parameters["Parallel"]; }
    104     }
    105102    private ValueLookupParameter<DoubleValue> SuccessRatioParameter {
    106103      get { return (ValueLookupParameter<DoubleValue>)Parameters["SuccessRatio"]; }
     
    192189      get { return ElitesParameter.Value; }
    193190      set { ElitesParameter.Value = value; }
    194     }
    195     public BoolValue Parallel {
    196       get { return ParallelParameter.Value; }
    197       set { ParallelParameter.Value = value; }
    198191    }
    199192    private DoubleValue SuccessRatio {
     
    270263      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    271264      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
    272       Parameters.Add(new ValueParameter<BoolValue>("Parallel", "True if the islands should be run in parallel (also requires a parallel engine)", new BoolValue(false)));
    273265      Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful to total children that should be achieved.", new DoubleValue(1)));
    274266      Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorLowerBound", "The lower bound of the comparison factor (start).", new DoubleValue(0)));
     
    298290      populationCreator.Successor = ussp1;
    299291
    300       ussp1.Parallel = null;
    301       ussp1.ParallelParameter.ActualName = ParallelParameter.Name;
    302292      ussp1.Operator = solutionsCreator;
    303293      ussp1.Successor = mainLoop;
  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs

    r3689 r3704  
    8686      get { return (ValueParameter<IntValue>)Parameters["Elites"]; }
    8787    }
    88     private ValueParameter<BoolValue> ParallelParameter {
    89       get { return (ValueParameter<BoolValue>)Parameters["Parallel"]; }
    90     }
    9188    private ValueLookupParameter<DoubleValue> SuccessRatioParameter {
    9289      get { return (ValueLookupParameter<DoubleValue>)Parameters["SuccessRatio"]; }
     
    161158      get { return ElitesParameter.Value; }
    162159      set { ElitesParameter.Value = value; }
    163     }
    164     public BoolValue Parallel {
    165       get { return ParallelParameter.Value; }
    166       set { ParallelParameter.Value = value; }
    167160    }
    168161    public DoubleValue SuccessRatio {
     
    242235      Parameters.Add(new OptionalConstrainedValueParameter<IManipulator>("Mutator", "The operator used to mutate solutions."));
    243236      Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
    244       Parameters.Add(new ValueParameter<BoolValue>("Parallel", "True if the villages should be run in parallel (also requires a parallel engine)", new BoolValue(false)));
    245237      Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful to total children that should be achieved.", new DoubleValue(1)));
    246238      Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorLowerBound", "The lower bound of the comparison factor (start).", new DoubleValue(0.3)));
     
    271263      populationCreator.Successor = ussp1;
    272264
    273       ussp1.Parallel = null;
    274       ussp1.ParallelParameter.ActualName = ParallelParameter.Name;
    275265      ussp1.Operator = solutionsCreator;
    276266      ussp1.Successor = mainLoop;
Note: See TracChangeset for help on using the changeset viewer.