automata 0.0.1 → 0.0.2

data/lib/automata/dfa.rb

@@ -17,7 +17,7 @@ module Automata
     # * *Returns*:
     #   Whether or not the DFA is valid (boolean).
     #
-    def is_valid?
+    def valid?
       @transitions.each do |key, val|
         @alphabet.each { |a| return false unless @transitions[key].has_key? a }
       end

data/lib/automata/state_diagram.rb

@@ -10,21 +10,13 @@ module Automata
     attr_accessor :states, :alphabet, :start, :accept, :transitions
     
     def initialize(params={})
-      @states = params[:states]
-      @alphabet = params[:alphabet]
-      @start = params[:start]
-      @accept = params[:accept]
-      @transitions = params[:transitions]
-    end
-    
-    def init_from_file(filename)
-      yaml = YAML::load_file(filename)
-      @states = yaml['states']
-      @alphabet = yaml['alphabet']
-      @start = yaml['start']
-      @accept = yaml['accept']
-      @transitions = yaml['transitions']
-      yaml
+      yaml = {}
+      yaml = YAML::load_file(params[:file]) if params.has_key? :file
+      @states = yaml['states'] || params[:states]
+      @alphabet = yaml['alphabet'] || params[:alphabet]
+      @start = yaml['start'] || params[:start]
+      @accept = yaml['accept'] || params[:accept]
+      @transitions = yaml['transitions'] || params[:transitions]
     end
     
   end

data/lib/automata/version.rb

@@ -1,3 +1,3 @@
 module Automata
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/dfa_spec.rb

@@ -1,14 +1,75 @@
 require 'spec_helper'
 
 describe Automata::DFA do
+  
   context "Initializing from a valid file" do
     before do
-      @dfa = Automata::DFA.new
-      @dfa.init_from_file('examples/dfa_sample.yml')
+      @dfa = Automata::DFA.new(file: 'examples/dfa_sample.yml')
     end
     
     it "should be valid" do
-      @dfa.is_valid?.should == true
+      @dfa.should be_valid
+    end
+    
+    it "should accept '01'" do
+      @dfa.accepts?('01').should == true
+    end
+    
+    it "should accept '001101'" do
+      @dfa.accepts?('001101').should == true
+    end
+    
+    it "should not accept the empty string" do
+      @dfa.accepts?('').should == false
+    end
+    
+    it "should not accept '10'" do
+      @dfa.accepts?('10').should == false
+    end
+  end
+  
+  context "Initializing an empty DFA" do
+    before do
+      @dfa = Automata::DFA.new
+    end
+    
+    it "should be created successfully" do
+      @dfa.should be_an_instance_of Automata::DFA
+    end
+  end
+  
+  context "Initializing a DFA by params" do
+    before do
+      states = ['q1','q2','q3']
+      alphabet = ['0','1']
+      start = 'q1'
+      accept = ['q3']
+      transitions = {
+        'q1' => {
+          '0' => 'q2',
+          '1' => 'q2'
+        },
+        'q2' => {
+          '0' => 'q1',
+          '1' => 'q3'
+        },
+        'q3' => {
+          '0' => 'q3',
+          '1' => 'q3'
+        }
+      }
+      params = {
+        states: states,
+        alphabet: alphabet,
+        start: start,
+        accept: accept,
+        transitions: transitions
+      }
+      @dfa = Automata::DFA.new(params)
+    end
+    
+    it "should create a valid DFA" do
+      @dfa.should be_valid
     end
     
     it "should accept '01'" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automata
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70249174639400 !ruby/object:Gem::Requirement
+  requirement: &70316676891620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70249174639400
+  version_requirements: *70316676891620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70249174654560 !ruby/object:Gem::Requirement
+  requirement: &70316676891100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70249174654560
+  version_requirements: *70316676891100
 description: Create and simulate automaton.
 email:
 - jico@baligod.com
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2006038974877205235
+      hash: -1178858470182539386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2006038974877205235
+      hash: -1178858470182539386
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17