logicle 0.1.0 → 0.1.1

data/bin/logicle

@@ -40,10 +40,10 @@ end
 
 # Evaluate the circuit.
 simulator.evaluate
-bulbs = simulator.outputs
 
 
 # Print out the bulb states.
+bulbs = simulator.outputs
 bulbs.each_with_index do |bulb, i|
   puts "Bulb \##{ i + 1 }:  #{ bulb.state ? "on" : "off" }"
 end

data/lib/logicle.rb

@@ -1,5 +1,4 @@
 require_relative "logicle/version"
-require_relative "logicle/logicle"
 require_relative "logicle/simulator"
 require_relative "logicle/tgf_reader"
 require_relative "logicle/tgf_writer"

data/lib/logicle/digraph.rb

@@ -6,12 +6,6 @@ module Logicle
       @nodes, @edges = {}, {}
     end
 
-    def evaluate
-      outputs.each_value do |output|
-        output.state
-      end
-    end
-
     def inputs
       @nodes.select { |id, node| node.switch? }
     end
@@ -36,6 +30,11 @@ module Logicle
       end
     end
 
+    def evaluate
+      outputs.each_value { |output| output.state }
+    end
+
+
     private
     def raise_unknown_nodes(node_map={})
       bad_node_ids = node_map.select { |id, node| node.nil? }.keys 

data/lib/logicle/node.rb

@@ -50,7 +50,7 @@ module Logicle
 
     private
     def validate_type(type)
-      if LOGIC_OPERATIONS.keys.include?(type)
+      if LOGIC_OPERATIONS.has_key?(type)
         type
       else
         raise UnknownNodeTypeError, "Unknown node type: '#{ type }'"

data/lib/logicle/tgf_writer.rb

@@ -6,7 +6,7 @@ module Logicle
     end
 
     def write
-      @circuit.nodes.values.each { |node| write_node(node) }
+      @circuit.nodes.each_value { |node| write_node(node) }
 
       write_separator
 
@@ -16,15 +16,21 @@ module Logicle
     private
     def write_node(node)
       id = node.id
+      label = format_label(node)
+
+      @output_file.puts "#{ id } #{ label }"
+    end
+
+    def format_label(node)
       type = case node.type
       when :on, :off 
         "SWITCH"
       else 
-         node.type.to_s.upcase
+        node.type.to_s.upcase
       end
       state = node.state ? "ON" : "OFF"
 
-      @output_file.puts "#{ id } #{ type } (#{ state })"
+      "#{ type } (#{ state })"
     end
 
     def write_separator

data/lib/logicle/version.rb

@@ -1,3 +1,3 @@
 module Logicle
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logicle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -30,7 +30,6 @@ files:
 - examples/simple_solved.tgf
 - lib/logicle.rb
 - lib/logicle/digraph.rb
-- lib/logicle/logicle.rb
 - lib/logicle/node.rb
 - lib/logicle/simulator.rb
 - lib/logicle/tgf_reader.rb

data/lib/logicle/logicle.rb

@@ -1,3 +0,0 @@
-module Logicle
-  FILE_SUFFIX = ".tgf"
-end