Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/05/10 00:48:18 (14 years ago)
Author:
swagner
Message:

Worked on refactoring of algorithm analysis and tracing (#999)

  • adapted GA and TSP
  • removed stuff related to visualizers
Location:
trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs

    r3611 r3616  
    327327      ParameterizeStochasticOperator(Problem.SolutionCreator);
    328328      ParameterizeStochasticOperator(Problem.Evaluator);
    329       ParameterizeStochasticOperator(Problem.Visualizer);
    330329      foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
    331330      ParameterizeSolutionsCreator();
    … …  
    335334      UpdateMutators();
    336335      Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    337       if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    338336      base.OnProblemChanged();
    339337    }
    … …  
    351349      Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    352350      base.Problem_EvaluatorChanged(sender, e);
    353     }
    354     protected override void Problem_VisualizerChanged(object sender, EventArgs e) {
    355       ParameterizeStochasticOperator(Problem.Visualizer);
    356       ParameterizeMainLoop();
    357       if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    358       base.Problem_VisualizerChanged(sender, e);
    359351    }
    360352    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
    … …  
    381373      ParameterizeMainLoop();
    382374      ParameterizeSelectors();
    383     }
    384     private void Visualizer_VisualizationParameter_ActualNameChanged(object sender, EventArgs e) {
    385       ParameterizeMainLoop();
    386375    }
    387376    private void MigrationRateParameter_ValueChanged(object sender, EventArgs e) {
    … …  
    431420        UpdateMutators();
    432421        Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    433         if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    434422      }
    435423    }
    … …  
    443431      MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
    444432      MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
    445       MainLoop.VisualizerParameter.ActualName = Problem.VisualizerParameter.Name;
    446       if (Problem.Visualizer != null)
    447         MainLoop.VisualizationParameter.ActualName = Problem.Visualizer.VisualizationParameter.ActualName;
    448433    }
    449434    private void ParameterizeStochasticOperator(IOperator op) {

  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r3510 r3616  
    246246      ParameterizeStochasticOperator(Problem.SolutionCreator);
    247247      ParameterizeStochasticOperator(Problem.Evaluator);
    248       ParameterizeStochasticOperator(Problem.Visualizer);
    249248      foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
    250249      ParameterizeSolutionsCreator();
    … …  
    254253      UpdateMutators();
    255254      Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    256       if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    257255      base.OnProblemChanged();
    258256    }
    … …  
    270268      Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    271269      base.Problem_EvaluatorChanged(sender, e);
    272     }
    273     protected override void Problem_VisualizerChanged(object sender, EventArgs e) {
    274       ParameterizeStochasticOperator(Problem.Visualizer);
    275       ParameterizMainLoop();
    276       if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    277       base.Problem_VisualizerChanged(sender, e);
    278270    }
    279271    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
    … …  
    300292      ParameterizMainLoop();
    301293      ParameterizeSelectors();
    302     }
    303     private void Visualizer_VisualizationParameter_ActualNameChanged(object sender, EventArgs e) {
    304       ParameterizMainLoop();
    305294    }
    306295    #endregion
    … …  
    321310        UpdateMutators();
    322311        Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    323         if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    324312      }
    325313    }
    … …  
    333321      MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
    334322      MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
    335       MainLoop.VisualizerParameter.ActualName = Problem.VisualizerParameter.Name;
    336       if (Problem.Visualizer != null)
    337         MainLoop.VisualizationParameter.ActualName = Problem.Visualizer.VisualizationParameter.ActualName;
    338323    }
    339324    private void ParameterizeStochasticOperator(IOperator op) {

  • trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs

    r3510 r3616  
    295295      ParameterizeStochasticOperator(Problem.SolutionCreator);
    296296      ParameterizeStochasticOperator(Problem.Evaluator);
    297       ParameterizeStochasticOperator(Problem.Visualizer);
    298297      foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
    299298      ParameterizeSolutionsCreator();
    … …  
    303302      UpdateMutators();
    304303      Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    305       if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    306304      base.OnProblemChanged();
    307305    }
    … …  
    319317      Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    320318      base.Problem_EvaluatorChanged(sender, e);
    321     }
    322     protected override void Problem_VisualizerChanged(object sender, EventArgs e) {
    323       ParameterizeStochasticOperator(Problem.Visualizer);
    324       ParameterizeMainLoop();
    325       if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    326       base.Problem_VisualizerChanged(sender, e);
    327319    }
    328320    protected override void Problem_OperatorsChanged(object sender, EventArgs e) {
    … …  
    349341      ParameterizeMainLoop();
    350342      ParameterizeSelectors();
    351     }
    352     private void Visualizer_VisualizationParameter_ActualNameChanged(object sender, EventArgs e) {
    353       ParameterizeMainLoop();
    354343    }
    355344    private void MaximumGenerationsParameter_ValueChanged(object sender, EventArgs e) {
    … …  
    391380        UpdateMutators();
    392381        Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    393         if (Problem.Visualizer != null) Problem.Visualizer.VisualizationParameter.ActualNameChanged += new EventHandler(Visualizer_VisualizationParameter_ActualNameChanged);
    394382      }
    395383    }
    … …  
    403391      MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
    404392      MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
    405       MainLoop.VisualizerParameter.ActualName = Problem.VisualizerParameter.Name;
    406393      MainLoop.MigrationIntervalParameter.Value = new IntValue(MaximumGenerations.Value / NumberOfVillages.Value);
    407       if (Problem.Visualizer != null)
    408         MainLoop.VisualizationParameter.ActualName = Problem.Visualizer.VisualizationParameter.ActualName;
    409394    }
    410395    private void ParameterizeStochasticOperator(IOperator op) {
Note: See TracChangeset for help on using the changeset viewer.