automata 0.0.5 → 0.0.6

data/lib/automata/nfa.rb

@@ -22,18 +22,16 @@ module Automata
     #
     def accepts?(string)
       heads = [@start]
+      
+      #--
+      # Move any initial e-transitions
+      if has_transition?(@start, '&')
+        transition(@start, '&').each { |h| heads << h } 
+      end
+      
       string.each_char do |symbol|
         newHeads, eTrans = [], []
-        
-        #--
-        # Move any e-transitions
-        heads.each do |head|
-          if has_transition?(head, '&')
-            transition(head, '&').each { |t| eTrans << t }
-          end
-        end
-        eTrans.each { |h| heads << h }
-        
+                
         heads.each do |head|
           #--
           # Check if head can transition read symbol
@@ -42,6 +40,16 @@ module Automata
             transition(head, symbol).each { |t| newHeads << t }
           end
         end
+        
+        #--
+        # Move any e-transitions
+        newHeads.each do |head|
+          if has_transition?(head, '&')
+            transition(head, '&').each { |t| eTrans << t }
+          end
+        end
+        eTrans.each { |t| newHeads << t }
+        
         heads = newHeads
         break if heads.empty?
       end

data/lib/automata/version.rb

@@ -1,3 +1,3 @@
 module Automata
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/nfa_spec.rb

@@ -2,37 +2,40 @@ require 'spec_helper'
 
 describe Automata::NFA do
   
+  ##
+  # NFA with e-transitions
+  #
   context "Initializing from a valid file" do
     before do
-      @nfa = Automata::NFA.new(file: 'examples/nfa_sample.yml')
+      @nfa = Automata::NFA.new(file: 'examples/nfa_2.yml')
     end
     
-    it "should accept 'a'" do
-      @nfa.accepts?('a').should == true
+    it "should accept '0'" do
+      @nfa.accepts?('0').should == true
     end
     
-    it "should accept 'aa'" do
-      @nfa.accepts?('aa').should == true
+    it "should accept '1'" do
+      @nfa.accepts?('1').should == true
     end
     
     it "should accept the empty string" do
       @nfa.accepts?('').should == true
     end
     
-    it "should not accept 'b'" do
-      @nfa.accepts?('b').should == false
+    it "should not accept '01'" do
+      @nfa.accepts?('01').should == false
     end
     
-    it "should accept 'ab'" do
-      @nfa.accepts?('ab').should == true
+    it "should accept '10'" do
+      @nfa.accepts?('10').should == true
     end
     
-    it "should accept 'abab'" do
-      @nfa.accepts?('abab').should == true
+    it "should accept '11'" do
+      @nfa.accepts?('11').should == true
     end
     
-    it "should accept 'aab'" do
-      @nfa.accepts?('aab').should == false
+    it "should accept '110'" do
+      @nfa.accepts?('110').should == true
     end
   end
   
@@ -46,6 +49,9 @@ describe Automata::NFA do
     end
   end
   
+  ##
+  # NFA without e-transitions
+  #
   context "Initializing a NFA by params" do
     before do
       states = ['q1','q2','q3','q4']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automata
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70101266746740 !ruby/object:Gem::Requirement
+  requirement: &70295152631100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101266746740
+  version_requirements: *70295152631100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70101266745440 !ruby/object:Gem::Requirement
+  requirement: &70295152630000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70101266745440
+  version_requirements: *70295152630000
 description: Create and simulate automaton.
 email:
 - jico@baligod.com
@@ -48,8 +48,8 @@ files:
 - Rakefile
 - automata.gemspec
 - examples/dfa_sample.yml
+- examples/nfa_1.yml
 - examples/nfa_2.yml
-- examples/nfa_sample.yml
 - lib/automata.rb
 - lib/automata/dfa.rb
 - lib/automata/nfa.rb
@@ -72,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2023160774653295454
+      hash: 830920834745777469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2023160774653295454
+      hash: 830920834745777469
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17