Changeset 13781 for branches/IslandALPS

Timestamp:

04/21/16 15:30:02 (8 years ago)

Author:

pkuelzer

Message:

#2558 migration bug fixed, hopefully

Location:

branches/IslandALPS/IslandALPS/3.3

Files:

• IslandALPSAlgorithm.cs (modified) (5 diffs)
• Offspring Selection/IslandAlpsOffspringSelectionAlgorithm.cs (modified) (5 diffs)

branches/IslandALPS/IslandALPS/3.3/IslandALPSAlgorithm.cs

@@ -576 +576 @@
     private void PopulationSize_ValueChanged(object sender, EventArgs e) {
       ParameterizeSelectors();
+      ParametrizeMigration();
     }
 
@@ -604 +605 @@
 
     private void MigrationRate_ValueChanged(object sender, EventArgs e) {
-      var migrationSize = (int)Math.Ceiling(MigrationRateParameter.Value.Value * PopulationSize.Value);
-      foreach (var selector in EmigrantsSelectorParameter.ValidValues) {
-        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(migrationSize);
-      }
+      ParametrizeMigration();
     }
 
@@ -772 +770 @@
 
     private void ParametrizeMigration() {
-      var migrationSize = (int) Math.Ceiling(MigrationRateParameter.Value.Value*PopulationSize.Value);
+      var migrationSize = (int)Math.Ceiling(MigrationRateParameter.Value.Value * PopulationSize.Value);
+      EmigrantsSelectorParameter.ValidValues.Clear();
       foreach (var selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name)) {
         selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(migrationSize);
@@ -782 +781 @@
       }
 
+      ImmigrationReplacerParameter.ValidValues.Clear();
       foreach (var replacer in ApplicationManager.Manager.GetInstances<IReplacer>().OrderBy(x => x.Name)) {
         ParameterizeStochasticOperatorForLayer(replacer);
@@ -787 +787 @@
       }
 
+      MigratorParameter.ValidValues.Clear();
       MigratorParameter.ValidValues.Add(new LayerMigrator());
     }

branches/IslandALPS/IslandALPS/3.3/Offspring Selection/IslandAlpsOffspringSelectionAlgorithm.cs

@@ -546 +546 @@
 
     private void MigrationRate_ValueChanged(object sender, EventArgs e) {
-      var migrationSize = (int)Math.Ceiling(MigrationRateParameter.Value.Value * PopulationSize.Value);
-      foreach (var selector in EmigrantsSelectorParameter.ValidValues) {
-        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(migrationSize);
-      }
+      ParametrizeMigration();
     }
 
@@ -626 +623 @@
     private void PopulationSize_ValueChanged(object sender, EventArgs e) {
       ParameterizeSelectors();
+      ParametrizeMigration();
     }
 
@@ -795 +793 @@
     private void ParametrizeMigration() {
       var migrationSize = (int) Math.Ceiling(MigrationRateParameter.Value.Value*PopulationSize.Value);
+      EmigrantsSelectorParameter.ValidValues.Clear();
       foreach (var selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name)) {
         selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(migrationSize);
@@ -804 +803 @@
       }
 
+      ImmigrationReplacerParameter.ValidValues.Clear();
       foreach (var replacer in ApplicationManager.Manager.GetInstances<IReplacer>().OrderBy(x => x.Name)) {
         ParameterizeStochasticOperatorForLayer(replacer);
@@ -809 +809 @@
       }
 
+      MigratorParameter.ValidValues.Clear();
       MigratorParameter.ValidValues.Add(new LayerMigrator());
     }