Changeset 10177

Timestamp:

12/03/13 14:52:41 (10 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)
• DataAnalysis.IslandAlgorithms.sln (modified) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3 (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/HeuristicLab.Algorithms.DataAnalysis.Symbolic.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/HeuristicLab.Algorithms.DataAnalysis.Symbolic.csproj.user (deleted)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/ISymbolicDataAnalysisIslandAlgorithmEvaluator .cs (moved) (moved from branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/ISymbolicDataAnalysisIslandGAEvaluator .cs) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/RandomSamplesEvaluator .cs (moved) (moved from branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGAEvaluator.cs) (4 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGeneticAlgorithm.cs (modified) (9 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandOffspringSelectionGeneticAlgorithm.cs (modified) (8 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm (modified) (1 prop)
• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm (modified) (1 prop)

branches/DataAnalysis.IslandAlgorithms

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

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

branches/DataAnalysis.IslandAlgorithms/DataAnalysis.IslandAlgorithms.sln

@@ -15 +15 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3", "HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3\HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.csproj", "{F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tests", "HeuristicLab.Tests\HeuristicLab.Tests.csproj", "{F26EC1D3-4338-4F8B-AE5C-434D9256D580}"
 EndProject
 Global
@@ -70 +72 @@
     {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|x86.ActiveCfg = Release|x86
     {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}.Release|x86.Build.0 = Release|x86
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Release|Any CPU.Build.0 = Release|Any CPU
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Release|x64.ActiveCfg = Release|Any CPU
+    {F26EC1D3-4338-4F8B-AE5C-434D9256D580}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

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/HeuristicLab.Algorithms.DataAnalysis.Symbolic.csproj

@@ -123 +123 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ConsecutiveSamplesEvaluator.cs" />
     <Compile Include="SymbolicDataAnalysisIslandOffspringSelectionGeneticAlgorithm.cs" />
-    <Compile Include="ISymbolicDataAnalysisIslandGAEvaluator .cs" />
+    <Compile Include="ISymbolicDataAnalysisIslandAlgorithmEvaluator .cs" />
     <Compile Include="ScopeTreeAssigner.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SymbolicDataAnalysisIslandGAEvaluator.cs" />
+    <Compile Include="RandomSamplesEvaluator .cs" />
     <Compile Include="SymbolicDataAnalysisIslandGeneticAlgorithm.cs" />
   </ItemGroup>

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Symbolic {
-  public interface ISymbolicDataAnalysisIslandGAEvaluator : ISingleObjectiveEvaluator {
+  public interface ISymbolicDataAnalysisIslandGeneticAlgorithmEvaluator : ISingleObjectiveEvaluator {
   }
 }

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

@@ -34 +34 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.Symbolic {
   [StorableClass]
-  public sealed class SymbolicDataAnalysisIslandGAEvaluator : SingleSuccessorOperator, IStochasticOperator, ISymbolicDataAnalysisIslandGAEvaluator {
+  public sealed class RandomSamplesEvaluator : SingleSuccessorOperator, IStochasticOperator, ISymbolicDataAnalysisIslandGeneticAlgorithmEvaluator {
     private const string RandomParameterName = "Random";
     private const string ProblemDataParameterName = "ProblemData";
@@ -56 +56 @@
       get { return (ILookupParameter<DoubleValue>)Parameters[QualityParameterName]; }
     }
-    public IValueLookupParameter<IntRange> FitnessCalculationPartitionParameter {
-      get { return (IValueLookupParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; }
+    public ILookupParameter<IntRange> FitnessCalculationPartitionParameter {
+      get { return (ILookupParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; }
     }
     public ILookupParameter<IntRange> FixedSamplesPartitionParameter {
       get { return (ILookupParameter<IntRange>)Parameters[FixedSamplesPartitionParameterName]; }
     }
-    public ILookupParameter<IntValue> RandomSamplesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters[RandomSamplesParameterName]; }
+    public IFixedValueParameter<IntValue> RandomSamplesParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters[RandomSamplesParameterName]; }
+    }
+    #endregion
+
+    #region properties
+
+    public int RandomSamples {
+      get { return RandomSamplesParameter.Value.Value; }
+      set { RandomSamplesParameter.Value.Value = value; }
     }
     #endregion
 
     [StorableConstructor]
-    private SymbolicDataAnalysisIslandGAEvaluator(bool deserializing) : base(deserializing) { }
-    private SymbolicDataAnalysisIslandGAEvaluator(SymbolicDataAnalysisIslandGAEvaluator original, Cloner cloner)
+    private RandomSamplesEvaluator(bool deserializing) : base(deserializing) { }
+    private RandomSamplesEvaluator(RandomSamplesEvaluator original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicDataAnalysisIslandGAEvaluator(this, cloner);
+      return new RandomSamplesEvaluator(this, cloner);
     }
 
-    public SymbolicDataAnalysisIslandGAEvaluator()
+    public RandomSamplesEvaluator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>(RandomParameterName, "The random generator to use."));
@@ -82 +90 @@
       Parameters.Add(new LookupParameter<IOperator>(EvaluatorParameterName, "The evaluator provided by the symbolic data analysis  problem."));
       Parameters.Add(new LookupParameter<DoubleValue>(QualityParameterName, "The quality which is calculated by the encapsulated evaluator."));
-      Parameters.Add(new ValueLookupParameter<IntRange>(FitnessCalculationPartitionParameterName, "The data partition used to calculate the fitness"));
+      Parameters.Add(new LookupParameter<IntRange>(FitnessCalculationPartitionParameterName, "The data partition used to calculate the fitness"));
       Parameters.Add(new LookupParameter<IntRange>(FixedSamplesPartitionParameterName, "The data partition which is used to calculate the fitness on the fixed samples."));
-      Parameters.Add(new LookupParameter<IntValue>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each island."));
-
-      EvaluatorParameter.Hidden = true;
+      Parameters.Add(new FixedValueParameter<IntValue>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each island.", new IntValue()));
     }
 
@@ -95 +101 @@
       var samples = FitnessCalculationPartitionParameter.ActualValue;
       var fixedSamples = FixedSamplesPartitionParameter.ActualValue;
-      var randomSamples = RandomSamplesParameter.ActualValue.Value;
+      var randomSamples = RandomSamples;
 
       //create fixed rows enumerable

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;

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

@@ -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>();
@@ -116 +114 @@
 
       SubScopesCreator insertionPoint = OperatorGraph.Iterate().OfType<SubScopesCreator>().First();
+      islandIndexAssigner.Successor = fixedSamplesPartitionCreator;
       fixedSamplesPartitionCreator.Successor = insertionPoint.Successor;
-      insertionPoint.Successor = fixedSamplesPartitionCreator;
+      insertionPoint.Successor = islandIndexAssigner;
 
       RegisterParameterEvents();
@@ -131 +130 @@
         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 +158 @@
     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 +185 @@
 
       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