Changeset 11708 for branches

Timestamp:

12/20/14 19:22:32 (10 years ago)

Author:

gkronber

Message:

#2283: worked on bandits for grammatical optimization

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization

Files:

• GrammaticalOptimization.sln (modified) (2 diffs)
• HeuristicLab.Algorithms.Bandits (added)
• HeuristicLab.Algorithms.Bandits/Bandit.cs (added)
• HeuristicLab.Algorithms.Bandits/BanditPolicy.cs (added)
• HeuristicLab.Algorithms.Bandits/EpsGreedyPolicy.cs (added)
• HeuristicLab.Algorithms.Bandits/HeuristicLab.Algorithms.Bandits.csproj (added)
• HeuristicLab.Algorithms.Bandits/IPolicy.cs (added)
• HeuristicLab.Algorithms.Bandits/Properties (added)
• HeuristicLab.Algorithms.Bandits/Properties/AssemblyInfo.cs (added)
• HeuristicLab.Algorithms.Bandits/RandomPolicy.cs (added)
• HeuristicLab.Algorithms.GrammaticalOptimization/ExhaustiveBreadthFirstSearch.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GrammaticalOptimization/ExhaustiveDepthFirstSearch.cs (modified) (2 diffs)
• HeuristicLab.Problems.GrammaticalOptimization.Test/HeuristicLab.Problems.GrammaticalOptimization.Test.csproj (modified) (1 diff)
• HeuristicLab.Problems.GrammaticalOptimization.Test/TestBanditPolicies.cs (added)
• HeuristicLab.Problems.GrammaticalOptimization.Test/TestSolvers.cs (added)
• HeuristicLab.Problems.GrammaticalOptimization/SantaFeAntProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.GrammaticalOptimization/SymbolicRegressionPoly10Problem.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/GrammaticalOptimization.sln

@@ -9 +9 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Main", "Main\Main.csproj", "{524CBD70-6F99-46AF-AD00-A0BC9FD1175B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.Bandits", "HeuristicLab.Algorithms.Bandits\HeuristicLab.Algorithms.Bandits.csproj", "{24408F7D-EE0F-4886-A08B-EC324D662E47}"
 EndProject
 Global
@@ -32 +34 @@
     {524CBD70-6F99-46AF-AD00-A0BC9FD1175B}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {524CBD70-6F99-46AF-AD00-A0BC9FD1175B}.Release|Any CPU.Build.0 = Release|Any CPU
+    {24408F7D-EE0F-4886-A08B-EC324D662E47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {24408F7D-EE0F-4886-A08B-EC324D662E47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {24408F7D-EE0F-4886-A08B-EC324D662E47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {24408F7D-EE0F-4886-A08B-EC324D662E47}.Release|Any CPU.Build.0 = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/ExhaustiveBreadthFirstSearch.cs

@@ -14 +14 @@
 
     public ExhaustiveBreadthFirstSearch(int maxLen) {
-      this.maxLen = maxLen;      
+      this.maxLen = maxLen;
     }
 
@@ -44 +44 @@
         foreach (var alt in alts) {
           var newPhrase = phrase.Remove(ntIdx, 1).Insert(ntIdx, alt);
-          if (newPhrase.All(grammar.IsTerminal)) {
+          if (newPhrase.All(grammar.IsTerminal) && newPhrase.Length <= maxLen) {
             yield return newPhrase;
           } else if (grammar.MinPhraseLength(newPhrase) <= maxLen) {

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/ExhaustiveDepthFirstSearch.cs

@@ -14 +14 @@
 
     public ExhaustiveDepthFirstSearch(int maxLen) {
-      this.maxLen = maxLen;      
+      this.maxLen = maxLen;
     }
 
@@ -44 +44 @@
         foreach (var alt in alts) {
           var newPhrase = phrase.Remove(ntIdx, 1).Insert(ntIdx, alt);
-          if (newPhrase.All(grammar.IsTerminal)) {
+          if (newPhrase.All(grammar.IsTerminal) && newPhrase.Length <= maxLen) {
             yield return newPhrase;
           } else if (grammar.MinPhraseLength(newPhrase) <= maxLen) {

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

@@ -57 +57 @@
   </Choose>
   <ItemGroup>
+    <Compile Include="TestBanditPolicies.cs" />
     <Compile Include="TestInstances.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestSolvers.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Algorithms.Bandits\HeuristicLab.Algorithms.Bandits.csproj">
+      <Project>{24408f7d-ee0f-4886-a08b-ec324d662e47}</Project>
+      <Name>HeuristicLab.Algorithms.Bandits</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Algorithms.GrammaticalOptimization\HeuristicLab.Algorithms.GrammaticalOptimization.csproj">
+      <Project>{eea07488-1a51-412a-a52c-53b754a628b3}</Project>
+      <Name>HeuristicLab.Algorithms.GrammaticalOptimization</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.GrammaticalOptimization\HeuristicLab.Problems.GrammaticalOptimization.csproj">
       <Project>{cb9dccf6-667e-4a13-b82d-dbd6b45a045e}</Project>

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

@@ -9 +9 @@
     private const string grammarString = @"
 G(A):
-A -> l | r | m | ?(A)(A) | AA | AAA
+A -> l | r | m | ?(A)(A) | lA | rA | mA 
 ";
+    // original koza grammar
     // Ant -> left | right | move | if-food-ahead Ant Ant | Ant Ant | Ant Ant Ant
+    // 
+    // here we use a modified grammar which has only one syntax tree for each sentence
 
 

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

@@ -8 +8 @@
 namespace HeuristicLab.Problems.GrammaticalOptimization {
   public class SymbolicRegressionPoly10Problem : IProblem {
-    // length of the longest palindrome in the sentence + number of different symbols occurring in the palindrome
     private const string grammarString = @"
 G(E):
@@ -14 +13 @@
 V -> a .. j 
 ";
+
 
     private readonly IGrammar grammar;