lm 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e0500fd99881105260a6367a282628a4c9bf5365ddc717c219fe39e1df0f19
-  data.tar.gz: f69499c220e4a27a2a435a6820a708d458491bf0cde568d9fb9c4ddd277f13ed
+  metadata.gz: abf6ece1cf43b82167d54d7081335b3566d554015cb1bb2fd047fe8b1f660a9d
+  data.tar.gz: f87359a2ae880959e2f222040715f2cbb1f948d38423bcd8b4002252c4c0e066
 SHA512:
-  metadata.gz: af2de852aeaf14c17783868468dd34405ccde647db085cc2fd3c1999b91c6b4aac5ec608ed9a15116049840c436979e799f7c3894608c8dd798b727e61940ba1
-  data.tar.gz: e57c6b4f50c406ca6c1861fa9f530da28706619c3c92d1e1c9fe64e170fa195d3aec9179bfc55331afe238734d857b41a7fab8545a60a3c0cb7e24dc76307f61
+  metadata.gz: fab1cf7ae17461222f1522672ac5cfa59e4e435bfb38e9e80fda14ff9ac8d96c2ee31daf0c184a46efcc15392311068a22deb26b7c2fe4a1f69e3536ef46a77a
+  data.tar.gz: 14c83e23640306290f38f593f2474e90ee0e9690e23c592ea6792d093215fd2ab98ba77bf20c7a4e2c13119e2ab7641e066bd8f8cb4f2085ce592c6fea2562fe

data/exe/lm

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "lm"
+
+args = ARGV[0]
+
+if args.nil?
+  puts "USAGE: lm <bitpattern>"
+  puts "For example, to provide a bitpattern for an AND gate its 0001"
+  puts "The number of bits are inferred"
+  puts "You can use x for don't care, like lm 0xx1"
+  exit 1
+end
+
+min = Lm::Minimizer.new(args)
+puts min.shortest.to_s(verilog: "a")

data/lib/lm/minimizer.rb

@@ -1,6 +1,16 @@
 # frozen_string_literal: true
 
 module Lm
+  class Degenerate
+    def initialize(val)
+      @val = val
+    end
+
+    def to_s(_ = nil)
+      @val.to_s
+    end
+  end
+
   class Minimizer
     def initialize(output_str)
       @output_str = output_str
@@ -11,6 +21,8 @@ module Lm
     end
 
     def canonical
+      return degenerate if degenerate?
+
       output_string.sop
     end
 
@@ -31,22 +43,52 @@ module Lm
     end
 
     def reduced_sum
-      pos.expand.reduce
+      sum = pos.apply_factorize.expand
+      loop do
+        newsum = sum.reduce
+        return newsum if sum.to_s.length == newsum.to_s.length
+
+        sum = newsum
+      end
+      sum
     end
 
     def calculator
       String122ResultSelector.new(implicants, reduced_sum)
     end
 
+    def variation
+      @variation ||= @output_str.split("").uniq
+    end
+
+    # degenerate case
+    def degenerate?
+      variation.length == 1
+    end
+
+    def degenerate
+      Degenerate.new(variation.first)
+    end
+
     def shortest
+      return degenerate if degenerate?
+
       calculator.shortest
     end
 
+    def inputlen
+      output_string.bitcount
+    end
+
     def evaluate(input)
+      return degenerate.to_s.to_i if degenerate?
+
       BinFunc.new(shortest).evaluate(input)
     end
 
     def canonical_evaluate(input)
+      return degenerate.to_s.to_i if degenerate?
+
       BinFunc.new(output_string.sop).evaluate(input)
     end
   end

data/lib/lm/output_string.rb

@@ -4,10 +4,14 @@ module Lm
   class OutputString
     def initialize(str)
       @str = str
+
+      return unless @str.length < 2
+
+      @str = @str.rjust(2, "0")
     end
 
     def bitcount
-      Math.log(@str.length, 2).ceil
+      [Math.log(@str.length, 2).ceil, 1].max
     end
 
     def sop
@@ -19,6 +23,7 @@ module Lm
         prod = Product.new(bitbreak)
         res << prod
       end
+
       res
     end
 

data/lib/lm/petrick.rb

@@ -67,7 +67,13 @@ module Lm
     end
 
     def string122
-      factors.map { |sums| sums.map { |prducts| prducts.map { |x| (x.ord + 48).chr }.join("") }.join("+") }.join(",")
+      factors
+        .map do |sums|
+          sums.map do |prducts|
+            prducts.map { |x| (x.ord + 48).chr }.join("")
+          end.join("+")
+        end
+        .join(",")
     end
   end
 end

data/lib/lm/pos.rb

@@ -21,7 +21,7 @@ module Lm
       @termhash ||= begin
         res = {}
         sum_array.each do |sum|
-          terms = sum.split("+")
+          terms = sum.split("+", 2)
           terms.each do |term|
             res[term] ||= Set.new
             terms.each do |x|
@@ -40,13 +40,10 @@ module Lm
       seenkeys = Set.new
 
       termhash.each do |key, value|
-        next if seenkeys.include? key
+        next if seenkeys.include?(([key] + value.to_a).sort.join("|").to_s)
 
