Changeset 3689 for trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm

Timestamp:

05/07/10 02:08:30 (15 years ago)

Author:

abeham

Message:

#893

• fixed wiring in the algorithms

Location:

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Files:

• IslandOffspringSelectionGeneticAlgorithm.cs (modified) (9 diffs)
• OffspringSelectionGeneticAlgorithm.cs (modified) (9 diffs)
• SASEGASA.cs (modified) (11 diffs)

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

@@ -226 +226 @@
       set { IslandAnalyzerParameter.Value = value; }
     }
-    private List<ISelector> selectors;
-    private IEnumerable<ISelector> Selectors {
-      get { return selectors; }
-    }
-    private List<IDiscreteDoubleValueModifier> comparisonFactorModifiers;
-    private List<ISelector> emigrantsSelectors;
-    private List<IReplacer> immigrationReplacers;
-    private List<IMigrator> migrators;
     private RandomCreator RandomCreator {
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
@@ -246 +238 @@
       get { return (IslandOffspringSelectionGeneticAlgorithmMainLoop)IslandProcessor.Successor; }
     }
+    [Storable]
     private BestAverageWorstQualityAnalyzer islandQualityAnalyzer;
+    [Storable]
     private BestAverageWorstQualityAnalyzer qualityAnalyzer;
+    [Storable]
     private ValueAnalyzer islandSelectionPressureAnalyzer;
+    [Storable]
     private ValueAnalyzer selectionPressureAnalyzer;
     #endregion
@@ -327 +323 @@
       mainLoop.MaximumSelectionPressureParameter.ActualName = MaximumSelectionPressureParameter.Name;
       mainLoop.OffspringSelectionBeforeMutationParameter.ActualName = OffspringSelectionBeforeMutationParameter.Name;
-
       mainLoop.Successor = null;
+
+      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
+        SelectorParameter.ValidValues.Add(selector);
+      ISelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
+      if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
+
+      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
+        EmigrantsSelectorParameter.ValidValues.Add(selector);
+
+      foreach (IReplacer replacer in ApplicationManager.Manager.GetInstances<IReplacer>().OrderBy(x => x.Name))
+        ImmigrationReplacerParameter.ValidValues.Add(replacer);
+
+      ParameterizeSelectors();
+
+      foreach (IMigrator migrator in ApplicationManager.Manager.GetInstances<IMigrator>().OrderBy(x => x.Name))
+        MigratorParameter.ValidValues.Add(migrator);
+
+      foreach (IDiscreteDoubleValueModifier modifier in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))
+        ComparisonFactorModifierParameter.ValidValues.Add(modifier);
+      IDiscreteDoubleValueModifier linearModifier = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("LinearDiscreteDoubleValueModifier"));
+      if (linearModifier != null) ComparisonFactorModifierParameter.Value = linearModifier;
+      ParameterizeComparisonFactorModifiers();
+
+      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      islandQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      selectionPressureAnalyzer = new ValueAnalyzer();
+      islandSelectionPressureAnalyzer = new ValueAnalyzer();
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
 
       Initialize();
@@ -335 +359 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       IslandOffspringSelectionGeneticAlgorithm clone = (IslandOffspringSelectionGeneticAlgorithm)base.Clone(cloner);
+      clone.islandQualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(islandQualityAnalyzer);
+      clone.qualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(qualityAnalyzer);
+      clone.islandSelectionPressureAnalyzer = (ValueAnalyzer)cloner.Clone(islandSelectionPressureAnalyzer);
+      clone.selectionPressureAnalyzer = (ValueAnalyzer)cloner.Clone(selectionPressureAnalyzer);
       clone.Initialize();
       return clone;
@@ -425 +453 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeSelectors();
-      InitializeAnalyzers();
-      UpdateSelectors();
-      UpdateAnalyzers();
-      InitializeComparisonFactorModifiers();
-      UpdateComparisonFactorModifiers();
-      InitializeMigrators();
-      UpdateMigrators();
       PopulationSizeParameter.ValueChanged += new EventHandler(PopulationSizeParameter_ValueChanged);
       PopulationSize.ValueChanged += new EventHandler(PopulationSize_ValueChanged);
@@ -444 +464 @@
       MaximumGenerations.ValueChanged += new EventHandler(MaximumMigrations_ValueChanged);
       if (Problem != null) {
-        UpdateCrossovers();
-        UpdateMutators();
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       }
@@ -463 +481 @@
         ((IStochasticOperator)op).RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
     }
