automata 0.0.7 → 0.1.0

data/README.md

@@ -25,6 +25,7 @@ Or install it yourself as:
 ### Creating a new machine
 
 Defining a new machine can be done in two ways: 
+
 * From a structured YAML file.
 * Through class setter methods.
 
@@ -79,7 +80,7 @@ We can define each property of the DFA in a similar manner.
 Now that we've built a machine, we can pass it input and let it work its magic. Consider our DFA built using our `examples/dfa_sample.yml` file, which accepts all strings starting with _00_. Let's experiment with some input:
 
     # We can make sure it's a valid DFA
-    >> dfa.is_valid?
+    >> dfa.valid?
     => true
     >> dfa.accepts? '001'
     => true
@@ -90,7 +91,7 @@ Awesomesauce.
 
 ## Special Characters
 
-* _&_ - Represents an ε-transition (epsilon/empty transition)
+* _&_ - Represents an ε-transition (epsilon transition)
 
 ## Contributing
 

data/examples/dfa_sample.yml

@@ -9,21 +9,21 @@ states:
   - C
   - D
 alphabet:
-  - '0'
-  - '1'
+  - 0
+  - 1
 start: A
 accept:
   - C
 transitions:
   A:
-    '0': B
-    '1': D
+    0: B
+    1: D
   B:
-    '0': C
-    '1': D
+    0: C
+    1: D
   C:
-    '0': C
-    '1': C
+    0: C
+    1: C
   D:
-    '0': D
-    '1': D
+    0: D
+    1: D

data/examples/nfa_2.yml

@@ -11,21 +11,21 @@ states:
   - C
   - D
 alphabet:
-  - '0'
-  - '1'
+  - 0
+  - 1
 start: B
 accept:
   - A
   - D
 transitions:
   A:
-    '1': A
+    1: A
   B:
     '&':
       - A
       - C
   C:
-    '0':
+    0:
       - C
       - D
-    '1': C
+    1: C

data/lib/automata.rb

@@ -5,5 +5,17 @@ require "automata/dfa"
 require "automata/nfa"
 
 module Automata
-  # Your code goes here...
+
 end
+
+class Hash
+  # Transforms all keys of a hash to strings.
+  #
+  # @param [Hash] the Hash whose keys to convert.
+  # @return [Hash] the new Hash with strings as keys.
+  def self.keys_to_strings(obj)
+    return obj unless obj.kind_of? Hash
+    obj = obj.inject({}){|h,(k,v)| h[k.to_s] = Hash.keys_to_strings(v); h}
+    return obj
+  end
+end

data/lib/automata/dfa.rb

@@ -11,9 +11,11 @@ module Automata
       #   Iterate through each states to verify the graph
       #   is not disjoint.
       @transitions.each do |key, val|
-        @alphabet.each { |a| return false unless @transitions[key].has_key? a }
+        @alphabet.each do |a| 
+          return false unless @transitions[key].has_key? a.to_s
+        end
       end
-      true
+      return true
     end
     
     # Determines whether the DFA accepts a given string.
@@ -21,10 +23,8 @@ module Automata
     # @param [String] input the string to use as input for the DFA.
     # @return [Boolean] whether or not the DFA accepts the string.
     def accepts?(input)
-      head = @start
-      input.each_char do |symbol|
-        head = @transitions[head][symbol]
-      end
+      head = @start.to_s
+      input.each_char { |symbol| head = @transitions[head][symbol] }
       is_accept_state? head
     end
     
@@ -33,7 +33,7 @@ module Automata
     # @param [String] state the state label to check.
     # @return [Boolean] whether or not the state is an accept state.
     def is_accept_state?(state)
-      @accept.include? state
+      @accept.include? state.to_s
     end
   end
 end

data/lib/automata/state_diagram.rb

@@ -28,6 +28,7 @@ module Automata
       @start = yaml['start'] || params[:start]
       @accept = yaml['accept'] || params[:accept]
       @transitions = yaml['transitions'] || params[:transitions]
+      @transitions = Hash.keys_to_strings(@transitions)
     end
   end
 end

data/lib/automata/version.rb

@@ -1,3 +1,3 @@
 module Automata
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automata
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70318108152500 !ruby/object:Gem::Requirement
+  requirement: &70286071406040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318108152500
+  version_requirements: *70286071406040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70318108151900 !ruby/object:Gem::Requirement
+  requirement: &70286071405420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70318108151900
+  version_requirements: *70286071405420
 description: Create and simulate automaton.
 email:
 - jico@baligod.com
@@ -72,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 149328891026543090
+      hash: 3744273630478255702
 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: 149328891026543090
+      hash: 3744273630478255702
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17