Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/07/10 13:46:21 (14 years ago)
Author:
abeham
Message:

#893

  • fixed review comments regarding comparison factor results / modification
  • corrected the description of a parameter
  • removed unnecessary parameters
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

    r3673 r3698  
    7575    public ValueLookupParameter<DoubleValue> SuccessRatioParameter {
    7676      get { return (ValueLookupParameter<DoubleValue>)Parameters["SuccessRatio"]; }
    77     }
    78     public ValueLookupParameter<DoubleValue> ComparisonFactorLowerBoundParameter {
    79       get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorLowerBound"]; }
    80     }
    81     public ValueLookupParameter<DoubleValue> ComparisonFactorUpperBoundParameter {
    82       get { return (ValueLookupParameter<DoubleValue>)Parameters["ComparisonFactorUpperBound"]; }
    8377    }
    8478    public ValueLookupParameter<IOperator> ComparisonFactorModifierParameter {
     
    116110      Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
    117111      Parameters.Add(new ValueLookupParameter<DoubleValue>("SuccessRatio", "The ratio of successful to total children that should be achieved."));
    118       Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorLowerBound", "The lower bound of the comparison factor (start)."));
    119       Parameters.Add(new ValueLookupParameter<DoubleValue>("ComparisonFactorUpperBound", "The upper bound of the comparison factor (end)."));
    120112      Parameters.Add(new ValueLookupParameter<IOperator>("ComparisonFactorModifier", "The operator used to modify the comparison factor."));
    121113      Parameters.Add(new ValueLookupParameter<DoubleValue>("MaximumSelectionPressure", "The maximum selection pressure that terminates the algorithm."));
     
    125117      #region Create operators
    126118      VariableCreator variableCreator = new VariableCreator();
    127       Placeholder comparisonFactorModifier = new Placeholder();
     119      Placeholder comparisonFactorModifier1 = new Placeholder();
    128120      Placeholder analyzer1 = new Placeholder();
    129121      ResultsCollector resultsCollector1 = new ResultsCollector();
     
    133125      Comparator maxGenerationsComparator = new Comparator();
    134126      Comparator maxSelectionPressureComparator = new Comparator();
     127      Placeholder comparisonFactorModifier2 = new Placeholder();
    135128      Placeholder analyzer2 = new Placeholder();
    136129      ResultsCollector resultsCollector3 = new ResultsCollector();
     
    142135      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("SelectionPressure", new DoubleValue(0)));
    143136      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("CurrentSuccessRatio", new DoubleValue(0)));
    144 
    145       comparisonFactorModifier.Name = "Modify ComparisonFactor (placeholder)";
    146       comparisonFactorModifier.OperatorParameter.ActualName = ComparisonFactorModifierParameter.Name;
     137      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("ComparisonFactor", new DoubleValue(0)));
     138
     139      comparisonFactorModifier1.Name = "Initialize ComparisonFactor (placeholder)";
     140      comparisonFactorModifier1.OperatorParameter.ActualName = ComparisonFactorModifierParameter.Name;
    147141
    148142      analyzer1.Name = "Analyzer (placeholder)";
     
    190184      maxSelectionPressureComparator.RightSideParameter.ActualName = MaximumSelectionPressureParameter.Name;
    191185
     186      comparisonFactorModifier2.Name = "Update ComparisonFactor (placeholder)";
     187      comparisonFactorModifier2.OperatorParameter.ActualName = ComparisonFactorModifierParameter.Name;
     188
    192189      analyzer2.Name = "Analyzer (placeholder)";
    193190      analyzer2.OperatorParameter.ActualName = AnalyzerParameter.Name;
     
    206203      #region Create operator graph
    207204      OperatorGraph.InitialOperator = variableCreator;
    208       variableCreator.Successor = comparisonFactorModifier;
    209       comparisonFactorModifier.Successor = analyzer1;
     205      variableCreator.Successor = comparisonFactorModifier1;
     206      comparisonFactorModifier1.Successor = analyzer1;
    210207      analyzer1.Successor = resultsCollector1;
    211208      resultsCollector1.Successor = resultsCollector2;
     
    214211      generationsCounter.Successor = maxGenerationsComparator;
    215212      maxGenerationsComparator.Successor = maxSelectionPressureComparator;
    216       maxSelectionPressureComparator.Successor = analyzer2;
     213      maxSelectionPressureComparator.Successor = comparisonFactorModifier2;
     214      comparisonFactorModifier2.Successor = analyzer2;
    217215      analyzer2.Successor = resultsCollector3;
    218216      resultsCollector3.Successor = conditionalBranch1;
Note: See TracChangeset for help on using the changeset viewer.