-    private void InitializeSelectors() {
-      selectors = new List<ISelector>();
-      selectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
-      emigrantsSelectors = new List<ISelector>();
-      emigrantsSelectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
-      immigrationReplacers = new List<IReplacer>();
-      immigrationReplacers.AddRange(ApplicationManager.Manager.GetInstances<IReplacer>().OrderBy(x => x.Name));
-      ParameterizeSelectors();
-    }
-    private void InitializeAnalyzers() {
-      islandQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      islandSelectionPressureAnalyzer = new ValueAnalyzer();
-      selectionPressureAnalyzer = new ValueAnalyzer();
-      ParameterizeAnalyzers();
-    }
-    private void InitializeComparisonFactorModifiers() {
-      comparisonFactorModifiers = new List<IDiscreteDoubleValueModifier>();
-      comparisonFactorModifiers.AddRange(ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name));
-      ParameterizeComparisonFactorModifiers();
-    }
-    private void InitializeMigrators() {
-      migrators = new List<IMigrator>();
-      migrators.AddRange(ApplicationManager.Manager.GetInstances<IMigrator>().OrderBy(x => x.Name));
-      UpdateMigrators();
-    }
     private void ParameterizeSelectors() {
-      foreach (ISelector selector in Selectors) {
+      foreach (ISelector selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
         selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize.Value - Elites.Value));
         ParameterizeStochasticOperator(selector);
       }
