turing_machine 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6343fe9455c4501953afaaefc30d0705f348528a
-  data.tar.gz: 662f0eedd0069a630a6d3ac22a1cd3fa1a895b15
+  metadata.gz: 69b723c3c3b1fa44ff2c610c31427d78d671f3af
+  data.tar.gz: 450138ddef11a944e89ef4b7fe59cd1ba022c56f
 SHA512:
-  metadata.gz: 40f2436cfdcc9da7fd82146e84fb81dbeb505914b6fa905b199cc091771b328cec3c8ed7d7b10cc2e43b8bc40d62f2c18ca4de10d2296678fa83191af83fdcc3
-  data.tar.gz: 3a67ca0e6a8bad420e241bc974979d627c2ccb45691be3a4af4d02d3a9c5f3c71e2b11d508452243289a2203c2d511c1f4afe529908bea2dbdac25a85d6ab798
+  metadata.gz: d0243d15028a9223ca6dce3ba47ee9e3ac2c47fe6e444d0415052bb7626ad9ed84bbcbdf75d00fe8afac833a8af3e5396e5b83eec2c87fe02d381b0a2e6a1c44
+  data.tar.gz: c9d9e26a2b25ed0bba74acf8ddbee1893b934a262fa4557f4da4d87a312529c769c2b725d7a8f3ea3e8a68944da937520862b78edb6563d5c894560b8cf304a9

data/README.md

@@ -21,9 +21,13 @@ or create your own. Then run the Turing machine with, for example:
 
     $ turing_machine instruction_sets/busy_beaver_1
 
-Look at the
+To initialize the tape with some data, use `--tape`:
+
+    $ turing_machine instruction_sets/copy --tape 111
+
+Finally, look at the
 [InstructionsParser class](lib/turing_machine/instructions_parser.rb) for a
-documentation of the instruction format.
+documentation of the instruction format if you want to write your own.
 
 ## Contributing
 

data/bin/turing_machine

@@ -4,8 +4,12 @@ require 'turing_machine'
 
 include TuringMachine
 
+cli_parser = CommandLineParser.new(ARGV)
+options = cli_parser.parse
+
 if ARGV[0].nil?
-  exit(1)
+  puts cli_parser.help
+  exit
 else
   filename = ARGV[0]
 end
@@ -21,7 +25,7 @@ instructions = parser.parse
 
 initial_state = 'A'
 
-instance = Instance.new(instructions, initial_state)
+instance = Instance.new(instructions, initial_state, Tape.new(options.tape))
 
 # This should be testable.
 loop do

data/instruction_sets/copy

@@ -0,0 +1,10 @@
+0 A => N N HALT
+1 A => 0 R B
+0 B => 0 R C
+1 B => 1 R B
+0 C => 1 L D
+1 C => 1 R C
+0 D => 0 L E
+1 D => 1 L D
+0 E => 1 R A
+1 E => 1 L E

data/lib/turing_machine.rb

@@ -4,6 +4,7 @@ require 'turing_machine/state_register'
 require 'turing_machine/instructions'
 require 'turing_machine/instructions_parser'
 require 'turing_machine/instance'
+require 'turing_machine/command_line_parser'
 
 module TuringMachine
   # Your code goes here...

data/lib/turing_machine/command_line_parser.rb

@@ -0,0 +1,43 @@
+require 'optparse'
+require 'ostruct'
+
+module TuringMachine
+
+  class CommandLineParser
+
+    def initialize(args)
+      @args = args
+      @options = OpenStruct.new
+      @options.tape = '0'
+
+      @opt_parser = OptionParser.new do |opts|
+        opts.banner = "Usage: turing_machine instruction_set [options]"
+
+        opts.on("-t", "--tape DATA", "Initialize the tape with DATA") do |data|
+          @options.tape = data
+        end
+
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+
+        opts.on_tail("--version", "Show version") do
+          puts VERSION
+          exit
+        end
+      end
+    end
+
+    def parse
+      @opt_parser.parse!(@args)
+      @options
+    end
+
+    def help
+      @opt_parser.help
+    end
+
+  end
+
+end

