Changeset 11857 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming

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:

• . (modified) (1 prop)
• GenericSymbExprEvaluator.cs (moved) (moved from branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/TreeRepresentation/GrammaticalOptimizationEvaluator.cs) (3 diffs)
• GenericSymbExprGrammar.cs (moved) (moved from branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/TreeRepresentation/GenericSymbExprGrammar.cs)
• GenericSymbExprProblem.cs (moved) (moved from branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/TreeRepresentation/GenericSymbExprProblem.cs) (3 diffs)
• HeuristicLab.Algorithms.GeneticProgramming.csproj (modified) (2 diffs)
• IGenericSymbExprEvaluator.cs (moved) (moved from branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/TreeRepresentation/IGrammaticalOptimizationEvaluator.cs) (1 diff)

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

@@ -1 +1 @@
 bin
 obj
+*.user

@@ -1 +1 @@
 bin
 obj
+*.user

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

@@ -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
   [NonDiscoverableType]
-  [Item("GrammaticalOptimizationEvaluator", "Evaluator for grammatical optimization problems (using a symbolic expression tree encoding).")]
-  public class GrammaticalOptimizationEvaluator : SingleSuccessorOperator, IGrammaticalOptimizationEvaluator {
+  [Item("GenericSymbExprEvaluator", "Evaluator for grammatical optimization problems (using a symbolic expression tree encoding).")]
+  public class GenericSymbExprEvaluator : SingleSuccessorOperator, IGenericSymbExprEvaluator {
     public event Action<string, double> SolutionEvaluated;
 
@@ -25 +25 @@
     private Func<ISymbolicExpressionTree, string> toStringFunc;
 
-    public GrammaticalOptimizationEvaluator(GrammaticalOptimizationEvaluator original, Cloner cloner)
+    public GenericSymbExprEvaluator(GenericSymbExprEvaluator original, Cloner cloner)
       : base(original, cloner) {
       this.evalFunc = original.evalFunc;
     }
 
-    public GrammaticalOptimizationEvaluator(Func<ISymbolicExpressionTree, string> toStringFunc, Func<string, double> evalFunc)
+    public GenericSymbExprEvaluator(Func<ISymbolicExpressionTree, string> toStringFunc, Func<string, double> evalFunc)
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality"));
@@ -39 +39 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new GrammaticalOptimizationEvaluator(this, cloner);
+      return new GenericSymbExprEvaluator(this, cloner);
     }
 

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

@@ -18 +18 @@
   [StorableClass]
   [Item("GenericSymbExprProblem", "Represents grammatical optimization problems (using a symbolic expression tree encoding).")]
-  public class GenericSymbExprProblem : SingleObjectiveHeuristicOptimizationProblem<IGrammaticalOptimizationEvaluator, ISymbolicExpressionTreeCreator> {
+  public class GenericSymbExprProblem : SingleObjectiveHeuristicOptimizationProblem<IGenericSymbExprEvaluator, ISymbolicExpressionTreeCreator> {
     #region string consts
     private const string SymbolicExpressionTreeGrammarParameterName = "SymbolicExpressionTreeGrammar";
@@ -51 +51 @@
       get { return MaximumSymbolicExpressionTreeLengthParameter.Value; }
     }
-    public new GrammaticalOptimizationEvaluator Evaluator {
-      get { return (GrammaticalOptimizationEvaluator)base.Evaluator; }
+    public new GenericSymbExprEvaluator Evaluator {
+      get { return (GenericSymbExprEvaluator)base.Evaluator; }
     }
 
@@ -62 +62 @@
 
     public GenericSymbExprProblem(ISymbolicExpressionTreeProblem problem)
-      : base(new GrammaticalOptimizationEvaluator(problem.ConvertTreeToSentence, problem.Evaluate), new ProbabilisticTreeCreator()) {
-      Parameters.Add(new ValueParameter<ISymbolicExpressionGrammar>(SymbolicExpressionTreeGrammarParameterName, problem.SymbolicExpressionGrammar));
+      : base(new GenericSymbExprEvaluator(problem.ConvertTreeToSentence, problem.Evaluate), new ProbabilisticTreeCreator()) {
+      var grammar = new GenericSymbExprGrammar(problem.TreeBasedGPGrammar);
+      Parameters.Add(new ValueParameter<ISymbolicExpressionGrammar>(SymbolicExpressionTreeGrammarParameterName, grammar));
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(50)));
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(15)));

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

@@ -64 +64 @@
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Selection-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
@@ -69 +77 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GenericSymbExprEvaluator.cs" />
+    <Compile Include="GenericSymbExprGrammar.cs" />
+    <Compile Include="GenericSymbExprProblem.cs" />
+    <Compile Include="IGenericSymbExprEvaluator.cs" />
     <Compile Include="OffspringSelectionGP.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using HeuristicLab.Common;
-using HeuristicLab.Core;
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.GrammaticalOptimization {
-  public interface IGrammaticalOptimizationEvaluator : ISingleObjectiveEvaluator, ISymbolicExpressionTreeOperator {
+  public interface IGenericSymbExprEvaluator : ISingleObjectiveEvaluator, ISymbolicExpressionTreeOperator {
     ILookupParameter<ISymbolicExpressionTree> SymbolicExpressionTreeParameter { get; } 
   }

@@ -1 +1 @@
 bin
 obj
+*.user