Changeset 9182 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGAEvaluator.cs

Timestamp:

01/23/13 10:18:22 (12 years ago)

Author:

mkommend

Message:

#1997: Added reevaluation of elits to symbolic data analysis island ga and changed evaluator to combine the fixed and random samples.

File:

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

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

@@ -44 +44 @@
     private const string FitnessCalculationPartitionParameterName = "FitnessCalculationPartition";
     private const string FixedSamplesPartitionParameterName = "FixedSamplesPartition";
-    private const string FixedSamplesParameterName = "FixedSamples";
-    private const string FixedSamplesFitnessWeightParameterName = "FixedSamplesFitnessWeight";
     private const string RandomSamplesParameterName = "RandomSamples";
-    private const string RandomSamplesFitnessWeightParameterName = "RandomSamplesFitnessWeight";
 
     #region parameter properties
@@ -71 +68 @@
       get { return (ILookupParameter<IntRange>)Parameters[FixedSamplesPartitionParameterName]; }
     }
-    public ILookupParameter<IntValue> FixedSamplesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters[FixedSamplesParameterName]; }
-    }
-    public IFixedValueParameter<DoubleValue> FixedSamplesFitnessWeightParameter {
-      get { return (IFixedValueParameter<DoubleValue>)Parameters[FixedSamplesFitnessWeightParameterName]; }
-    }
     public ILookupParameter<IntValue> RandomSamplesParameter {
       get { return (ILookupParameter<IntValue>)Parameters[RandomSamplesParameterName]; }
     }
-    public IFixedValueParameter<DoubleValue> RandomSamplesFitnessWeightParameter {
-      get { return (IFixedValueParameter<DoubleValue>)Parameters[RandomSamplesFitnessWeightParameterName]; }
-    }
     #endregion
 
-    #region properties
-    public double FixedSamplesFitnessWeight {
-      get { return FixedSamplesFitnessWeightParameter.Value.Value; }
-      set { FixedSamplesFitnessWeightParameter.Value.Value = value; }
-    }
-    public double RandomSamplesFitnessWeight {
-      get { return RandomSamplesFitnessWeightParameter.Value.Value; }
-      set { RandomSamplesFitnessWeightParameter.Value.Value = value; }
-    }
-    #endregion
 
     [StorableConstructor]
@@ -114 +92 @@
       Parameters.Add(new ValueLookupParameter<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>(FixedSamplesParameterName, "The number of fixed samples used for fitness calculation in each island."));
-      Parameters.Add(new FixedValueParameter<DoubleValue>(FixedSamplesFitnessWeightParameterName, "The weight of the fitness obtained on the fixed samples.", new DoubleValue(1)));
       Parameters.Add(new LookupParameter<IntValue>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each island."));
-      Parameters.Add(new FixedValueParameter<DoubleValue>(RandomSamplesFitnessWeightParameterName, "The weight of the fitness obtained on the random samples.", new DoubleValue(1)));
 
       EvaluatorParameter.Hidden = true;
@@ -124 +99 @@
     public override IOperation Apply() {
       var evaluator = EvaluatorParameter.ActualValue;
-      //calculate fitness on fixed samples
-      if (QualityParameter.ActualValue == null) {
-        var operation = ExecutionContext.CreateOperation(evaluator, ExecutionContext.Scope);
-        return new OperationCollection() { operation, ExecutionContext.CreateOperation(this) };
-      }
-      //calculate fitness on random samples;
+      var tree = SymbolicExpressionTreeParameter.ActualValue;
+      var problemData = ProblemDataParameter.ActualValue;
+
       var samplesStart = FitnessCalculationPartitionParameter.ActualValue.Start;
       var samplesEnd = FitnessCalculationPartitionParameter.ActualValue.End;
@@ -137 +109 @@
       var maxRandomSamples = samplesEnd - samplesStart - fixedSamplesEnd + fixedSamplesStart;
 
-      var rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart).Where(r => r < fixedSamplesStart || r >= fixedSamplesEnd);
-      rows = rows.SampleRandomWithoutRepetition(RandomParameter.ActualValue, randomSamples, maxRandomSamples);
-
-      var fixedSamplesFitness = QualityParameter.ActualValue.Value;
-      var tree = SymbolicExpressionTreeParameter.ActualValue;
-      var problemData = ProblemDataParameter.ActualValue;
+      //create rows for evaluation
+      var fixedRows = Enumerable.Range(fixedSamplesStart, fixedSamplesEnd - fixedSamplesStart);
+      var randomRows = Enumerable.Range(samplesStart, samplesEnd - samplesStart).Where(r => r < fixedSamplesStart || r >= fixedSamplesEnd);
+      randomRows = randomRows.SampleRandomWithoutRepetition(RandomParameter.ActualValue, randomSamples, maxRandomSamples);
+      var rows = fixedRows.Concat(randomRows);
 
       var executionContext = new ExecutionContext(ExecutionContext, evaluator, ExecutionContext.Scope);
-      var randomSamplesFitness = evaluator.Evaluate(executionContext, tree, problemData, rows);
-      QualityParameter.ActualValue.Value = fixedSamplesFitness * FixedSamplesFitnessWeight + randomSamplesFitness * RandomSamplesFitnessWeight;
+      var fitness = evaluator.Evaluate(executionContext, tree, problemData, rows);
+      QualityParameter.ActualValue = new DoubleValue(fitness);
       return base.Apply();
     }