data/lib/turing_machine/instance.rb

@@ -3,10 +3,10 @@ module TuringMachine
   # Public: An instance of a Turing machine.
   class Instance
 
-    def initialize(instructions, initial_state)
+    def initialize(instructions, initial_state, tape = Tape.new)
       @instructions = Instructions.new(instructions)
       @state = StateRegister.new(initial_state)
-      @tape = Tape.new
+      @tape = tape
       @sequence = 1
     end
 

data/lib/turing_machine/tape.rb

@@ -3,19 +3,15 @@ module TuringMachine
   # Public: The tape of a Turing machine, combined with the head.
   class Tape
 
-    def initialize
-      # @symbols = [ '0' ]
-      # @index = 0
-      @symbols = Array.new(40) { '0' }
-      @index = 19
+    BLANK_SYMBOL = '0'
+
+    def initialize(data = BLANK_SYMBOL)
+      @symbols = data.scan(/./)
+      @index = 0
     end
 
     attr_reader :index
 
-    # def size
-    #   @symbols.size
-    # end
-
     def head
       @symbols[@index]
     end
@@ -24,11 +20,18 @@ module TuringMachine
       @symbols[@index] = symbol
     end
 
+    # Public: Move the head to the left.
     def shift_left
-      @index -= 1
+      if @index == 0
+        @symbols.unshift(BLANK_SYMBOL)
+      else
+        @index -= 1
+      end
     end
 
+    # Public: Move the head to the right.
     def shift_right
+      @symbols.push(BLANK_SYMBOL) if @index == @symbols.size - 1
       @index += 1
     end
 

data/lib/turing_machine/version.rb

@@ -1,3 +1,3 @@
 module TuringMachine
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/command_line_parser_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+include TuringMachine
+
+describe CommandLineParser do
+
+  it 'parses -t' do
+    cli_parser = CommandLineParser.new %w( -t 11011 )
+    options = cli_parser.parse
+    expect(options.tape).to eq '11011'
+  end
+
+  it 'parses --tape' do
+    cli_parser = CommandLineParser.new %w( --tape 101 )
+    options = cli_parser.parse
+    expect(options.tape).to eq '101'
+  end
+
+  specify 'tape default value' do
+    cli_parser = CommandLineParser.new []
+    options = cli_parser.parse
+    expect(options.tape).to eq '0'
+  end
+
+end

data/spec/instance_spec.rb

@@ -16,16 +16,16 @@ initial_state = 'A'
 describe Instance do
   it 'produces an output' do
     instance = Instance.new(instructions, initial_state)
-    expected = "  1 0000000000000000000000000000000000000000 A -> 1RB\n" +
-               "                       ^"
+    expected = "  1 0 A -> 1RB\n" +
+               "    ^"
     expect(instance.to_s).to eq expected
   end
 
   it 'computes a step' do
     instance = Instance.new(instructions, initial_state)
     instance.proceed
-    expected = "  2 0000000000000000000100000000000000000000 B -> 1LA\n" +
-               "                        ^"
+    expected = "  2 10 B -> 1LA\n" +
+               "     ^"
     expect(instance.to_s).to eq expected
   end
 
@@ -36,8 +36,8 @@ describe Instance do
       }
       instance = Instance.new(instructions, initial_state)
       instance.proceed
-      expected = "  2 0000000000000000000100000000000000000000 HALT\n" +
-                 "                       ^"
+      expected = "  2 1 HALT\n" +
+                 "    ^"
       expect(instance.to_s).to eq expected
     end
   end
@@ -49,8 +49,8 @@ describe Instance do
       }
       instance = Instance.new(instructions, initial_state)
       instance.proceed
