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

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

@@ -68 +68 @@
       get { return (IValueLookupParameter<IntValue>)Parameters[DataMigrationIntervalParameterName]; }
     }
-    public IFixedValueParameter<IntValue> RandomSamplesParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[RandomSamplesParameterName]; }
+    public IFixedValueParameter<PercentValue> RandomSamplesParameter {
+      get { return (IFixedValueParameter<PercentValue>)Parameters[RandomSamplesParameterName]; }
     }
     public ILookupParameter<IntValue> IterationsParameter {
@@ -81 +81 @@
     #region properties
 
-    public int RandomSamples {
+    public double RandomSamples {
       get { return RandomSamplesParameter.Value.Value; }
       set { RandomSamplesParameter.Value.Value = value; }
@@ -104 +104 @@
       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>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each island.", new IntValue()));
+      Parameters.Add(new FixedValueParameter<PercentValue>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each 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>(IterationsParameterName, "The number of performed iterations."));
@@ -116 +116 @@
       var samples = FitnessCalculationPartitionParameter.ActualValue;
       var fixedSamples = FixedSamplesPartitionParameter.ActualValue;
-      var randomSamples = RandomSamples;
+      var randomSamples = (int)RandomSamples * samples.Size;
 
       var dataMigrationInterval = DataMigrationIntervalParameter.ActualValue.Value;