Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3799 for trunk/sources


Ignore:
Timestamp:
05/13/10 20:05:19 (14 years ago)
Author:
gkronber
Message:

Changed execution order of analyzers (algorithm analyzers after problem analyzers) #893

Location:
trunk/sources
Files:
8 edited

Legend:

Unmodified
Added
Removed

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

    r3750 r3799  
    341341    private void UpdateAnalyzers() {
    342342      Analyzer.Operators.Clear();
    343       Analyzer.Operators.Add(qualityAnalyzer);
    344343      if (Problem != null) {
    345344        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
    … …  
    349348        }
    350349      }
     350      Analyzer.Operators.Add(qualityAnalyzer);
    351351    }
    352352    #endregion

  • trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

    r3750 r3799  
    465465      Analyzer.Operators.Clear();
    466466      IslandAnalyzer.Operators.Add(islandQualityAnalyzer);
    467       Analyzer.Operators.Add(qualityAnalyzer);
    468467      if (Problem != null) {
    469468        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
    … …  
    473472        }
    474473      }
     474      Analyzer.Operators.Add(qualityAnalyzer);
    475475    }
    476476    #endregion

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

    r3750 r3799  
    577577      IslandAnalyzer.Operators.Add(islandQualityAnalyzer);
    578578      IslandAnalyzer.Operators.Add(islandSelectionPressureAnalyzer);
    579       Analyzer.Operators.Add(qualityAnalyzer);
    580       Analyzer.Operators.Add(selectionPressureAnalyzer);
    581579      if (Problem != null) {
    582580        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
    … …  
    586584        }
    587585      }
     586      Analyzer.Operators.Add(qualityAnalyzer);
     587      Analyzer.Operators.Add(selectionPressureAnalyzer);
    588588    }
    589589    #endregion

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

    r3750 r3799  
    426426    private void UpdateAnalyzers() {
    427427      Analyzer.Operators.Clear();
    428       Analyzer.Operators.Add(qualityAnalyzer);
    429       Analyzer.Operators.Add(selectionPressureAnalyzer);
    430428      if (Problem != null) {
    431429        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
    … …  
    435433        }
    436434      }
     435      Analyzer.Operators.Add(qualityAnalyzer);
     436      Analyzer.Operators.Add(selectionPressureAnalyzer);
    437437    }
    438438    #endregion

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

    r3750 r3799  
    515515      VillageAnalyzer.Operators.Add(villageQualityAnalyzer);
    516516      VillageAnalyzer.Operators.Add(villageSelectionPressureAnalyzer);
    517       Analyzer.Operators.Add(qualityAnalyzer);
    518       Analyzer.Operators.Add(selectionPressureAnalyzer);
    519517      if (Problem != null) {
    520518        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
    … …  
    524522        }
    525523      }
     524      Analyzer.Operators.Add(qualityAnalyzer);
     525      Analyzer.Operators.Add(selectionPressureAnalyzer);
    526526    }
    527527    #endregion

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

    r3724 r3799  
    262262    private void UpdateAnalyzers() {
    263263      Analyzer.Operators.Clear();
    264       Analyzer.Operators.Add(qualityAnalyzer);
    265264      if (Problem != null) {
    266265        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name))
    267266          Analyzer.Operators.Add(analyzer);
    268267      }
     268      Analyzer.Operators.Add(qualityAnalyzer);
    269269    }
    270270

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

    r3750 r3799  
    400400    private void UpdateAnalyzers() {
    401401      Analyzer.Operators.Clear();
    402       Analyzer.Operators.Add(qualityAnalyzer);
    403402      if (Problem != null) {
    404403        foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>().OrderBy(x => x.Name)) {
    … …  
    408407        }
    409408      }
     409      Analyzer.Operators.Add(qualityAnalyzer);
    410410    }
    411411    #endregion
Note: See TracChangeset for help on using the changeset viewer.