Changeset 10357 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs

Timestamp:

01/20/14 14:52:57 (10 years ago)

Author:

mkommend

Message:

#1997: Corrected insertion of island indexes in symbolic island algorithms.

File:

• branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs (modified) (4 diffs)

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs

@@ -79 +79 @@
       set { FixedSamplesPartitionsParameter.Value = value; }
     }
+
+    private readonly ScopeTreeAssigner<IntValue> islandIndexAssigner;
     #endregion
 
@@ -102 +104 @@
       Parameters.Add(new LookupParameter<ISingleObjectiveEvaluator>(ProblemEvaluatorParameterName, "Internal parameter for name translation", "Evaluator"));
 
-      ScopeTreeAssigner<IntValue> islandIndexAssigner = new ScopeTreeAssigner<IntValue>();
+      islandIndexAssigner = new ScopeTreeAssigner<IntValue>();
       islandIndexAssigner.Name = "Insert island index";
       islandIndexAssigner.LeftSideParameter.ActualName = IslandIndexParameterName;
@@ -129 +131 @@
       if (Problem != null) Problem.FitnessCalculationPartition.ValueChanged += Problem_Reset;
       NumberOfIslandsParameter.ValueChanged += NumberOfIslandsParameter_ValueChanged;
-      NumberOfIslandsParameter.Value.ValueChanged += (o, ev) => RecalculateFixedSamplesPartitions();
+      NumberOfIslandsParameter.Value.ValueChanged += (o, ev) => NumberOfIslandsParameterValue_Changed();
       FixedSamplesParameter.Value.ValueChanged += (o, e) => {
         RecalculateFixedSamplesPartitions();
@@ -170 +172 @@
 
     private void NumberOfIslandsParameter_ValueChanged(object sender, EventArgs e) {
-      NumberOfIslands.ValueChanged += (o, ev) => RecalculateFixedSamplesPartitions();
+      NumberOfIslands.ValueChanged += (o, ev) => NumberOfIslandsParameterValue_Changed();
+      NumberOfIslandsParameterValue_Changed();
+    }
+    private void NumberOfIslandsParameterValue_Changed() {
+      var readonlyIslandIndexes = Enumerable.Range(0, NumberOfIslands.Value).Select(x => (IntValue)new IntValue(x).AsReadOnly());
+      islandIndexAssigner.RightSideParameter.Value = new ItemArray<IntValue>(readonlyIslandIndexes);
       RecalculateFixedSamplesPartitions();
     }