Changeset 10263

Timestamp:

12/20/13 16:17:52 (10 years ago)

Author:

gkronber

Message:

#2109 implemented a wrapper for evaluators that transforms genotypes to phenotypes for symbolic regression (deleted obsolete evaluators)

Location:

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GrammaticalEvolution-3.3.csproj (modified) (1 diff)
• Symbolic/GESymbolicDataAnalysisSingleObjectiveEvaluator.cs (modified) (2 diffs)
• Symbolic/GESymbolicRegressionConstantOptimizationEvaluator.cs (deleted)
• Symbolic/GESymbolicRegressionSingleObjectiveEvaluator.cs (modified) (2 diffs)
• Symbolic/GESymbolicRegressionSingleObjectiveMaxAbsoluteErrorEvaluator.cs (deleted)
• Symbolic/GESymbolicRegressionSingleObjectiveMeanAbsoluteErrorEvaluator.cs (deleted)
• Symbolic/GESymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs (deleted)
• Symbolic/GESymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs (deleted)
• Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)
• Symbolic/IGESymbolicDataAnalysisSingleObjectiveEvaluator.cs (modified) (2 diffs)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution

@@ -2 +2 @@
 *.Settings
 Plugin.cs
+*.user
+bin

@@ -2 +2 @@
 *.Settings
 Plugin.cs
+*.user
+bin

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution-3.3.csproj

@@ -202 +202 @@
     <Compile Include="Symbolic\GESymbolicDataAnalysisSingleObjectiveEvaluator.cs" />
     <Compile Include="Symbolic\GESymbolicDataAnalysisSingleObjectiveProblem.cs" />
-    <Compile Include="Symbolic\GESymbolicRegressionConstantOptimizationEvaluator.cs" />
     <Compile Include="Symbolic\GESymbolicRegressionSingleObjectiveEvaluator.cs" />
-    <Compile Include="Symbolic\GESymbolicRegressionSingleObjectiveMaxAbsoluteErrorEvaluator.cs" />
-    <Compile Include="Symbolic\GESymbolicRegressionSingleObjectiveMeanAbsoluteErrorEvaluator.cs" />
-    <Compile Include="Symbolic\GESymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs" />
-    <Compile Include="Symbolic\GESymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs" />
     <Compile Include="Symbolic\GESymbolicRegressionSingleObjectiveProblem.cs" />
-    <Compile Include="Symbolic\IGESymbolicDataAnalysisEvaluator.cs" />
-    <Compile Include="Symbolic\IGESymbolicDataAnalysisProblem.cs" />
-    <Compile Include="Symbolic\IGESymbolicDataAnalysisSingleObjectiveEvaluator.cs" />
-    <Compile Include="Symbolic\IGESymbolicDataAnalysisValidationAnalyzer.cs" />
-    <Compile Include="Symbolic\IGESymbolicRegressionEvaluator.cs" />
-    <Compile Include="Symbolic\IGESymbolicRegressionSingleObjectiveEvaluator.cs" />
+    <Compile Include="Symbolic\IGESymbolicDataAnalysisEvaluator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Symbolic\IGESymbolicDataAnalysisProblem.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Symbolic\IGESymbolicDataAnalysisSingleObjectiveEvaluator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Symbolic\IGESymbolicDataAnalysisValidationAnalyzer.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Symbolic\IGESymbolicRegressionEvaluator.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Symbolic\IGESymbolicRegressionSingleObjectiveEvaluator.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <None Include="HeuristicLab.snk" />
     <Compile Include="ArtificialAnt\GEArtificialAntEvaluator.cs" />

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicDataAnalysisSingleObjectiveEvaluator.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Parameters;
@@ -53 +54 @@
       Parameters.Add(new LookupParameter<DoubleValue>(QualityParameterName, "The quality of the evaluated symbolic data analysis solution."));
     }
