Changeset 10353 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/ConsecutiveSamplesEvaluator.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/ConsecutiveSamplesEvaluator.cs (modified) (4 diffs)

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

@@ -63 +63 @@
       get { return (ILookupParameter<IntRange>)Parameters[FixedSamplesPartitionParameterName]; }
     }
-    public IFixedValueParameter<IntValue> ConsecutiveSamplesParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[ConsecutiveSamplesParameterName]; }
+    public IFixedValueParameter<PercentValue> ConsecutiveSamplesParameter {
+      get { return (IFixedValueParameter<PercentValue>)Parameters[ConsecutiveSamplesParameterName]; }
     }
-    public IFixedValueParameter<IntValue> OverlapParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[OverlapParameterName]; }
+    public IFixedValueParameter<PercentValue> OverlapParameter {
+      get { return (IFixedValueParameter<PercentValue>)Parameters[OverlapParameterName]; }
     }
     public IValueLookupParameter<IntValue> DataMigrationIntervalParameter {
@@ -86 +86 @@
     #region properties
 
-    public int ConsecutiveSamples {
+    public double ConsecutiveSamples {
       get { return ConsecutiveSamplesParameter.Value.Value; }
       set { ConsecutiveSamplesParameter.Value.Value = value; }
     }
 
-    public int Overlap {
+    public double Overlap {
       get { return OverlapParameter.Value.Value; }
       set { OverlapParameter.Value.Value = value; }
@@ -113 +113 @@
       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 FixedValueParameter<IntValue>(ConsecutiveSamplesParameterName, "The number of consecutive samples used for fitness calculation in each island.", new IntValue()));
-      Parameters.Add(new FixedValueParameter<IntValue>(OverlapParameterName, "The overlap for the consecutive samples used for every island.", new IntValue()));
+      Parameters.Add(new FixedValueParameter<PercentValue>(ConsecutiveSamplesParameterName, "The relative number of consecutive samples used for fitness calculation in each island.", new PercentValue()));
+      Parameters.Add(new FixedValueParameter<PercentValue>(OverlapParameterName, "The relative overlap for the consecutive samples used for every island.", new PercentValue()));
       Parameters.Add(new ValueLookupParameter<IntValue>(DataMigrationIntervalParameterName, "The number of generations that should pass between data migration phases."));
       Parameters.Add(new LookupParameter<IntValue>(IslandIndexParameterName, "The index of the current island."));
@@ -139 +139 @@
           var islandIndex = IslandIndexParameter.ActualValue.Value;
           var iteration = islandIndex + (generation / dataMigrationInterval);
-          var consecutiveRows = GenerateRows(samples, fixedSamples, ConsecutiveSamples, Overlap, iteration);
+          var consecutiveSamples = (int)ConsecutiveSamples * samples.Size;
+          var overlap = (int)Overlap * consecutiveSamples;
+          var consecutiveRows = GenerateRows(samples, fixedSamples, consecutiveSamples, overlap, iteration);
           rows = rows.Concat(consecutiveRows);
         }