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

Timestamp:

02/02/15 13:37:38 (10 years ago)

Author:

gkronber

Message:

#2283: solution reorg

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization

Files:

• HeuristicLab.Problems.GrammaticalOptimization.csproj (modified) (1 diff)
• Problems/EvenParityProblem.cs (modified) (2 diffs)
• Problems/HardPalindromeProblem.cs (modified) (2 diffs)
• Problems/PalindromeProblem.cs (modified) (2 diffs)
• Problems/RoyalPairProblem.cs (modified) (2 diffs)
• Problems/RoyalSymbolProblem.cs (modified) (2 diffs)
• Problems/SantaFeAntProblem.cs (modified) (2 diffs)
• Problems/SymbolicRegressionPoly10Problem.cs (modified) (2 diffs)
• TreeRepresentation/ISymbolicExpressionTreeProblem.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.csproj

@@ -95 +95 @@
     <Compile Include="Sequence.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TreeRepresentation\GenericSymbExprGrammar.cs" />
-    <Compile Include="TreeRepresentation\GenericSymbExprProblem.cs" />
-    <Compile Include="TreeRepresentation\GrammaticalOptimizationEvaluator.cs" />
-    <Compile Include="TreeRepresentation\IGrammaticalOptimizationEvaluator.cs" />
     <Compile Include="TreeRepresentation\ISymbolicExpressionTreeProblem.cs" />
   </ItemGroup>

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/EvenParityProblem.cs

@@ -29 +29 @@
     public EvenParityProblem() {
       this.grammar = new Grammar(grammarString);
-      this.SymbolicExpressionGrammar = new GenericSymbExprGrammar(new Grammar(hlGrammarString));
+      this.TreeBasedGPGrammar = new Grammar(hlGrammarString);
     }
 
@@ -70 +70 @@
     }
 
-    public ISymbolicExpressionGrammar SymbolicExpressionGrammar { get; private set; }
+    public IGrammar TreeBasedGPGrammar { get; private set; }
     public string ConvertTreeToSentence(ISymbolicExpressionTree tree) {
       var sb = new StringBuilder();

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/HardPalindromeProblem.cs

@@ -21 +21 @@
     public HardPalindromeProblem() {
       this.grammar = new Grammar(grammarString);
-      this.SymbolicExpressionGrammar = new GenericSymbExprGrammar(new Grammar(hlGrammarString));
+      this.TreeBasedGPGrammar = new Grammar(hlGrammarString);
     }
 
@@ -54 +54 @@
     }
 
-    public ISymbolicExpressionGrammar SymbolicExpressionGrammar { get; private set; }
+    public IGrammar TreeBasedGPGrammar { get; private set; }
     public string ConvertTreeToSentence(ISymbolicExpressionTree tree) {
       var sb = new StringBuilder();

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/PalindromeProblem.cs

@@ -23 +23 @@
     public PalindromeProblem() {
       this.grammar = new Grammar(grammarString);
-      this.SymbolicExpressionGrammar = new GenericSymbExprGrammar(new Grammar(hlGrammarString));
+      this.TreeBasedGPGrammar = new Grammar(hlGrammarString);
     }
 
@@ -96 +96 @@
     }
 
-    public ISymbolicExpressionGrammar SymbolicExpressionGrammar { get; private set; }
+    public IGrammar TreeBasedGPGrammar { get; private set; }
     public string ConvertTreeToSentence(ISymbolicExpressionTree tree) {
       var sb = new StringBuilder();

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalPairProblem.cs

@@ -23 +23 @@
     public RoyalPairProblem() {
       this.grammar = new Grammar(grammarString);
-      this.SymbolicExpressionGrammar = new GenericSymbExprGrammar(new Grammar(hlGrammarString));
+      this.TreeBasedGPGrammar = new Grammar(hlGrammarString);
       // TODO: allow configuration of the number of symbols
     }
@@ -46 +46 @@
     }
 
-    public IEnumerable<Feature> GetFeatures(string phrase)
-    {
+    public IEnumerable<Feature> GetFeatures(string phrase) {
       throw new NotImplementedException();
     }
-    public ISymbolicExpressionGrammar SymbolicExpressionGrammar { get; private set; }
+    public IGrammar TreeBasedGPGrammar { get; private set; }
     public string ConvertTreeToSentence(ISymbolicExpressionTree tree) {
       var sb = new StringBuilder();

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalSymbolProblem.cs

@@ -25 +25 @@
     public RoyalSymbolProblem() {
       this.grammar = new Grammar(grammarString);
-      this.SymbolicExpressionGrammar = new GenericSymbExprGrammar(new Grammar(hlGrammarString));
+      this.TreeBasedGPGrammar = new Grammar(hlGrammarString);
       //TODO: allow configuration of the number of symbols
     }
@@ -51 +51 @@
     }
 
-    public ISymbolicExpressionGrammar SymbolicExpressionGrammar { get; private set; }
+    public IGrammar TreeBasedGPGrammar { get; private set; }
     public string ConvertTreeToSentence(ISymbolicExpressionTree tree) {
       var sb = new StringBuilder();

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/SantaFeAntProblem.cs

@@ -35 +35 @@
     public SantaFeAntProblem() {
       this.grammar = new Grammar(grammarString);
-      this.SymbolicExpressionGrammar = new GenericSymbExprGrammar(new Grammar(hlGrammarString));
+      this.TreeBasedGPGrammar = new Grammar(hlGrammarString);
     }
 
@@ -129 +129 @@
     }
 
-    public ISymbolicExpressionGrammar SymbolicExpressionGrammar { get; private set; }
+    public IGrammar TreeBasedGPGrammar { get; private set; }
     public string ConvertTreeToSentence(ISymbolicExpressionTree tree) {
       var sb = new StringBuilder();

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/SymbolicRegressionPoly10Problem.cs

@@ -47 +47 @@
     //           E c E f E j
 
-    private SymbolicExpressionGrammar symbExprGrammar;
-    public ISymbolicExpressionGrammar SymbolicExpressionGrammar {
-      get {
-        return symbExprGrammar;
-      }
-    }
+    public IGrammar TreeBasedGPGrammar { get; private set; }
 
     private readonly IGrammar grammar;
@@ -62 +57 @@
     public SymbolicRegressionPoly10Problem() {
       this.grammar = new Grammar(grammarString);
-      this.symbExprGrammar = new GenericSymbExprGrammar(new Grammar(hlGrammarString));
+      this.TreeBasedGPGrammar = new Grammar(hlGrammarString);
 
       this.N = 500;

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/TreeRepresentation/ISymbolicExpressionTreeProblem.cs

@@ -8 +8 @@
   // represents a grammatical optimization problem that can also be used with tree-based GP in HeuristicLab
   public interface ISymbolicExpressionTreeProblem : IProblem {
-    ISymbolicExpressionGrammar SymbolicExpressionGrammar { get; } // grammar for HL GP
-
+    IGrammar TreeBasedGPGrammar { get; } // grammar for HL GP
     string ConvertTreeToSentence(ISymbolicExpressionTree tree);
   }