circuits 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzM3ZDQ5NWZkNzAxNDNiYTA5MTA3NzdiNzNhOWE5MjJkZjM5YjUxYg==
+    OTFhZjhiMjI3ODFkN2IzMmUyOGUwMGFkYjBiZTJhZmQ3YjVmMDhkOA==
   data.tar.gz: !binary |-
-    NDYzMDY5ZmRhN2E2MTI3MGE1MGI3ZDM1ZDRiOWM0MDBjYTJjNmY3Yg==
+    M2RkOGE5YjkwOWNhNjA5NzcxOWM0ZTc4OTNiYTAxZDk2YTcxZmFmYg==
 SHA512:
   metadata.gz: !binary |-
-    ZDYxNDM1MTM3ODk1YmIzMDMwNWM0YzYzYTc0MzVmZWRkNDhlY2JiZjU0ZWEy
-    OThjMDA4ZGQ3MWUwM2JjZDMxYjQ0ZWNkODk5ZGZhNGMyYzY0MDRmNzgzZjVi
-    MThiZWMyNmQ5N2JmNWM4YWYwYzQ5ODNkNzgwNzZhOWE4MDg3YTc=
+    NWExY2I5NGI4NDEyZGM4ZDFhZmY0NjdmYzM5OWIxYWY0Y2IwYWNlMTg5NjRj
+    YjJlYzFiMDYxZmFlZjdmMzIwY2I1ZWQ0MmJmZGJkMDZlYTFkNTZmMjk2YjVk
+    NmRmNGNhZDU2Y2YzYTE0Y2JhNGE2MTgxNjIwODgzY2Q3ZTIxYzk=
   data.tar.gz: !binary |-
-    NGJlYTEyYTlhMjU4ZThjYTgxNGY0M2U4ZjBjODJkY2U0MGYwMTFlMjE5MWNm
-    YmU5ZDA5NDY2ZmFmNDc3NjExZjE3ZTBkMDllOTY3NGVmYTY1NjJmY2IwNDE1
-    MjAyMDBhMWQ3NWY0NmQ5MDJkYTlmMWM1MGQwYmNjYmMwYWE4MTI=
+    N2E3YjI0MjkyYjBjN2I0YjA0NTZjYjVkMmM3ZGRhMWNlODNkOTIwNzJlMTdm
+    OTgwMGJjNDBjYWMyZjhhOTIxZDcwNDNjNDM1YzkyY2U5NmJhNTJiNTI4ZmEw
+    YzExMTc5MTM5MWRmNDQzYzhkMTA3NTA4YTk2OTcwZTc5YjE4NGI=

data/lib/circuits/component.rb

@@ -5,117 +5,117 @@ module Circuits
   # A component has a set of inputs an outputs. Every `tick` a componnent
   # computes its outputs, but the componnent will wait for the `tock` before the
   # componnent updates its own outputs
-  module Component
-    # Creates the Component with inputs and outputs
-    # @param opts [Hash] options to create the Component with
-    # @option opts [Array<Input>, FixNum] :inputs The array of inputs to use, or
-    #   the number of inputs to create
+  module Component
+    # Creates the Component with inputs and outputs
+    # @param opts [Hash] options to create the Component with
+    # @option opts [Array<Input>, FixNum] :inputs The array of inputs to use, or
+    #   the number of inputs to create
     def initialize(opts = {})
       set_defaults
       create_inputs opts
       create_outputs opts
       create_port_mappings
       setup
