Changeset 11895 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/GenericSymbExprEvaluator.cs

Timestamp:

02/05/15 07:03:15 (9 years ago)

Author:

gkronber

Message:

#2283: constant opt, expressioncompiler, autodiff, fixes in GP solvers

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/GenericSymbExprEvaluator.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/GenericSymbExprEvaluator.cs

@@ -6 +6 @@
 using HeuristicLab.Operators;
 using HeuristicLab.Parameters;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.GrammaticalOptimization {
-  // this type is not storable because we use a func<ITree,double> for evaluation, which references back to the original grammatical optimization problem
   [NonDiscoverableType]
+  [StorableClass]
   [Item("GenericSymbExprEvaluator", "Evaluator for grammatical optimization problems (using a symbolic expression tree encoding).")]
   public class GenericSymbExprEvaluator : SingleSuccessorOperator, IGenericSymbExprEvaluator {
@@ -22 +23 @@
     }
 
+    // cannot save these (eval won't work when loaded from file
     private Func<string, double> evalFunc;
     private Func<ISymbolicExpressionTree, string> toStringFunc;
 
+    [StorableConstructor]
+    private GenericSymbExprEvaluator(bool deserializing) : base(deserializing) { }
     public GenericSymbExprEvaluator(GenericSymbExprEvaluator original, Cloner cloner)
       : base(original, cloner) {