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

Timestamp:

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

Author:

abeham

Message:

#893

• fixed wiring in the algorithms

File:

• trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (9 diffs)

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;
       }
     }