-    end
-
-    # Does the internal computation and sets the outputs
-    def tick
-      fail NotImplementedError
-    end
-
-    # Sets all the outputs expose what was set in #tick
-    def tock
-      outputs.each(&:tock)
-    end
-
-    # Gets the teminal assigned to the port
-    # @param port [Symbol] The symbol that represents the terminal
-    # @return [Input, Output] The terminal
-    def [](port)
-      p = @port_mappings[port]
-      case p[:type]
-      when :input
-        @inputs[p[:number]]
-      when :output
-        @outputs[p[:number]]
-      end
-    end
-
-    # Assigns to an input or output
-    # @param port [Symbol] The symbol that represents the terminal
-    # @param terminal [Input, Output] The terminal to assign
-    # @return [Input, Output] The terminal that was passed in
-    def []=(port, terminal)
-      p = @port_mappings[port]
-      case p[:type]
-      when :input
-        @inputs[p[:number]] = terminal
-      when :output
-        @outputs[p[:number]] = terminal
-      end
-    end
-
-    # the inputs of this component
-    attr_reader :inputs
-
-    # the outputs of this component
-    attr_reader :outputs
-
-    private
-
-    def create_inputs(opts)
-      if opts[:inputs].class == Array
-        @inputs = opts[:inputs]
-        @input_count = @inputs.length
-      elsif opts[:inputs].class == Fixnum
-        @input_count = opts[:inputs]
-      end
-      @inputs ||= @input_count.times.collect { Circuits::Terminal::Input.new }
-    end
-
-    def create_outputs(opts)
-      if opts[:outputs].class == Array
-        @outputs = opts[:outputs]
-        @output_count = @outputs.length
-      elsif opts[:outputs].class == Fixnum
-        @output_count = opts[:outputs]
-      end
-      @outputs ||= @output_count.times.collect do
-        Circuits::Terminal::Output.new
-      end
-    end
-
-    def create_port_mappings
-      return @port_mappings unless @port_mappings.nil?
-      @port_mappings = {}
-      input_mappings.each { |x| @port_mappings.merge!(x) }
-      output_mappings.each { |x| @port_mappings.merge!(x) }
-      @port_mappings
-    end
-
-    def input_mappings
-      return [{ in: { type: :input, number: 0 } }] if @input_count == 1
-      @input_count.times.collect do |i|
-        { num_to_port(i) =>  { type: :input, number: i } }
-      end
-    end
-
-    def output_mappings
-      return[{ out: { type: :output, number: 0 } }] if @output_count == 1
-      @output_count.times.collect do |i|
-        { num_to_port(i + @input_count) =>  { type: :output, number: i } }
-      end
-    end
-
-    def num_to_port(i)
-      (i + 'a'.ord).chr.to_sym
-    end
-
-    def set_defaults
-      fail NotImplementedError
-    end
-
+    end
+
+    # Does the internal computation and sets the outputs
+    def tick
+      fail NotImplementedError
+    end
+
+    # Sets all the outputs expose what was set in #tick
+    def tock
+      outputs.each(&:tock)
+    end
+
+    # Gets the teminal assigned to the port
+    # @param port [Symbol] The symbol that represents the terminal
+    # @return [Input, Output] The terminal
+    def [](port)
+      p = @port_mappings[port]
+      case p[:type]
+      when :input
+        @inputs[p[:number]]
+      when :output
+        @outputs[p[:number]]
+      end
+    end
+
+    # Assigns to an input or output
+    # @param port [Symbol] The symbol that represents the terminal
+    # @param terminal [Input, Output] The terminal to assign
+    # @return [Input, Output] The terminal that was passed in
+    def []=(port, terminal)
+      p = @port_mappings[port]
+      case p[:type]
+      when :input
+        @inputs[p[:number]] = terminal
+      when :output
+        @outputs[p[:number]] = terminal
+      end
+    end
+
+    # the inputs of this component
+    attr_reader :inputs
+
+    # the outputs of this component
+    attr_reader :outputs
+
+    private
+
+    def create_inputs(opts)
+      if opts[:inputs].class == Array
+        @inputs = opts[:inputs]
+        @input_count = @inputs.length
+      elsif opts[:inputs].class == Fixnum
+        @input_count = opts[:inputs]
+      end
+      @inputs ||= @input_count.times.collect { Circuits::Terminal::Input.new }
+    end
+
+    def create_outputs(opts)
+      if opts[:outputs].class == Array
+        @outputs = opts[:outputs]
+        @output_count = @outputs.length
+      elsif opts[:outputs].class == Fixnum
+        @output_count = opts[:outputs]
+      end
+      @outputs ||= @output_count.times.collect do
+        Circuits::Terminal::Output.new
+      end
+    end
+
+    def create_port_mappings
+      return @port_mappings unless @port_mappings.nil?
+      @port_mappings = {}
+      input_mappings.each { |x| @port_mappings.merge!(x) }
+      output_mappings.each { |x| @port_mappings.merge!(x) }
+      @port_mappings
+    end
+
+    def input_mappings
+      return [{ in: { type: :input, number: 0 } }] if @input_count == 1
+      @input_count.times.collect do |i|
+        { num_to_port(i) => { type: :input, number: i } }
+      end
+    end
+
+    def output_mappings
+      return[{ out: { type: :output, number: 0 } }] if @output_count == 1
+      @output_count.times.collect do |i|
+        { num_to_port(i + @input_count) => { type: :output, number: i } }
+      end
+    end
+
+    def num_to_port(i)
+      (i + 'a'.ord).chr.to_sym
+    end
+
+    def set_defaults
+      fail NotImplementedError
+    end
+
     def setup