-
-    public abstract double Evaluate(IExecutionContext context, ISymbolicExpressionTree tree, T problemData, IEnumerable<int> rows);
   }
 }

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicRegressionSingleObjectiveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
@@ -27 +32 @@
 namespace HeuristicLab.Problems.GrammaticalEvolution {
   [StorableClass]
-  public abstract class GESymbolicRegressionSingleObjectiveEvaluator : GESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>,
+  public class GESymbolicRegressionSingleObjectiveEvaluator : GESymbolicDataAnalysisSingleObjectiveEvaluator<IRegressionProblemData>,
                                                                        IGESymbolicRegressionSingleObjectiveEvaluator {
+
+    public const string EvaluatorParameterName = "Evaluator";
+    public IValueParameter<ISymbolicRegressionSingleObjectiveEvaluator> EvaluatorParameter {
+      get { return (IValueParameter<ISymbolicRegressionSingleObjectiveEvaluator>)Parameters[EvaluatorParameterName]; }
+    }
+
+    private ISymbolicRegressionSingleObjectiveEvaluator Evaluator {
+      get { return EvaluatorParameter.Value; }
+    }
+
     [StorableConstructor]
     protected GESymbolicRegressionSingleObjectiveEvaluator(bool deserializing) : base(deserializing) { }
     protected GESymbolicRegressionSingleObjectiveEvaluator(GESymbolicRegressionSingleObjectiveEvaluator original, Cloner cloner) : base(original, cloner) { }
-    protected GESymbolicRegressionSingleObjectiveEvaluator() : base() { }
+    public GESymbolicRegressionSingleObjectiveEvaluator()
+      : base() {
+      Parameters.Add(new ValueParameter<ISymbolicRegressionSingleObjectiveEvaluator>(EvaluatorParameterName, "The symbolic regression evaluator that should be used to assess the quality of trees.", new SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator()));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new GESymbolicRegressionSingleObjectiveEvaluator(this, cloner);
+    }
+
+    public override bool Maximization {
+      get { return Evaluator.Maximization; }
+    }
+
+    public override IOperation Apply() {
+      var genotype = IntegerVectorParameter.ActualValue;
+
+      // translate to phenotype
+      var tree = GenotypeToPhenotypeMapperParameter.ActualValue.Map(
+        SymbolicExpressionTreeGrammarParameter.ActualValue,
+        genotype
+      );
+      SymbolicExpressionTreeParameter.ActualValue = tree; // write to scope for analyzers
+
+      // create operation for evaluation
+      var evalOp = ExecutionContext.CreateChildOperation(Evaluator);
+      var successorOp = base.Apply();
+
+      return new OperationCollection(evalOp, successorOp);
+    }
   }
 }

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs

@@ -61 +61 @@
 
     public GESymbolicRegressionSingleObjectiveProblem()
-      : base(new RegressionProblemData(), new GESymbolicRegressionSingleObjectivePearsonRSquaredEvaluator(), new UniformRandomIntegerVectorCreator()) {
+      : base(new RegressionProblemData(), new GESymbolicRegressionSingleObjectiveEvaluator(), new UniformRandomIntegerVectorCreator()) {
       Parameters.Add(new FixedValueParameter<DoubleLimit>(EstimationLimitsParameterName, EstimationLimitsParameterDescription));
 
@@ -81 +81 @@
     private void AfterDeserialization() {
       RegisterEventHandlers();
-      // compatibility
-      bool changed = false;
-      if (!Operators.OfType<SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer>().Any()) {
-        Operators.Add(new SymbolicRegressionSingleObjectiveTrainingParetoBestSolutionAnalyzer());
-        changed = true;
-      }
-      if (!Operators.OfType<SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer>().Any()) {
-        Operators.Add(new SymbolicRegressionSingleObjectiveValidationParetoBestSolutionAnalyzer());
-        changed = true;
-      }
-      if (changed) {
-        ParameterizeOperators();
-      }
     }
 

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/IGESymbolicDataAnalysisSingleObjectiveEvaluator.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
@@ -30 +31 @@
     where T : class,IDataAnalysisProblemData {
     bool Maximization { get; }
-
-    double Evaluate(IExecutionContext context, ISymbolicExpressionTree tree, T problemData, IEnumerable<int> rows);
   }
 }

@@ -2 +2 @@
 *.Settings
 Plugin.cs
+*.user
+bin