-      expected = "  2 0000000000000000000000000000000000000000 HALT\n" +
-                 "                       ^"
+      expected = "  2 0 HALT\n" +
+                 "    ^"
       expect(instance.to_s).to eq expected
 
     end
@@ -74,8 +74,8 @@ describe Instance do
       }
       instance = Instance.new(instructions, initial_state)
       instance.proceed
-      expected = "  2 0000000000000000000100000000000000000000 HALT\n" +
-                 "                        ^"
+      expected = "  2 10 HALT\n" +
+                 "     ^"
       expect(instance.to_s).to eq expected
     end
 

data/spec/tape_spec.rb

@@ -8,12 +8,17 @@ describe Tape do
 
   describe '.new' do
 
-    # it 'has a single cell' do
-    #   expect(tape.size).to eq 1
-    # end
-
     it 'has a initial current symbol of "0"' do
-      expect(tape.head).to eq '0'
+      expect(tape.head).to eq Tape::BLANK_SYMBOL
+    end
+
+    it 'takes optional data as an argument' do
+      tape_with_data = Tape.new('101')
+      expect(tape_with_data.index).to eq 0
+      tape_with_data.shift_right
+      expect(tape_with_data.head).to eq '0'
+      tape_with_data.shift_right
+      expect(tape_with_data.head).to eq '1'
     end
 
   end
@@ -32,19 +37,48 @@ describe Tape do
     it 'moves to the cell to the left' do
       tape.head = '1'
       tape.shift_left
-      expect(tape.head).to eq '0'
+      expect(tape.head).to eq Tape::BLANK_SYMBOL
     end
 
     it 'moves to the cell to the right' do
       tape.head = '1'
       tape.shift_right
-      expect(tape.head).to eq '0'
+      expect(tape.head).to eq Tape::BLANK_SYMBOL
+    end
+
+    specify do
+      tape.shift_left
+      tape.shift_right
+      tape.shift_left
+      expect("#{tape}").to eq Tape::BLANK_SYMBOL * 2
     end
 
   end
 
-  it 'has a string representation' do
-    expect("#{tape}").to eq '0' * 40
+  describe 'string representation' do
+
+    context 'default initialization' do
+      it 'has a representation' do
+        expect("#{tape}").to eq Tape::BLANK_SYMBOL
+      end
+    end
+
+    context 'after left move' do
+      it 'has a representation' do
+        tape.head = '1'
+        tape.shift_left
+        expect("#{tape}").to eq Tape::BLANK_SYMBOL + '1'
+      end
+    end
+
+    context 'after right move' do
+      it 'has a representation' do
+        tape.head = '1'
+        tape.shift_right
+        expect("#{tape}").to eq '1' + Tape::BLANK_SYMBOL
+      end
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turing_machine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Xavier Nayrac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,15 +118,18 @@ files:
 - instruction_sets/busy_beaver_3
 - instruction_sets/busy_beaver_3-2
 - instruction_sets/busy_beaver_4
+- instruction_sets/copy
 - instruction_sets/copy_with_data
 - instruction_sets/write101
 - lib/turing_machine.rb
+- lib/turing_machine/command_line_parser.rb
 - lib/turing_machine/instance.rb
 - lib/turing_machine/instructions.rb
 - lib/turing_machine/instructions_parser.rb
 - lib/turing_machine/state_register.rb
 - lib/turing_machine/tape.rb
 - lib/turing_machine/version.rb
+- spec/command_line_parser_spec.rb
 - spec/instance_spec.rb
 - spec/instructions_parser_spec.rb
 - spec/instructions_spec.rb
@@ -160,6 +163,7 @@ signing_key:
 specification_version: 4
 summary: A Turing machine
 test_files:
+- spec/command_line_parser_spec.rb
 - spec/instance_spec.rb
 - spec/instructions_parser_spec.rb
 - spec/instructions_spec.rb