-    end
+    end
   end
 end

data/lib/circuits/component/not.rb

@@ -5,14 +5,14 @@ module Circuits
     # Logical NOT Operator
     class Not
       include Component
-
-      # Sets the output to be the result of a logical NOT of the inputs
-      def tick
-        outputs[0].set(!inputs[0].get)
-      end
-
-      private
-
+
+      # Sets the output to be the result of a logical NOT of the inputs
+      def tick
+        outputs[0].set(!inputs[0].get)
+      end
+
+      private
+
       def set_defaults
         @input_count = 1
         @output_count = 1

data/lib/circuits/component/sr_nand.rb

@@ -8,10 +8,7 @@ module Circuits
 
       # Computes the outputs based on the inputs and previous state
       def tick
-        2.times.each do
-          sub_components.each(&:tick)
-          sub_components.each(&:tock)
-        end
+        update_internal_components
         self[:q].set nand_1[:out].get
         self[:not_q].set nand_2[:out].get
       end
@@ -20,6 +17,19 @@ module Circuits
 
       attr_reader :nand_1, :nand_2, :sub_components
 
+      def create_internal_components
+        @nand_1 = Nand.new
+        @nand_2 = Nand.new
+        @sub_components = [@nand_1, @nand_2]
+      end
+
+      def link_internal_components
+        nand_1[:a] = self[:not_s]
+        nand_2[:a] = self[:not_r]
+        nand_1[:b] = nand_2[:out]
+        nand_2[:b] = nand_1[:out]
+      end
+
       def set_defaults
         @input_count = 2
         @output_count = 2
@@ -32,13 +42,15 @@ module Circuits
       end
 
       def setup
-        @nand_1 = Nand.new
-        @nand_2 = Nand.new
-        @sub_components = [@nand_1, @nand_2]
-        nand_1[:a] = self[:not_s]
-        nand_2[:a] = self[:not_r]
-        nand_1[:b] = nand_2[:out]
-        nand_2[:b] = nand_1[:out]
+        create_internal_components
+        link_internal_components
+      end
+
+      def update_internal_components
+        2.times.each do
+          sub_components.each(&:tick)
+          sub_components.each(&:tock)
+        end
       end
     end
   end

data/lib/circuits/component/sr_nor.rb

@@ -8,10 +8,7 @@ module Circuits
 
       # Computes the outputs based on the inputs and previous state
       def tick
-        2.times.each do
-          sub_components.each(&:tick)
-          sub_components.each(&:tock)
-        end
+        update_internal_components
         self[:q].set nor_1[:out].get
         self[:not_q].set nor_2[:out].get
       end
@@ -20,6 +17,19 @@ module Circuits
 
       attr_reader :nor_1, :nor_2, :sub_components
 
+      def create_internal_components
+        @nor_1 = Nor.new
+        @nor_2 = Nor.new
+        @sub_components = [@nor_1, @nor_2]
+      end
+
+      def link_internal_components
+        nor_1[:a] = self[:r]
+        nor_2[:a] = self[:s]
+        nor_1[:b] = nor_2[:out]
+        nor_2[:b] = nor_1[:out]
+      end
+
       def set_defaults
         @input_count = 2
         @output_count = 2
@@ -32,13 +42,15 @@ module Circuits
       end
 
       def setup
-        @nor_1 = Nor.new
-        @nor_2 = Nor.new
-        @sub_components = [@nor_1, @nor_2]
-        nor_1[:a] = self[:r]
-        nor_2[:a] = self[:s]
-        nor_1[:b] = nor_2[:out]
-        nor_2[:b] = nor_1[:out]
+        create_internal_components
+        link_internal_components
+      end
+
+      def update_internal_components
+        2.times.each do
+          sub_components.each(&:tick)
+          sub_components.each(&:tock)
+        end
       end
     end
   end

data/lib/circuits/terminal.rb

@@ -1,5 +1,5 @@
-module Circuits
-  # A terminal holds a logical state, it can be attatched to components
-  module Terminal
-  end
-end
+module Circuits
+  # A terminal holds a logical state, it can be attatched to components
+  module Terminal
+  end
+end

data/lib/circuits/version.rb

@@ -1,5 +1,5 @@
 # Circuits allows you to express logical circuits in code
 module Circuits
   # The version of the Circuits gem
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuits
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Henry Muru Paenga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler