circuits 0.11.2 → 0.11.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTYwYmM0YTZmMjVmMzQxZWU5M2Y0ZTUxNjAwNWVlM2U4NDVjOTA0YQ==
+    YTUwYzEzOTc5ZGVmNzIyZTg2ZjNjZmEwN2RjMTNjMzk1ZWIxOTRiOQ==
   data.tar.gz: !binary |-
-    OGQ3ZTMzMjA4ODdiMTZiOGY1YzQ4YTE5ZjUyMWY5MTZlODhiOGI5Nw==
+    YmM1YTFiM2U2OTRhY2MzNTMwM2RjMTM3NWVjYmVmOWQ4NWMyN2ZmMg==
 SHA512:
   metadata.gz: !binary |-
-    YTliMmUwNWJlZjg0MGZjYjFkZDlkMzdjODgwOWRjMmUxZWU5NDBmYjU4MWNi
-    ZjJmOWUwMWViZDVmZmY0ODhmZjg5ODVkMDE1MTcyMzM1NzY4N2FjNzRhNWU0
-    Nzg0YWNjOTI3ZWRjMGI1MTg0NTY1MTMwZWE2YTE2NDdjNzM3YjA=
+    NTJiMzMzODdhMDZkNzAxZDU0ZmIzN2I1ZjI2OTA0ODQwZmE1YWU0ZDY3Zjc2
+    MTE5MjI5NGMzYTFmZmVjZjRlNWJiNzBlZmNiOTVhNzNhNWE1MmVjODcyOTcz
+    ZTc5NmZjZmJlYWRiMGJmMDQzNTBkODI5ZjZkMjVhMjIyY2EwYmU=
   data.tar.gz: !binary |-
-    Y2I5ZWNiM2EwMWQ1YWQxNGRhOWI4ZTQ4YjMyMjE1MTQwNjRkYzAxNDg1YWJl
-    ZWViZTc0OTBiNmU0ZGYwMmRkZjk1YjU3MDEyMTA5MTc4M2RmN2QzYTIxNmFh
-    MjljODNkZjAzZTJiMWNmZDJjM2I2NDU5NzY3NGQ2MWI5YzkxMWE=
+    OGUyYTFjZTUwMjNkNTNhZjAyMzI3MzI4OTAzMmRmM2NiNmQ2ZThmODMzMTE4
+    YWQ3Y2U3NTk3MDc0N2EyOGNmZTE4YmU4MWZiNmJjYmEzMDgwYmFkMjM3ODhh
+    NDc0MDRmZDYyZTBkYjI4MDFmZWI0OWEyZTJiNGRmOGJiNzI4ZGI=

data/lib/circuits/component/full_adder.rb

@@ -1,7 +1,6 @@
 require 'circuits/component/base'
-require 'circuits/component/and'
+require 'circuits/component/half_adder'
 require 'circuits/component/or'
-require 'circuits/component/xor'
 
 module Circuits
   module Component
@@ -20,50 +19,36 @@ module Circuits
 
       def create_sub_components
         {
-          and_in: And.new,
-          and_carry: And.new,
+          half_adder_in: HalfAdder.new,
+          half_adder_carry: HalfAdder.new,
           or_gate: Or.new,
-          xor_in: Xor.new,
-          xor_out: Xor.new
         }
       end
 
       def link(sub_components)
-        link_and_in sub_components
-        link_and_carry sub_components
+        link_half_adder_in sub_components
+        link_half_adder_carry sub_components
         link_or_gate sub_components
-        link_xor_in sub_components
-        link_xor_out sub_components
         link_outputs sub_components
       end
 
-      def link_and_in(sub_components)
-        sub_components[:and_in].a.set a
-        sub_components[:and_in].b.set b
+      def link_half_adder_in(sub_components)
+        sub_components[:half_adder_in].a.set a
+        sub_components[:half_adder_in].b.set b
       end
 
-      def link_and_carry(sub_components)
-        sub_components[:and_carry].a.set sub_components[:xor_in].out
-        sub_components[:and_carry].b.set c_in
+      def link_half_adder_carry(sub_components)
+        sub_components[:half_adder_carry].a.set sub_components[:half_adder_in].s
+        sub_components[:half_adder_carry].b.set c_in
       end
 
       def link_or_gate(sub_components)
-        sub_components[:or_gate].a.set sub_components[:and_in].out
-        sub_components[:or_gate].b.set sub_components[:and_carry].out
-      end
-
-      def link_xor_in(sub_components)
-        sub_components[:xor_in].a.set a
-        sub_components[:xor_in].b.set b
-      end
-
-      def link_xor_out(sub_components)
-        sub_components[:xor_out].a.set sub_components[:xor_in].out
-        sub_components[:xor_out].b.set c_in
+        sub_components[:or_gate].a.set sub_components[:half_adder_carry].c
+        sub_components[:or_gate].b.set sub_components[:half_adder_in].c
       end
 
       def link_outputs(sub_components)
-        s.set sub_components[:xor_out].out
+        s.set sub_components[:half_adder_carry].s
         c_out.set sub_components[:or_gate].out
       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.11.2'
+  VERSION = '0.11.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuits
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Henry Muru Paenga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler