Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/22/11 16:45:46 (13 years ago)
Author:
mkommend
Message:

#1418: Merged trunk changes into branch.

File:
1 copied

Legend:

Unmodified
Added
Removed
  • branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs

    r5792 r5796  
    156156      ChooseMoveOperators();
    157157
    158       ParameterizeMoveGenerators(problem as ISingleObjectiveProblem);
    159       ParameterizeMoveEvaluators(problem as ISingleObjectiveProblem);
    160       ParameterizeMoveMakers(problem as ISingleObjectiveProblem);
    161 
    162       ParameterizeAnalyzers(problem as ISingleObjectiveProblem);
    163       UpdateAnalyzers(problem as ISingleObjectiveProblem);
    164     }
    165 
    166     void ParameterizeAnalyzers(ISingleObjectiveProblem problem) {
     158      ParameterizeMoveGenerators(problem as ISingleObjectiveHeuristicOptimizationProblem);
     159      ParameterizeMoveEvaluators(problem as ISingleObjectiveHeuristicOptimizationProblem);
     160      ParameterizeMoveMakers(problem as ISingleObjectiveHeuristicOptimizationProblem);
     161
     162      ParameterizeAnalyzers(problem as ISingleObjectiveHeuristicOptimizationProblem);
     163      UpdateAnalyzers(problem as ISingleObjectiveHeuristicOptimizationProblem);
     164    }
     165
     166    void ParameterizeAnalyzers(ISingleObjectiveHeuristicOptimizationProblem problem) {
    167167      qualityAnalyzer.ResultsParameter.ActualName = "Results";
    168168      if (problem != null) {
     
    174174    }
    175175
    176     void UpdateAnalyzers(ISingleObjectiveProblem problem) {
     176    void UpdateAnalyzers(ISingleObjectiveHeuristicOptimizationProblem problem) {
    177177      Analyzer.Operators.Clear();
    178178      if (problem != null) {
     
    270270    }
    271271
    272     private void ParameterizeMoveGenerators(ISingleObjectiveProblem problem) {
     272    private void ParameterizeMoveGenerators(ISingleObjectiveHeuristicOptimizationProblem problem) {
    273273      if (problem != null) {
    274274        foreach (IMultiMoveGenerator generator in problem.Operators.OfType<IMultiMoveGenerator>())
     
    276276      }
    277277    }
    278     private void ParameterizeMoveEvaluators(ISingleObjectiveProblem problem) {
     278    private void ParameterizeMoveEvaluators(ISingleObjectiveHeuristicOptimizationProblem problem) {
    279279      foreach (ISingleObjectiveMoveEvaluator op in problem.Operators.OfType<ISingleObjectiveMoveEvaluator>()) {
    280280        op.QualityParameter.ActualName = problem.Evaluator.QualityParameter.ActualName;
    281281      }
    282282    }
    283     private void ParameterizeMoveMakers(ISingleObjectiveProblem problem) {
     283    private void ParameterizeMoveMakers(ISingleObjectiveHeuristicOptimizationProblem problem) {
    284284      foreach (IMoveMaker op in problem.Operators.OfType<IMoveMaker>()) {
    285285        op.QualityParameter.ActualName = problem.Evaluator.QualityParameter.ActualName;
Note: See TracChangeset for help on using the changeset viewer.