hdl 1.0.2 → 1.0.3

data/lib/hdl/base.rb

@@ -2,7 +2,7 @@ module HDL
   class << self
 
     def version
-      "1.0.2"
+      "1.0.3"
     end
 
     def path

data/lib/hdl/chip/table_chip.rb

@@ -21,6 +21,7 @@ class HDL::TableChip < HDL::Chip
     memoize(pins) do
       check_pins!(pins)
       row = find_row(pins)
+      row ||= dnf_for(pins)
       select_outputs(row)
     end
   end
@@ -37,4 +38,60 @@ class HDL::TableChip < HDL::Chip
     Hash[filtered]
   end
 
+  def dnf_for(pins)
+    outputs.inject({}) do |hash, out|
+      true_rows = @table.select { |row| row[out] }
+
+      clauses = true_rows.map do |row|
+        clause = clause_for(row, pins)
+      end
+
+      clauses.reject! { |c| c.any? { |t| t == false } }
+
+      hash.merge(out => expression_for(clauses))
+    end
+  end
+
+  def clause_for(row, pins)
+    row = row.select { |k, v| inputs.include?(k) }
+    row = Hash[row]
+
+    terms = inputs.map do |input|
+      term_for(input, row, pins)
+    end
+
+    terms.reject { |t| t == true }
+  end
+
+  def term_for(input, row, pins)
+    bool = row[input]
+    term = pins[input]
+
+    if bool
+      term
+    elsif [true, false].include?(term)
+      !term
+    else
+      "NOT(#{term})"
+    end
+  end
+
+  def expression_for(clauses)
+    expr = clauses.map { |c| c.join(" AND ") }.join(" OR ")
+    simplify(expr)
+  end
+
+  def simplify(expression, previous = nil)
+    this = expression.dup
+
+    # TODO
+
+    # Simplify until no improvements can be made.
+    if this == previous
+      this
+    else
+      simplify(this, this)
+    end
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hdl
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Chris Patuzzo
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-22 00:00:00 +01:00
-default_executable: 
+date: 2013-08-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
@@ -70,27 +69,26 @@ extra_rdoc_files: []
 
 files: 
 - README.md
-- lib/hdl.rb
-- lib/hdl/chip.rb
+- lib/hdl/base.rb
 - lib/hdl/chip/schema_chip/evaluator.rb
 - lib/hdl/chip/schema_chip.rb
 - lib/hdl/chip/table_chip.rb
-- lib/hdl/base.rb
+- lib/hdl/chip.rb
 - lib/hdl/dependency.rb
-- lib/hdl/parser/validator.rb
-- lib/hdl/parser/tree_walker.rb
-- lib/hdl/parser/grammar/pins.treetop
+- lib/hdl/loader.rb
 - lib/hdl/parser/grammar/hdl.treetop
+- lib/hdl/parser/grammar/pins.treetop
 - lib/hdl/parser/grammar/schema.treetop
 - lib/hdl/parser/grammar/table.treetop
 - lib/hdl/parser/grammar/vars.treetop
-- lib/hdl/parser/validator/table_validator.rb
+- lib/hdl/parser/tree_walker.rb
 - lib/hdl/parser/validator/input_validator.rb
 - lib/hdl/parser/validator/schema_validator.rb
-- lib/hdl/loader.rb
+- lib/hdl/parser/validator/table_validator.rb
+- lib/hdl/parser/validator.rb
 - lib/hdl/parser.rb
-has_rdoc: true
-homepage: https://github.com/cpatuzzo/hdl
+- lib/hdl.rb
+homepage: https://github.com/tuzz/hdl
 licenses: []
 
 post_install_message: 
@@ -119,9 +117,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: HDL
 test_files: []
 
+has_rdoc: