panini 1.1.1 → 1.2.0

data/README.rdoc

@@ -82,10 +82,12 @@ This will return a different sentence each time it is called.  It may (and proba
 
 This strategy is used to exhaustively create all of the sentences that may be created by a grammar.
 
-  derivator = Panini::DerivationStrategy::RandomDampened.new(grammar)
+  derivator = Panini::DerivationStrategy::RandomDampened.new(grammar, length_limit)
 
 This will return a new sentence with each call.  If there are no additional sentences to be created it will return nil.  The same sentence may be returned multiple times if the grammar can derive the sentence in multiple ways.
 
+You can optionally pass a limit for the size of sentences to be generated.
+
 === Generating a Sentence
 
 To generate a sentence, call the derivator's sentence method like thus:

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/lib/derivation_strategy/exhaustive.rb

@@ -10,6 +10,10 @@ class Array
     end
   end
 
+  def fully_derived?
+    not has_nonterminals?
+  end
+
 end
 
 
@@ -18,19 +22,20 @@ module Panini
 
     class Exhaustive < Base
 
-      def initialize(grammar)
+      def initialize(grammar, length_limit = nil)
         super(grammar)
         @in_progress_work = [].push([@grammar.start])
+        @length_limit = length_limit
       end
 
       # Generates a sentence. 
       def sentence
-        unless @in_progress_work.empty?
-          while @in_progress_work.top.has_nonterminals?
-            generate_work(@in_progress_work.pop)
-          end
-          @in_progress_work.pop
+        # unless @in_progress_work.empty?
+        while !@in_progress_work.empty? && @in_progress_work.top.has_nonterminals?
+          generate_work(@in_progress_work.pop)
         end
+        @in_progress_work.pop
+        # end
       end
 
       def generate_work(derived_sentence)
@@ -55,26 +60,22 @@ module Panini
               term
             end
           end
-          @in_progress_work.push(newly_derived_sentence)
+
+          # If we're limiting lengths see if completed derivations should
+          # be discarded.
+          unless (limiting_lengths? && newly_derived_sentence.fully_derived? && newly_derived_sentence.size > @length_limit)
+            @in_progress_work.push(newly_derived_sentence)
+          end
+
         end
 
       end
       private :generate_work
 
-      # 
-      # def substitution_pass(derived_sentence)
-      #   substituted = false
-      #   derived_sentence = derived_sentence.flat_map do |term|
-      #     if !substituted && (term.class == Nonterminal)
-      #       substituted = true
-      #       @production_proxies[term].production
-      #     else
-      #       term
-      #     end
-      #   end
-      #   return derived_sentence, substituted
-      # end
-      # private :substitution_pass
+      def limiting_lengths?
+        not @length_limit.nil?
+      end
+      private :limiting_lengths?
 
     end
 

data/panini.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "panini"
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mjbellantoni"]
-  s.date = "2011-09-13"
+  s.date = "2011-09-16"
   s.description = "Panini allows you to generate sentences from a context-free grammar, also known as a CFG."
   s.email = "mjbellantoni@yahoo.com"
   s.extra_rdoc_files = [

data/spec/derivation_strategy/exhaustive_spec.rb

@@ -116,4 +116,41 @@ describe "Grammar with the production S -> xAyBz, A -> 'a' | 'aa', B -> 'b' | 'b
     d.sentence.should == ['x', 'aa', 'y', 'b', 'z']
   end
 
+end
+
+
+describe "Grammar with the production S -> xAyBz, A -> eps | 'a', B -> eps | 'b', and length limit of 4 " do
+
+  before (:each) do
+    @g = Panini::Grammar.new
+
+    @n_s = @g.add_nonterminal
+    @n_a = @g.add_nonterminal
+    @n_b = @g.add_nonterminal
+
+    @n_s.add_production(['x', @n_a, 'y', @n_b, 'z'])
+    @n_a.add_production([])
+    @n_a.add_production(['a'])
+    @n_b.add_production([])
+    @n_b.add_production(['b'])
+  end
+
+  it "generates the sentence ['x', 'y', 'z'] first" do 
+    d = Panini::DerivationStrategy::Exhaustive.new(@g, 4)
+    d.sentence.should == ['x', 'y', 'z']
+  end
+
+  it "generates the sentence ['x', 'y', 'b', 'z'] next" do 
+    d = Panini::DerivationStrategy::Exhaustive.new(@g, 4)
+    d.sentence.should
+    d.sentence.should == ['x', 'y', 'b', 'z']
+  end
+
+  it "generates the sentence ['x', 'a', 'y', 'z'] next" do 
+    d = Panini::DerivationStrategy::Exhaustive.new(@g, 4)
+    d.sentence.should
+    d.sentence.should
+    d.sentence.should == ['x', 'a', 'y', 'z']
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: panini
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - mjbellantoni
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 Z
+date: 2011-09-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3016262755013279233
+      hash: -174120655585110477
       segments: 
       - 0
       version: "0"