Changeset 3601 for trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm

Timestamp:

05/04/10 01:26:04 (15 years ago)

Author:

abeham

Message:

Added replacement operators and IReplacer interface #998

Location:

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• IslandGeneticAlgorithm.cs (modified) (9 diffs)
• IslandGeneticAlgorithmMainLoop.cs (modified) (6 diffs)

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

@@ -76 +76 @@
       get { return (ConstrainedValueParameter<ISelector>)Parameters["EmigrantsSelector"]; }
     }
-    private ConstrainedValueParameter<ISelector> ImmigrationSelectorParameter {
-      get { return (ConstrainedValueParameter<ISelector>)Parameters["ImmigrationSelector"]; }
+    private ConstrainedValueParameter<IReplacer> ImmigrationReplacerParameter {
+      get { return (ConstrainedValueParameter<IReplacer>)Parameters["ImmigrationReplacer"]; }
     }
     private ValueParameter<IntValue> PopulationSizeParameter {
@@ -134 +134 @@
       set { EmigrantsSelectorParameter.Value = value; }
     }
-    public ISelector ImmigrationSelector {
-      get { return ImmigrationSelectorParameter.Value; }
-      set { ImmigrationSelectorParameter.Value = value; }
+    public IReplacer ImmigrationReplacer {
+      get { return ImmigrationReplacerParameter.Value; }
+      set { ImmigrationReplacerParameter.Value = value; }
     }
     public IntValue PopulationSize {
@@ -175 +175 @@
     }
     private List<ISelector> emigrantsSelectors;
-    private List<ISelector> immigrationSelectors;
+    private List<IReplacer> immigrationReplacers;
     private List<IMigrator> migrators;
     private RandomCreator RandomCreator {
@@ -202 +202 @@
       Parameters.Add(new ConstrainedValueParameter<IMigrator>("Migrator", "The migration strategy."));
       Parameters.Add(new ConstrainedValueParameter<ISelector>("EmigrantsSelector", "Selects the individuals that will be migrated."));
-      Parameters.Add(new ConstrainedValueParameter<ISelector>("ImmigrationSelector", "Selects the population from the unification of the original population and the immigrants."));
+      Parameters.Add(new ConstrainedValueParameter<IReplacer>("ImmigrationReplacer", "Selects the population from the unification of the original population and the immigrants."));
       Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions.", new IntValue(100)));
       Parameters.Add(new ValueParameter<IntValue>("MaximumMigrations", "The maximum number of migrations that should occur.", new IntValue(100)));
@@ -238 +238 @@
 
       mainLoop.EmigrantsSelectorParameter.ActualName = EmigrantsSelectorParameter.Name;
-      mainLoop.ImmigrationSelectorParameter.ActualName = ImmigrationSelectorParameter.Name;
+      mainLoop.ImmigrationReplacerParameter.ActualName = ImmigrationReplacerParameter.Name;
       mainLoop.MaximumMigrationsParameter.ActualName = MaximumMigrationsParameter.Name;
       mainLoop.MigrationIntervalParameter.ActualName = MigrationIntervalParameter.Name;
@@ -380 +380 @@
       emigrantsSelectors = new List<ISelector>();
       emigrantsSelectors.AddRange(ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
-      immigrationSelectors = new List<ISelector>();
-      immigrationSelectors.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();
     }
@@ -400 +400 @@
         ParameterizeStochasticOperator(selector);
       }
-      foreach (ISelector selector in immigrationSelectors) {
-        selector.CopySelected = new BoolValue(false);
-        selector.NumberOfSelectedSubScopesParameter.Value = PopulationSize;
-        ParameterizeStochasticOperator(selector);
+      foreach (IReplacer replacer in immigrationReplacers) {
+        ParameterizeStochasticOperator(replacer);
       }
       if (Problem != null) {
@@ -414 +412 @@
           selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
         }
-        foreach (ISingleObjectiveSelector selector in immigrationSelectors.OfType<ISingleObjectiveSelector>()) {
+        foreach (ISingleObjectiveReplacer selector in immigrationReplacers.OfType<ISingleObjectiveReplacer>()) {
           selector.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
           selector.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
@@ -443 +441 @@
       }
 
-      oldSelector = ImmigrationSelectorParameter.Value;
-      ImmigrationSelectorParameter.ValidValues.Clear();
-      foreach (ISelector selector in immigrationSelectors)
-        ImmigrationSelectorParameter.ValidValues.Add(selector);
-      if (oldSelector != null) {
-        ISelector selector = ImmigrationSelectorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
-        if (selector != null) ImmigrationSelectorParameter.Value = selector;
+      IReplacer oldReplacer = ImmigrationReplacerParameter.Value;
+      ImmigrationReplacerParameter.ValidValues.Clear();
+      foreach (IReplacer replacer in immigrationReplacers)
+        ImmigrationReplacerParameter.ValidValues.Add(replacer);
+      if (oldReplacer != null) {
+        IReplacer replacer = ImmigrationReplacerParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldSelector.GetType());
+        if (replacer != null) ImmigrationReplacerParameter.Value = replacer;
       }
     }

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

@@ -70 +70 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["EmigrantsSelector"]; }
     }
-    public ValueLookupParameter<IOperator> ImmigrationSelectorParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["ImmigrationSelector"]; }
+    public ValueLookupParameter<IOperator> ImmigrationReplacerParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["ImmigrationReplacer"]; }
     }
     public ValueLookupParameter<IntValue> PopulationSizeParameter {
@@ -107 +107 @@
     }
     #endregion
