Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/05/15 09:27:24 (8 years ago)
Author:
jkarder
Message:

#2250: merged r11404 and r11839 into stable

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

    r11170 r11898  
    6262    }
    6363    public IValueParameter<BoolValue> ExecutePathRelinkingParameter {
    64       get { return (IValueLookupParameter<BoolValue>)Parameters["ExecutePathRelinking"]; }
     64      get { return (IValueParameter<BoolValue>)Parameters["ExecutePathRelinking"]; }
    6565    }
    6666    public IConstrainedValueParameter<IImprovementOperator> ImproverParameter {
     
    175175      Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The analyzer used to analyze each iteration.", new MultiAnalyzer()));
    176176      Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
    177       Parameters.Add(new ValueParameter<BoolValue>("ExecutePathRelinking", "True if path relinking should be executed instead of crossover, otherwise false.", new BoolValue(true)));
     177      Parameters.Add(new ValueParameter<BoolValue>("ExecutePathRelinking", "True if path relinking should be executed instead of crossover, otherwise false.", new BoolValue(false)));
    178178      Parameters.Add(new ConstrainedValueParameter<IImprovementOperator>("Improver", "The operator used to improve solutions."));
    179179      Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of iterations which should be processed.", new IntValue(100)));
     
    309309      base.Problem_OperatorsChanged(sender, e);
    310310    }
     311    private void PathRelinkerParameter_ValueChanged(object sender, EventArgs e) {
     312      ExecutePathRelinking.Value = PathRelinkerParameter.Value != null;
     313    }
    311314    private void SimilarityCalculatorParameter_ValueChanged(object sender, EventArgs e) {
    312315      ParameterizeMainLoop();
     
    322325    #region Helpers
    323326    private void Initialize() {
     327      PathRelinkerParameter.ValueChanged += new EventHandler(PathRelinkerParameter_ValueChanged);
    324328      SimilarityCalculatorParameter.ValueChanged += new EventHandler(SimilarityCalculatorParameter_ValueChanged);
    325329      if (Problem != null)
Note: See TracChangeset for help on using the changeset viewer.