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

Timestamp:

01/17/14 13:05:47 (10 years ago)

Author:

mkommend

Message:

#1997: Changed data partition parameters to PercentValue types to enable the use relative numbers and fixed calculation of island partitions.

File:

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

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

@@ -56 +56 @@
 
     #region parameters
-    public IFixedValueParameter<IntValue> FixedSamplesParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[FixedSamplesParameterName]; }
+    public IFixedValueParameter<PercentValue> FixedSamplesParameter {
+      get { return (IFixedValueParameter<PercentValue>)Parameters[FixedSamplesParameterName]; }
     }
     public IValueParameter<ItemArray<IntRange>> FixedSamplesPartitionsParameter {
@@ -71 +71 @@
 
     #region properties
-    public int FixedSamples {
+    public double FixedSamples {
       get { return FixedSamplesParameter.Value.Value; }
       set { FixedSamplesParameter.Value.Value = value; }
@@ -97 +97 @@
     public SymbolicDataAnalysisIslandGeneticAlgorithm()
       : base() {
-      Parameters.Add(new FixedValueParameter<IntValue>(FixedSamplesParameterName, "The number of fixed samples used for fitness calculation in each island.", new IntValue(0)));
+      Parameters.Add(new FixedValueParameter<PercentValue>(FixedSamplesParameterName, "The number of fixed samples used for fitness calculation in each island.", new PercentValue(0.2)));
       Parameters.Add(new ValueParameter<ItemArray<IntRange>>(FixedSamplesPartitionsParameterName, "The fixed samples partitions used for fitness calculation for every island."));
       Parameters.Add(new OptionalValueParameter<ISymbolicDataAnalysisIslandGeneticAlgorithmEvaluator>(EvaluatorParameterName, "The evaluator of the algorithm."));
@@ -174 +174 @@
     }
 
-    protected override void Problem_Reset(object sender, EventArgs e) {
-      FixedSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
-      base.Problem_Reset(sender, e);
-    }
-
     protected override void OnProblemChanged() {
       Problem.FitnessCalculationPartition.ValueChanged += Problem_Reset;
-      FixedSamples = Problem.FitnessCalculationPartition.Size / NumberOfIslands.Value;
 
       if (Problem != null && EvaluatorParameter.Value == null) {
@@ -201 +195 @@
       var samplesEnd = Problem.FitnessCalculationPartition.End;
       var totalSamples = Problem.FitnessCalculationPartition.Size;
-      var fixedSamples = FixedSamples;
+      var fixedSamples = (int)(FixedSamples * totalSamples);
       var islands = NumberOfIslands.Value;
 
-      int offset = (int)Math.Ceiling(((double)(totalSamples - fixedSamples)) / (islands - 1));
+      double shift = (double)((totalSamples - fixedSamples)) / (islands - 1);
+      int offset = (int)Math.Floor(shift);
+      double remainder = shift - offset;
+
       List<IntRange> partitions = new List<IntRange>();
       for (int i = 0; i < islands; i++) {
-        var partitionStart = samplesStart + offset * i;
+        var partitionStart = samplesStart + offset * i + (int)(remainder * i);
         partitions.Add(new IntRange(partitionStart, partitionStart + fixedSamples));
       }
 
-      //it can be the case that the last partitions exceeds the allowed samples
-      //move the last partition forward.
+      //if the last partitions exceeds the allowed samples move the last partition forward.
       int exceedsSamples = partitions[partitions.Count - 1].End - samplesEnd;
       if (exceedsSamples > 0) {