-      foreach (ISelector selector in emigrantsSelectors) {
+      foreach (ISelector selector in EmigrantsSelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
         selector.NumberOfSelectedSubScopesParameter.Value = new IntValue((int)Math.Ceiling(PopulationSize.Value * MigrationRate.Value));
         ParameterizeStochasticOperator(selector);
       }
-      foreach (IReplacer selector in immigrationReplacers) {
+      foreach (IReplacer selector in ImmigrationReplacerParameter.ValidValues) {
         ParameterizeStochasticOperator(selector);
       }
       if (Problem != null) {
-        foreach (ISingleObjectiveSelector selector in Selectors.OfType<ISingleObjectiveSelector>()) {
+        foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
           selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
         }
-        foreach (ISingleObjectiveSelector selector in emigrantsSelectors.OfType<ISingleObjectiveSelector>()) {
+        foreach (ISingleObjectiveSelector selector in EmigrantsSelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
           selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
         }
-        foreach (ISingleObjectiveReplacer replacer in immigrationReplacers.OfType<ISingleObjectiveReplacer>()) {
+        foreach (ISingleObjectiveReplacer replacer in ImmigrationReplacerParameter.ValidValues.OfType<ISingleObjectiveReplacer>()) {
           replacer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           replacer.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
@@ -547 +539 @@
     }
     private void ParameterizeComparisonFactorModifiers() {
-      foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers) {
+      foreach (IDiscreteDoubleValueModifier modifier in ComparisonFactorModifierParameter.ValidValues) {
         modifier.IndexParameter.ActualName = "Generations";
         modifier.EndIndexParameter.Value = new IntValue(MigrationInterval.Value * MaximumGenerations.Value);
@@ -555 +547 @@
         modifier.ValueParameter.ActualName = "ComparisonFactor";
       }
-    }
-    private void UpdateSelectors() {
-      ISelector oldSelector = SelectorParameter.Value;
-      SelectorParameter.ValidValues.Clear();
-      foreach (ISelector selector in Selectors.OrderBy(x => x.Name))
-        SelectorParameter.ValidValues.Add(selector);
-
-      ISelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
-      if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
-
-      if (oldSelector != null) {
-        ISelector selector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
-        if (selector != null) SelectorParameter.Value = selector;
-      }
-
-      oldSelector = EmigrantsSelector;
-      EmigrantsSelectorParameter.ValidValues.Clear();
-      foreach (ISelector selector in emigrantsSelectors)
-        EmigrantsSelectorParameter.ValidValues.Add(selector);
-      if (oldSelector != null) {
-        ISelector selector = EmigrantsSelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
-        if (selector != null) EmigrantsSelectorParameter.Value = selector;
-      }
-
-      IReplacer oldReplacer = ImmigrationReplacerParameter.Value;
-      ImmigrationReplacerParameter.ValidValues.Clear();
-      foreach (IReplacer replacer in immigrationReplacers)
-        ImmigrationReplacerParameter.ValidValues.Add(replacer);
-      if (oldSelector != null) {
-        IReplacer replacer = ImmigrationReplacerParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
-        if (replacer != null) ImmigrationReplacerParameter.Value = replacer;
-      }
-    }
-    private void UpdateComparisonFactorModifiers() {
-      IDiscreteDoubleValueModifier oldModifier = ComparisonFactorModifier;
-
-      ComparisonFactorModifierParameter.ValidValues.Clear();
-      foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers)
-        ComparisonFactorModifierParameter.ValidValues.Add(modifier);
-
-      if (oldModifier != null) {
-        IDiscreteDoubleValueModifier mod = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldModifier.GetType());
-        if (mod != null) ComparisonFactorModifierParameter.Value = mod;
-      }
-    }
-    private void UpdateMigrators() {
-      IMigrator oldMigrator = Migrator;
-      MigratorParameter.ValidValues.Clear();
-      foreach (IMigrator migrator in migrators)
-        MigratorParameter.ValidValues.Add(migrator);
-      if (oldMigrator != null) {
-        IMigrator migrator = MigratorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMigrator.GetType());
-        if (migrator != null) MigratorParameter.Value = migrator;
-      } else if (MigratorParameter.ValidValues.Count > 0) MigratorParameter.Value = MigratorParameter.ValidValues.First();
     }
     private void UpdateCrossovers() {

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

@@ -184 +184 @@
       get { return (OffspringSelectionGeneticAlgorithmMainLoop)SolutionsCreator.Successor; }
     }
-    private List<ISelector> selectors;
-    private IEnumerable<ISelector> Selectors {
-      get { return selectors; }
-    }
-    private List<IDiscreteDoubleValueModifier> comparisonFactorModifiers;
+    [Storable]
     private BestAverageWorstQualityAnalyzer qualityAnalyzer;
+    [Storable]
     private ValueAnalyzer selectionPressureAnalyzer;
     #endregion
@@ -239 +236 @@
       mainLoop.ResultsParameter.ActualName = "Results";
 
+      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
+        SelectorParameter.ValidValues.Add(selector);
+      ISelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
+      if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
+      ParameterizeSelectors();
+
+      foreach (IDiscreteDoubleValueModifier modifier in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))
+        ComparisonFactorModifierParameter.ValidValues.Add(modifier);
+      IDiscreteDoubleValueModifier linearModifier = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("LinearDiscreteDoubleValueModifier"));
+      if (linearModifier != null) ComparisonFactorModifierParameter.Value = linearModifier;
+      ParameterizeComparisonFactorModifiers();
+
+      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      selectionPressureAnalyzer = new ValueAnalyzer();
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
+
       Initialize();
     }
@@ -244 +258 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       OffspringSelectionGeneticAlgorithm clone = (OffspringSelectionGeneticAlgorithm)base.Clone(cloner);
+      clone.qualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(qualityAnalyzer);
+      clone.selectionPressureAnalyzer = (ValueAnalyzer)cloner.Clone(selectionPressureAnalyzer);
       clone.Initialize();
       return clone;
@@ -313 +329 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeSelectors();
-      InitializeAnalyzers();
-      UpdateSelectors();
-      UpdateAnalyzers();
-      InitializeComparisonFactorModifiers();
-      UpdateComparisonFactorModifiers();
       PopulationSizeParameter.ValueChanged += new EventHandler(PopulationSizeParameter_ValueChanged);
       PopulationSize.ValueChanged += new EventHandler(PopulationSize_ValueChanged);
@@ -324 +334 @@
       Elites.ValueChanged += new EventHandler(Elites_ValueChanged);
       if (Problem != null) {
-        UpdateCrossovers();
-        UpdateMutators();
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       }
@@ -342 +350 @@
         ((IStochasticOperator)op).RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
     }
