Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.GeneticAlgorithm

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Algorithms.GeneticAlgorithm {
@@ -377 +376 @@
           foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
             param.Depth = 1;
-          Analyzer.Operators.Add(analyzer);
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
         }
       }
-      Analyzer.Operators.Add(qualityAnalyzer);
+      Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     }
     private GeneticAlgorithmMainLoop FindMainLoop(IOperator start) {

branches/HeuristicLab.TimeSeries/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

@@ -509 +509 @@
       IslandAnalyzer.Operators.Clear();
       Analyzer.Operators.Clear();
-      IslandAnalyzer.Operators.Add(islandQualityAnalyzer);
+      IslandAnalyzer.Operators.Add(islandQualityAnalyzer, islandQualityAnalyzer.EnabledByDefault);
       if (Problem != null) {
         foreach (IAnalyzer analyzer in Problem.Operators.OfType<IAnalyzer>()) {
           foreach (IScopeTreeLookupParameter param in analyzer.Parameters.OfType<IScopeTreeLookupParameter>())
             param.Depth = 2;
-          Analyzer.Operators.Add(analyzer);
+          Analyzer.Operators.Add(analyzer, analyzer.EnabledByDefault);
         }
       }
-      Analyzer.Operators.Add(qualityAnalyzer);
+      Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     }
     private IslandGeneticAlgorithmMainLoop FindMainLoop(IOperator start) {