Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
02/02/15 13:37:38 (9 years ago)
Author:
gkronber
Message:

#2283: solution reorg

Location:
branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming
Files:
1 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming

    • Property svn:ignore

      •  

        old new  
        11bin
        22obj
         3*.user

  • branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/GenericSymbExprProblem.cs

    r11849 r11857  
    1818  [StorableClass]
    1919  [Item("GenericSymbExprProblem", "Represents grammatical optimization problems (using a symbolic expression tree encoding).")]
    20   public class GenericSymbExprProblem : SingleObjectiveHeuristicOptimizationProblem<IGrammaticalOptimizationEvaluator, ISymbolicExpressionTreeCreator> {
     20  public class GenericSymbExprProblem : SingleObjectiveHeuristicOptimizationProblem<IGenericSymbExprEvaluator, ISymbolicExpressionTreeCreator> {
    2121    #region string consts
    2222    private const string SymbolicExpressionTreeGrammarParameterName = "SymbolicExpressionTreeGrammar";
    … …  
    5151      get { return MaximumSymbolicExpressionTreeLengthParameter.Value; }
    5252    }
    53     public new GrammaticalOptimizationEvaluator Evaluator {
    54       get { return (GrammaticalOptimizationEvaluator)base.Evaluator; }
     53    public new GenericSymbExprEvaluator Evaluator {
     54      get { return (GenericSymbExprEvaluator)base.Evaluator; }
    5555    }
    5656
    … …  
    6262
    6363    public GenericSymbExprProblem(ISymbolicExpressionTreeProblem problem)
    64       : base(new GrammaticalOptimizationEvaluator(problem.ConvertTreeToSentence, problem.Evaluate), new ProbabilisticTreeCreator()) {
    65       Parameters.Add(new ValueParameter<ISymbolicExpressionGrammar>(SymbolicExpressionTreeGrammarParameterName, problem.SymbolicExpressionGrammar));
     64      : base(new GenericSymbExprEvaluator(problem.ConvertTreeToSentence, problem.Evaluate), new ProbabilisticTreeCreator()) {
     65      var grammar = new GenericSymbExprGrammar(problem.TreeBasedGPGrammar);
     66      Parameters.Add(new ValueParameter<ISymbolicExpressionGrammar>(SymbolicExpressionTreeGrammarParameterName, grammar));
    6667      Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(50)));
    6768      Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(15)));
Note: See TracChangeset for help on using the changeset viewer.