-    private void InitializeSelectors() {
-      selectors = new List<ISelector>();
-      selectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
-      ParameterizeSelectors();
-    }
-    private void InitializeAnalyzers() {
-      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      selectionPressureAnalyzer = new ValueAnalyzer();
-      ParameterizeAnalyzers();
-    }
-    private void InitializeComparisonFactorModifiers() {
-      comparisonFactorModifiers = new List<IDiscreteDoubleValueModifier>();
-      comparisonFactorModifiers.AddRange(ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name));
-      ParameterizeComparisonFactorModifiers();
-    }
     private void ParameterizeSelectors() {
-      foreach (ISelector selector in Selectors) {
+      foreach (ISelector selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
         selector.NumberOfSelectedSubScopesParameter.Value = null;
@@ -365 +358 @@
       }
       if (Problem != null) {
-        foreach (ISingleObjectiveSelector selector in Selectors.OfType<ISingleObjectiveSelector>()) {
+        foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
           selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
@@ -385 +378 @@
     }
     private void ParameterizeComparisonFactorModifiers() {
-      foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers) {
+      foreach (IDiscreteDoubleValueModifier modifier in ComparisonFactorModifierParameter.ValidValues) {
         modifier.IndexParameter.ActualName = "Generations";
         modifier.EndIndexParameter.ActualName = MaximumGenerationsParameter.Name;
@@ -392 +385 @@
         modifier.StartValueParameter.ActualName = ComparisonFactorLowerBoundParameter.Name;
         modifier.ValueParameter.ActualName = "ComparisonFactor";
-      }
-    }
-    private void UpdateSelectors() {
-      ISelector oldSelector = SelectorParameter.Value;
-      SelectorParameter.ValidValues.Clear();
-      foreach (ISelector selector in Selectors.OrderBy(x => x.Name))
-        SelectorParameter.ValidValues.Add(selector);
-
-      ISelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
-      if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
-
-      if (oldSelector != null) {
-        ISelector selector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
-        if (selector != null) SelectorParameter.Value = selector;
-      }
-    }
-    private void UpdateComparisonFactorModifiers() {
-      IDiscreteDoubleValueModifier oldModifier = ComparisonFactorModifier;
-
-      ComparisonFactorModifierParameter.ValidValues.Clear();
-      foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers)
-        ComparisonFactorModifierParameter.ValidValues.Add(modifier);
-
-      if (oldModifier != null) {
-        IDiscreteDoubleValueModifier mod = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldModifier.GetType());
-        if (mod != null) ComparisonFactorModifierParameter.Value = mod;
       }
     }

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

@@ -206 +206 @@
       set { VillageAnalyzerParameter.Value = value; }
     }
-    private List<ISelector> selectors;
-    private IEnumerable<ISelector> Selectors {
-      get { return selectors; }
-    }
-    private List<IDiscreteDoubleValueModifier> comparisonFactorModifiers;
     private RandomCreator RandomCreator {
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
@@ -223 +218 @@
       get { return (SASEGASAMainLoop)VillageProcessor.Successor; }
     }
+    [Storable]
     private BestAverageWorstQualityAnalyzer villageQualityAnalyzer;
+    [Storable]
     private BestAverageWorstQualityAnalyzer qualityAnalyzer;
+    [Storable]
     private ValueAnalyzer villageSelectionPressureAnalyzer;
+    [Storable]
     private ValueAnalyzer selectionPressureAnalyzer;
     #endregion
@@ -280 +279 @@
       solutionsCreator.Successor = null;
 
-
       mainLoop.NumberOfVillagesParameter.ActualName = NumberOfVillagesParameter.Name;
       mainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
@@ -299 +297 @@
       mainLoop.Successor = null;
 
+      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
+        SelectorParameter.ValidValues.Add(selector);
+      ISelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
+      if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
+
+      ParameterizeSelectors();
+
+      foreach (IDiscreteDoubleValueModifier modifier in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))
+        ComparisonFactorModifierParameter.ValidValues.Add(modifier);
+      IDiscreteDoubleValueModifier linearModifier = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("LinearDiscreteDoubleValueModifier"));
+      if (linearModifier != null) ComparisonFactorModifierParameter.Value = linearModifier;
+      ParameterizeComparisonFactorModifiers();
+
+      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      villageQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
+      selectionPressureAnalyzer = new ValueAnalyzer();
+      villageSelectionPressureAnalyzer = new ValueAnalyzer();
+      ParameterizeAnalyzers();
+      UpdateAnalyzers();
+
       Initialize();
     }
