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

Timestamp:

12/03/13 14:52:41 (11 years ago)

Author:

mkommend

Message:

#1997: Added different evaluators for symbolic island algorithms, unit test for consecutive samples evaluator and injected island index into the according scopes.

Location:

branches/DataAnalysis.IslandAlgorithms

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3 (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs (modified) (9 diffs)

branches/DataAnalysis.IslandAlgorithms

@@ -1 +1 @@
 *.suo
+bin

@@ -1 +1 @@
 *.suo
+bin

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

@@ +1 @@
+*.user
 Plugin.cs
 bin

@@ +1 @@
+*.user
 Plugin.cs
 bin

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

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
-using HeuristicLab.Random;
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Symbolic {
@@ -41 +41 @@
     private const string FixedSamplesPartitionParameterName = "FixedSamplesPartition";
     private const string FixedSamplesPartitionsParameterName = "FixedSamplesPartitions";
-    private const string RandomSamplesParameterName = "NumberOfRandomSamples";
     private const string EvaluatorParameterName = "IslandEvaluator";
+    private const string IslandIndexParameterName = "IslandIndex";
     private const string ProblemEvaluatorParameterName = "ProblemEvaluator";
 
@@ -62 +62 @@
       get { return (IValueParameter<ItemArray<IntRange>>)Parameters[FixedSamplesPartitionsParameterName]; }
     }
-    public IFixedValueParameter<IntValue> RandomSamplesParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[RandomSamplesParameterName]; }
-    }
-    public IValueParameter<ISymbolicDataAnalysisIslandGAEvaluator> EvaluatorParameter {
-      get { return (IValueParameter<ISymbolicDataAnalysisIslandGAEvaluator>)Parameters[EvaluatorParameterName]; }
+    public IValueParameter<ISymbolicDataAnalysisIslandGeneticAlgorithmEvaluator> EvaluatorParameter {
+      get { return (IValueParameter<ISymbolicDataAnalysisIslandGeneticAlgorithmEvaluator>)Parameters[EvaluatorParameterName]; }
     }
     private ILookupParameter<ISingleObjectiveEvaluator> ProblemEvaluatorParameter {
@@ -81 +78 @@
       get { return FixedSamplesPartitionsParameter.Value; }
       set { FixedSamplesPartitionsParameter.Value = value; }
-    }
-    public int RandomSamples {
-      get { return RandomSamplesParameter.Value.Value; }
-      set { RandomSamplesParameter.Value.Value = value; }
     }
     #endregion
@@ -106 +99 @@
       Parameters.Add(new FixedValueParameter<IntValue>(FixedSamplesParameterName, "The number of fixed samples used for fitness calculation in each island.", new IntValue(0)));
       Parameters.Add(new ValueParameter<ItemArray<IntRange>>(FixedSamplesPartitionsParameterName, "The fixed samples partitions used for fitness calculation for every island."));
-      Parameters.Add(new FixedValueParameter<IntValue>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each island.", new IntValue(0)));
-      Parameters.Add(new OptionalValueParameter<ISymbolicDataAnalysisIslandGAEvaluator>(EvaluatorParameterName, "The evaluator of the algorithm."));
+      Parameters.Add(new OptionalValueParameter<ISymbolicDataAnalysisIslandGeneticAlgorithmEvaluator>(EvaluatorParameterName, "The evaluator of the algorithm."));
       Parameters.Add(new LookupParameter<ISingleObjectiveEvaluator>(ProblemEvaluatorParameterName, "Internal parameter for name translation", "Evaluator"));
+
+      ScopeTreeAssigner<IntValue> islandIndexAssigner = new ScopeTreeAssigner<IntValue>();
+      islandIndexAssigner.Name = "Insert island index";
+      islandIndexAssigner.LeftSideParameter.ActualName = IslandIndexParameterName;
+      var readonlyIslandIndexes = Enumerable.Range(0, NumberOfIslands.Value).Select(x => (IntValue)new IntValue(x).AsReadOnly());
+      islandIndexAssigner.RightSideParameter.Value = new ItemArray<IntValue>(readonlyIslandIndexes);
 
       ScopeTreeAssigner<IntRange> fixedSamplesPartitionCreator = new ScopeTreeAssigner<IntRange>();
@@ -115 +113 @@
       fixedSamplesPartitionCreator.RightSideParameter.ActualName = FixedSamplesPartitionsParameterName;
 
-      RandomCreator insertionPoint = OperatorGraph.Iterate().OfType<RandomCreator>().Skip(1).First();
+      SubScopesCreator insertionPoint = OperatorGraph.Iterate().OfType<SubScopesCreator>().First();
+      islandIndexAssigner.Successor = fixedSamplesPartitionCreator;
       fixedSamplesPartitionCreator.Successor = insertionPoint.Successor;
-      insertionPoint.Successor = fixedSamplesPartitionCreator;
+      insertionPoint.Successor = islandIndexAssigner;
+
+      //RandomCreator insertionPoint = OperatorGraph.Iterate().OfType<RandomCreator>().Skip(1).First();
+      //fixedSamplesPartitionCreator.Successor = insertionPoint.Successor;
+      //insertionPoint.Successor = fixedSamplesPartitionCreator;
 
       RegisterParameterEvents();
@@ -131 +134 @@
         ReevaluateImmigrants = FixedSamples >= Problem.FitnessCalculationPartition.Size;
       };
-      RandomSamplesParameter.Value.ValueChanged += (o, e) => { ReevaluteElites = RandomSamples != 0; };
       Analyzer.Operators.PropertyChanged += (o, e) => ParameterizeAnalyzers();
       EvaluatorParameter.ValueChanged += (o, e) => ParameterizeEvaluator();
@@ -160 +162 @@
     private void ParameterizeEvaluator() {
       var evaluator = EvaluatorParameter.Value;
-      var islandGAEvaluator = evaluator as SymbolicDataAnalysisIslandGAEvaluator;
-      if (islandGAEvaluator != null) {
-        islandGAEvaluator.RandomSamplesParameter.ActualName = RandomSamplesParameterName;
+
+      var randomEvaluator = evaluator as RandomSamplesEvaluator;
+      if (randomEvaluator != null) {
+        ReevaluteElites = randomEvaluator.RandomSamples != 0;
+      }
+
+      var consecutiveEvaluator = evaluator as ConsecutiveSamplesEvaluator;
+      if (consecutiveEvaluator != null) {
+        consecutiveEvaluator.DataMigrationIntervalParameter.ActualName = MigrationIntervalParameter.Name;
       }
     }
@@ -181 +189 @@
 
       if (Problem != null && EvaluatorParameter.Value == null) {
-        EvaluatorParameter.Value = new SymbolicDataAnalysisIslandGAEvaluator();
+        EvaluatorParameter.Value = new RandomSamplesEvaluator();
       } else if (Problem == null)
         EvaluatorParameter.Value = null;

@@ -1 +1 @@
 *.suo
+bin

@@ +1 @@
+*.user
 Plugin.cs
 bin