Changeset 11857 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming
- Timestamp:
- 02/02/15 13:37:38 (10 years ago)
- Location:
- branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming
- Files:
-
- 2 edited
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming
- Property svn:ignore
-
old new 1 1 bin 2 2 obj 3 *.user
-
- Property svn:ignore
-
branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/GenericSymbExprEvaluator.cs
r11849 r11857 11 11 // this type is not storable because we use a func<ITree,double> for evaluation, which references back to the original grammatical optimization problem 12 12 [NonDiscoverableType] 13 [Item("G rammaticalOptimizationEvaluator", "Evaluator for grammatical optimization problems (using a symbolic expression tree encoding).")]14 public class G rammaticalOptimizationEvaluator : SingleSuccessorOperator, IGrammaticalOptimizationEvaluator {13 [Item("GenericSymbExprEvaluator", "Evaluator for grammatical optimization problems (using a symbolic expression tree encoding).")] 14 public class GenericSymbExprEvaluator : SingleSuccessorOperator, IGenericSymbExprEvaluator { 15 15 public event Action<string, double> SolutionEvaluated; 16 16 … … 25 25 private Func<ISymbolicExpressionTree, string> toStringFunc; 26 26 27 public G rammaticalOptimizationEvaluator(GrammaticalOptimizationEvaluator original, Cloner cloner)27 public GenericSymbExprEvaluator(GenericSymbExprEvaluator original, Cloner cloner) 28 28 : base(original, cloner) { 29 29 this.evalFunc = original.evalFunc; 30 30 } 31 31 32 public G rammaticalOptimizationEvaluator(Func<ISymbolicExpressionTree, string> toStringFunc, Func<string, double> evalFunc)32 public GenericSymbExprEvaluator(Func<ISymbolicExpressionTree, string> toStringFunc, Func<string, double> evalFunc) 33 33 : base() { 34 34 Parameters.Add(new LookupParameter<DoubleValue>("Quality")); … … 39 39 40 40 public override IDeepCloneable Clone(Cloner cloner) { 41 return new G rammaticalOptimizationEvaluator(this, cloner);41 return new GenericSymbExprEvaluator(this, cloner); 42 42 } 43 43 -
branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/GenericSymbExprProblem.cs
r11849 r11857 18 18 [StorableClass] 19 19 [Item("GenericSymbExprProblem", "Represents grammatical optimization problems (using a symbolic expression tree encoding).")] 20 public class GenericSymbExprProblem : SingleObjectiveHeuristicOptimizationProblem<IG rammaticalOptimizationEvaluator, ISymbolicExpressionTreeCreator> {20 public class GenericSymbExprProblem : SingleObjectiveHeuristicOptimizationProblem<IGenericSymbExprEvaluator, ISymbolicExpressionTreeCreator> { 21 21 #region string consts 22 22 private const string SymbolicExpressionTreeGrammarParameterName = "SymbolicExpressionTreeGrammar"; … … 51 51 get { return MaximumSymbolicExpressionTreeLengthParameter.Value; } 52 52 } 53 public new G rammaticalOptimizationEvaluator Evaluator {54 get { return (G rammaticalOptimizationEvaluator)base.Evaluator; }53 public new GenericSymbExprEvaluator Evaluator { 54 get { return (GenericSymbExprEvaluator)base.Evaluator; } 55 55 } 56 56 … … 62 62 63 63 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)); 66 67 Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(50))); 67 68 Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(15))); -
branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/HeuristicLab.Algorithms.GeneticProgramming.csproj
r11851 r11857 64 64 <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath> 65 65 </Reference> 66 <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 67 <SpecificVersion>False</SpecificVersion> 68 <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath> 69 </Reference> 70 <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 71 <SpecificVersion>False</SpecificVersion> 72 <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 73 </Reference> 66 74 <Reference Include="HeuristicLab.Selection-3.3"> 67 75 <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath> … … 69 77 <Reference Include="System" /> 70 78 <Reference Include="System.Core" /> 79 <Reference Include="System.Drawing" /> 71 80 </ItemGroup> 72 81 <ItemGroup> 82 <Compile Include="GenericSymbExprEvaluator.cs" /> 83 <Compile Include="GenericSymbExprGrammar.cs" /> 84 <Compile Include="GenericSymbExprProblem.cs" /> 85 <Compile Include="IGenericSymbExprEvaluator.cs" /> 73 86 <Compile Include="OffspringSelectionGP.cs" /> 74 87 <Compile Include="Properties\AssemblyInfo.cs" /> -
branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/IGenericSymbExprEvaluator.cs
r11849 r11857 1 using System; 2 using System.Collections.Generic; 3 using System.Diagnostics; 4 using System.Linq; 5 using System.Text; 6 using System.Text.RegularExpressions; 7 using HeuristicLab.Common; 8 using HeuristicLab.Core; 1 using HeuristicLab.Core; 9 2 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 10 3 using HeuristicLab.Optimization; 11 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;12 using HeuristicLab.PluginInfrastructure;13 4 14 5 namespace HeuristicLab.Problems.GrammaticalOptimization { 15 public interface IG rammaticalOptimizationEvaluator : ISingleObjectiveEvaluator, ISymbolicExpressionTreeOperator {6 public interface IGenericSymbExprEvaluator : ISingleObjectiveEvaluator, ISymbolicExpressionTreeOperator { 16 7 ILookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter { get; } 17 8 }
Note: See TracChangeset
for help on using the changeset viewer.