@@ -304 +322 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       SASEGASA clone = (SASEGASA)base.Clone(cloner);
+      clone.qualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(qualityAnalyzer);
+      clone.villageQualityAnalyzer = (BestAverageWorstQualityAnalyzer)cloner.Clone(villageQualityAnalyzer);
+      clone.selectionPressureAnalyzer = (ValueAnalyzer)cloner.Clone(selectionPressureAnalyzer);
+      clone.villageSelectionPressureAnalyzer = (ValueAnalyzer)cloner.Clone(villageSelectionPressureAnalyzer);
       clone.Initialize();
       return clone;
@@ -390 +412 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
-      InitializeSelectors();
-      InitializeAnalyzers();
-      UpdateSelectors();
-      UpdateAnalyzers();
-      InitializeComparisonFactorModifiers();
-      UpdateComparisonFactorModifiers();
       NumberOfVillagesParameter.ValueChanged += new EventHandler(NumberOfVillagesParameter_ValueChanged);
       NumberOfVillages.ValueChanged += new EventHandler(NumberOfVillages_ValueChanged);
@@ -405 +421 @@
       MaximumGenerations.ValueChanged += new EventHandler(MaximumGenerations_ValueChanged);
       if (Problem != null) {
-        UpdateCrossovers();
-        UpdateMutators();
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
       }
@@ -425 +439 @@
         ((IStochasticOperator)op).RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
     }
-    private void InitializeSelectors() {
-      selectors = new List<ISelector>();
-      selectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
-      ParameterizeSelectors();
-    }
-    private void InitializeAnalyzers() {
-      villageQualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      qualityAnalyzer = new BestAverageWorstQualityAnalyzer();
-      villageSelectionPressureAnalyzer = new ValueAnalyzer();
-      selectionPressureAnalyzer = new ValueAnalyzer();
-      ParameterizeAnalyzers();
-    }
-    private void InitializeComparisonFactorModifiers() {
-      comparisonFactorModifiers = new List<IDiscreteDoubleValueModifier>();
-      comparisonFactorModifiers.AddRange(ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name));
-      ParameterizeComparisonFactorModifiers();
-    }
     private void ParameterizeSelectors() {
-      foreach (ISelector selector in Selectors) {
+      foreach (ISelector selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
         selector.NumberOfSelectedSubScopesParameter.Value = null;
@@ -450 +447 @@
       }
       if (Problem != null) {
-        foreach (ISingleObjectiveSelector selector in Selectors.OfType<ISingleObjectiveSelector>()) {
+        foreach (ISingleObjectiveSelector selector in SelectorParameter.ValidValues.OfType<ISingleObjectiveSelector>()) {
           selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
@@ -485 +482 @@
     }
     private void ParameterizeComparisonFactorModifiers() {
-      foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers) {
+      foreach (IDiscreteDoubleValueModifier modifier in ComparisonFactorModifierParameter.ValidValues) {
         modifier.IndexParameter.ActualName = "Reunifications";
         modifier.StartIndexParameter.Value = new IntValue(0);
@@ -492 +489 @@
         modifier.EndValueParameter.ActualName = ComparisonFactorUpperBoundParameter.Name;
         modifier.ValueParameter.ActualName = "ComparisonFactor";
-      }
-    }
-    private void UpdateSelectors() {
-      ISelector oldSelector = SelectorParameter.Value;
-      SelectorParameter.ValidValues.Clear();
-      foreach (ISelector selector in Selectors.OrderBy(x => x.Name))
-        SelectorParameter.ValidValues.Add(selector);
-
-      ISelector proportionalSelector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType().Name.Equals("ProportionalSelector"));
-      if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
-
-      if (oldSelector != null) {
-        ISelector selector = SelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
-        if (selector != null) SelectorParameter.Value = selector;
-      }
-    }
-    private void UpdateComparisonFactorModifiers() {
-      IDiscreteDoubleValueModifier oldModifier = ComparisonFactorModifier;
-
-      ComparisonFactorModifierParameter.ValidValues.Clear();
-      foreach (IDiscreteDoubleValueModifier modifier in comparisonFactorModifiers)
-        ComparisonFactorModifierParameter.ValidValues.Add(modifier);
-
-      if (oldModifier != null) {
-        IDiscreteDoubleValueModifier mod = ComparisonFactorModifierParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldModifier.GetType());
-        if (mod != null) ComparisonFactorModifierParameter.Value = mod;
       }
     }