-
-    /*#region Properties
-    private GeneticAlgorithmMainLoop GeneticAlgorithmMainLoop {
-      get { return (GeneticAlgorithmMainLoop)((UniformSubScopesProcessor)OperatorGraph.InitialOperator).Operator; }
-    }
-    #endregion*/
 
     [StorableConstructor]
@@ -128 +122 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Migrator", "The migration strategy."));
       Parameters.Add(new ValueLookupParameter<IOperator>("EmigrantsSelector", "Selects the individuals that will be migrated."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("ImmigrationSelector", "Selects the population from the unification of the original population and the immigrants."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("ImmigrationReplacer", "Replaces some of the original population with the immigrants."));
       Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The size of the population of solutions."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumMigrations", "The maximum number of migrations after which the operator should terminate."));
@@ -158 +152 @@
       Placeholder migrator = new Placeholder();
       UniformSubScopesProcessor ussp2 = new UniformSubScopesProcessor();
-      MergingReducer mergingReducer = new MergingReducer();
-      Placeholder immigrationSelector = new Placeholder();
-      RightReducer rightReducer = new RightReducer();
+      Placeholder immigrationReplacer = new Placeholder();
       IntCounter migrationsCounter = new IntCounter();
       Comparator maxMigrationsComparator = new Comparator();
@@ -238 +230 @@
       migrator.OperatorParameter.ActualName = MigratorParameter.Name;
 
-      immigrationSelector.Name = "Immigration Selector (placeholder)";
-      immigrationSelector.OperatorParameter.ActualName = ImmigrationSelectorParameter.Name;
+      immigrationReplacer.Name = "Immigration Replacer (placeholder)";
+      immigrationReplacer.OperatorParameter.ActualName = ImmigrationReplacerParameter.Name;
 
       migrationsCounter.Name = "Migrations + 1";
@@ -293 +285 @@
       emigrantsSelector.Successor = null;
       migrator.Successor = ussp2;
-      ussp2.Operator = mergingReducer;
+      ussp2.Operator = immigrationReplacer;
       ussp2.Successor = migrationsCounter;
-      mergingReducer.Successor = immigrationSelector;
-      immigrationSelector.Successor = rightReducer;
-      rightReducer.Successor = null;
+      immigrationReplacer.Successor = null;
       migrationsCounter.Successor = maxMigrationsComparator;
       maxMigrationsComparator.Successor = bestQualityMemorizer3;