-        seenkeys << key
-        value.each do |factor|
-          seenkeys << factor
-        end
-        newarray << "#{key}+#{value.to_a.join("")}"
+        seenkeys << ([key] + value.to_a).sort.join("|")
+        newarray << "#{key}+#{value.map { |x| Sum.new(x) }.inject(:multiply)}"
       end
 
       POS.new(newarray.join(","))

data/lib/lm/sum.rb

@@ -8,12 +8,21 @@ module Lm
       @str = str
     end
 
+    def multiply(other_sum)
+      raise "Not a sum" unless other_sum.is_a? Sum
+
+      newarr = product_list.map(&:to_a).product(other_sum.product_list.map(&:to_a))
+
+      newstr = newarr.map { |x| x.join("") }.join("+")
+      Sum.new(newstr)
+    end
+
     def product_list
       @str.split("+").map { |x| Set.new(x.split("")) }
     end
 
     def by_length
-      product_list.sort(&:length)
+      product_list.sort_by(&:length)
     end
 
     def reduce
@@ -36,8 +45,11 @@ module Lm
         break if arr.length.zero?
       end
 
-      res
       Sum.new(res.map { |x| x.to_a.join("") }.join("+"))
     end
+
+    def to_s
+      @str
+    end
   end
 end

data/lib/lm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lm
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lm_spec.rb

@@ -37,4 +37,24 @@ RSpec.describe Lm do
     min = Lm::Minimizer.new("1110")
     expect(min.canonical.to_s(verilog: "a")).to eq "~a[0] & ~a[1] | ~a[0] & a[1] | a[0] & ~a[1]"
   end
+
+  it "returns degenerate case 0" do
+    min = Lm::Minimizer.new("0")
+    expect(min.shortest.to_s(verilog: "a")).to eq "0"
+  end
+
+  it "returns degenerate case 00000" do
+    min = Lm::Minimizer.new("00000")
+    expect(min.shortest.to_s(verilog: "a")).to eq "0"
+  end
+
+  it "returns degenerate case 11" do
+    min = Lm::Minimizer.new("11")
+    expect(min.shortest.to_s(verilog: "a")).to eq "1"
+  end
+
+  it "returns degenerate case 1111111" do
+    min = Lm::Minimizer.new("1111111")
+    expect(min.shortest.to_s(verilog: "a")).to eq "1"
+  end
 end

data/spec/sum_spec.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+RSpec.describe Lm::Sum do
+  describe "#multiply" do
+    it "does simple multiply" do
+      sop1 = Lm::Sum.new("1")
+      sop2 = Lm::Sum.new("2")
+
+      expect(sop1.multiply(sop2).product_list).to eq [Set.new(%w[1 2])]
+    end
+
+    it "does distribute multiply" do
+      sop1 = Lm::Sum.new("1")
+      sop2 = Lm::Sum.new("2+3")
+
+      expect(sop1.multiply(sop2).product_list).to eq [Set.new(%w[1 2]), Set.new(%w[1 3])]
+    end
+
+    it "does fully multiply" do
+      sop1 = Lm::Sum.new("1+4")
+      sop2 = Lm::Sum.new("2+3")
+
+      expect(sop1.multiply(sop2).product_list).to eq [
+        Set.new(%w[1 2]), Set.new(%w[1 3]),
+        Set.new(%w[4 2]), Set.new(%w[4 3])
+      ]
+    end
+
+    it "does fully multiply with more" do
+      sop1 = Lm::Sum.new("1+4")
+      sop2 = Lm::Sum.new("2+3+5")
+
+      expect(sop1.multiply(sop2).product_list).to eq [
+        Set.new(%w[1 2]), Set.new(%w[1 3]), Set.new(%w[1 5]),
+        Set.new(%w[4 2]), Set.new(%w[4 3]), Set.new(%w[4 5])
+      ]
+    end
+
+    it "does fully multiply inner" do
+      sop1 = Lm::Sum.new("1+45")
+      sop2 = Lm::Sum.new("2+3")
+
+      expect(sop1.multiply(sop2).product_list).to eq [
+        Set.new(%w[1 2]), Set.new(%w[1 3]),
+        Set.new(%w[4 5 2]), Set.new(%w[4 5 3])
+      ]
+    end
+  end
+
+  describe "#to_s" do
+    it "does the right thing" do
+      sop1 = Lm::Sum.new("1+45")
+      sop2 = Lm::Sum.new("2+3").multiply(sop1)
+      expect(sop2.to_s).to eq "21+245+31+345"
+    end
+  end
+end

metadata

@@ -1,25 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: lm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Siaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2022-12-26 00:00:00.000000000 Z
 dependencies: []
 description: Logic Minimizer Library
 email:
 - davidsiaw@gmail.com
-executables: []
+executables:
+- lm
 extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
 - bin/console
 - bin/setup
+- exe/lm
 - lib/lm.rb
 - lib/lm/bin_func.rb
 - lib/lm/implicant_chart.rb
@@ -37,6 +39,7 @@ files:
 - lm.gemspec
 - spec/lm_spec.rb
 - spec/spec_helper.rb
+- spec/sum_spec.rb
 homepage: https://github.com/davidsiaw/lm
 licenses:
 - MIT
@@ -67,3 +70,4 @@ summary: Logic Minimizer
 test_files:
 - spec/lm_spec.rb
 - spec/spec_helper.rb
+- spec/sum_spec.rb