Changeset 11846 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization

Timestamp:

02/01/15 16:32:26 (10 years ago)

Author:

gkronber

Message:

#2283 implemented bridge to HL (solve grammatical optimization problem instances with StandardGP and OffspringSelectionGP)

Location:

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

Files:

• HeuristicLab.Algorithms.GrammaticalOptimization.csproj (modified) (1 diff)
• ISolver.cs (added)
• RandomSearch.cs (modified) (3 diffs)
• SequentialSearch.cs (modified) (6 diffs)
• SolverBase.cs (added)

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

@@ -45 +45 @@
     <Compile Include="AlternativesSampler.cs" />
     <Compile Include="AlternativesContextSampler.cs" />
+    <Compile Include="SolverBase.cs" />
+    <Compile Include="ISolver.cs" />
     <Compile Include="SequentialSearch.cs" />
     <Compile Include="ExhaustiveRandomFirstSearch.cs" />

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

@@ -3 +3 @@
 
 namespace HeuristicLab.Algorithms.GrammaticalOptimization {
-  public class RandomSearch {
-    public event Action<string, double> FoundNewBestSolution;
-    public event Action<string, double> SolutionEvaluated;
-
+  public class RandomSearch : SolverBase {
     private readonly int maxLen;
     private readonly Random random;
@@ -17 +14 @@
     }
 
-    public void Run(int maxIterations) {
-      double bestQuality = double.MinValue;
+    public override void Run(int maxIterations) {
       for (int i = 0; i < maxIterations; i++) {
         var sentence = CreateSentence(problem.Grammar).ToString();
         var quality = problem.Evaluate(sentence) / problem.BestKnownQuality(maxLen);
-        RaiseSolutionEvaluated(sentence, quality);
-
-        if (quality > bestQuality) {
-          bestQuality = quality;
-          RaiseFoundNewBestSolution(sentence, quality);
-        }
+        OnSolutionEvaluated(sentence, quality);
       }
     }
@@ -35 +26 @@
       return grammar.CompleteSentenceRandomly(random, sentence, maxLen);
     }
-
-    private void RaiseSolutionEvaluated(string sentence, double quality) {
-      var handler = SolutionEvaluated;
-      if (handler != null) handler(sentence, quality);
-    }
-    private void RaiseFoundNewBestSolution(string sentence, double quality) {
-      var handler = FoundNewBestSolution;
-      if (handler != null) handler(sentence, quality);
-    }
   }
 }

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

@@ -23 +23 @@
   //    ... until phrase is terminal
   // 3) Collect reward and update policy (feedback: state of visited rewards from step 2)
-  public class SequentialSearch {
+  public class SequentialSearch : SolverBase {
     // only for storing states so that it is not necessary to allocate new state strings whenever we select a follow state using the policy
     private class TreeNode {
@@ -37 +37 @@
     }
 
-
-    public event Action<string, double> FoundNewBestSolution;
-    public event Action<string, double> SolutionEvaluated;
 
     private readonly int maxLen;
@@ -52 +49 @@
     private int maxSearchDepth;
 
-    private double bestQuality;
     private string bestPhrase;
     private readonly List<string> stateChain;
@@ -66 +62 @@
     }
 
-    public void Run(int maxIterations) {
-      bestQuality = double.MinValue;
+    public override void Run(int maxIterations) {
       Reset();
 
@@ -79 +74 @@
           if (double.IsNaN(quality)) quality = 0.0;
           Debug.Assert(quality >= 0 && quality <= 1.0);
+
+          if (quality > bestQuality) {
+            bestPhrase = sentence;
+          }
+
+          OnSolutionEvaluated(sentence, quality);
           DistributeReward(quality);
 
-          RaiseSolutionEvaluated(sentence, quality);
-
-          if (quality > bestQuality) {
-            bestQuality = quality;
-            bestPhrase = sentence;
-            RaiseFoundNewBestSolution(sentence, quality);
-          }
         }
       }
@@ -244 +238 @@
     }
     #endregion
-
-    private void RaiseSolutionEvaluated(string sentence, double quality) {
-      var handler = SolutionEvaluated;
-      if (handler != null) handler(sentence, quality);
-    }
-    private void RaiseFoundNewBestSolution(string sentence, double quality) {
-      var handler = FoundNewBestSolution;
-      if (handler != null) handler(sentence, quality);
-    }
+  
   }
 }