art-decomp 0.0.0 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/bin/{ad-compare → ad-analyse}

@@ -1,10 +1,15 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
+require 'rubygems'      if RUBY_VERSION < '1.9'
+require 'backports/1.9' if RUBY_VERSION < '1.9'
+
 require_relative '../lib/art-decomp'
 
 input_limit = ARGV.first.to_i.zero? ? 0 : ARGV.shift.to_i
 
+$stdout.sync = true
+
 ARGV.each do |fsm_file|
   fsm = ArtDecomp::FSM.from_kiss fsm_file
   seps = fsm.beta_f.seps
@@ -14,7 +19,10 @@ ARGV.each do |fsm_file|
   puts fsm_file
   puts "X seps: #{input_seps.map(&:size).inspect}"
 
+  input_seps.each_with_index { |a, i| puts "#{i} insignificant" if a.empty? }
+
   (0...input_seps.size).pairs.to_a.each do |a, b|
+    next if input_seps[a].empty? or input_seps[b].empty?
     puts "#{a} ⊂ #{b}" if input_seps[a].proper_subset?   input_seps[b]
     puts "#{a} = #{b}" if input_seps[a] ==               input_seps[b]
     puts "#{a} ⊃ #{b}" if input_seps[a].proper_superset? input_seps[b]

data/bin/ad-inputs

@@ -8,6 +8,8 @@ require_relative '../lib/art-decomp'
 
 input_limit = ARGV.first.to_i.zero? ? 0 : ARGV.shift.to_i
 
+$stdout.sync = true
+
 ARGV.each do |fsm_file|
   fsm = ArtDecomp::FSM.from_kiss fsm_file
   next if fsm.input_count < input_limit

data/lib/art-decomp/decomposition.rb

@@ -8,10 +8,6 @@ module ArtDecomp class Decomposition
     [@fsm, @u, @v, @qu, @qv, @g] == [other.fsm, other.u, other.v, other.qu, other.qv, other.g]
   end
 
-  def decomposable?
-    @qu.size > 2
-  end
-
   def disjoint?
     (@u & @v).empty?
   end
@@ -80,6 +76,10 @@ module ArtDecomp class Decomposition
     @v.size + @qv.pins <= archs.map(&:pins).max and @u.size + @qu.pins + @g.pins < @fsm.input_count + @fsm.beta_q.pins
   end
 
+  def symbolic?
+    @qu.size > 2
+  end
+
   def valid?
     @g.seps.subset?((@fsm.beta_x(@v) * @qv).seps) and @fsm.beta_f.seps.subset?((@fsm.beta_x(@u) * @qu * @g).seps)
   end

data/lib/art-decomp/executable.rb

@@ -12,6 +12,7 @@ module ArtDecomp class Executable
       opt :uv,           'UV generator(s)',                      :default => ['Relevance']
       opt :qu,           'Qu generator(s)',                      :default => ['EdgeLabels']
       opt :qv,           'Qv generator(s)',                      :default => ['GraphColouring']
+      opt :binary,       'Compute binary decompositions',        :default => false
       opt :non_disjoint, 'Compute non-disjoint decompositions',  :default => false
       opt :deep_ndj,     'Compute deep non-dj decompositions',   :default => false
       opt :log,          'Logging target',                       :type => :string
@@ -38,6 +39,7 @@ module ArtDecomp class Executable
     @fsm          = FSM.from_kiss args.first
     @archs        = opts[:archs].map { |s| Arch[*s.split('/').map(&:to_i)] }.to_set
     @iters        = opts[:iters]
+    @binary       = opts[:binary]
     @non_disjoint = opts[:non_disjoint]
     @deep_ndj     = opts[:deep_ndj]
 
@@ -80,7 +82,7 @@ module ArtDecomp class Executable
         if dec.final? @archs
           this = cells + dec.g_cells(@archs) + dec.h_cells(@archs)
           @best = this if @best.nil? or this < @best
-        elsif iters != 1 and dec.decomposable? and (@best.nil? or cells < @best)
+        elsif iters != 1 and (@binary or dec.symbolic?) and (@best.nil? or cells < @best)
           in_dir = "#{dir}/#{i}"
           Dir.mkdir in_dir
           decompositions(FSM.from_kiss(dec.h_kiss), iters - 1, in_dir, cells + dec.g_cells(@archs)).each do |in_dec, in_dir, in_i|

data/lib/art-decomp/fsm.rb

@@ -4,8 +4,11 @@ module ArtDecomp class FSM
     kiss = File.read kiss unless kiss.index "\n"
     inputs, outputs, state, next_state = [], [], [], []
     kiss.lines do |line|
-      next unless line =~ /^\s*[01-]+\s+\S+\s+\S+\s+[01-]+\s*$/
-      ins, st, nxt, outs = line.split
+      case line
+      when /^\s*[01-]+\s+\S+\s+\S+\s+[01-]+\s*$/ then ins, st, nxt, outs = *line.split
+      when /^\s*[01-]+\s+[01-]+\s*$/             then st, nxt, ins, outs = DontCare, DontCare, *line.split
+      else next
+      end
       inputs     << ins.split(//).map(&:to_sym)
       outputs    << outs.split(//).map(&:to_sym)
       state      << (st  == '*' ? DontCare : st.to_sym)
@@ -31,8 +34,7 @@ module ArtDecomp class FSM
   end
 
   def beta_f
-    outs = @outputs.map { |output| Blanket.from_array output }
-    outs.inject(:*) * Blanket.from_array(@next_state)
+    @outputs.map { |o| Blanket.from_array o }.inject(:*) * Blanket.from_array(@next_state)
   end
 
   def beta_q
@@ -98,10 +100,15 @@ module ArtDecomp class FSM
     st   = @state.map      { |e| e == DontCare ? '*' : e }
     nxt  = @next_state.map { |e| e == DontCare ? '*' : e }
     div  = Array.new @state.size, ' '
-    cols = @inputs + [div, st, div, nxt, div] + @outputs
+    mid  = truth_table? ? [div] : [div, st, div, nxt, div]
+    cols = @inputs + mid + @outputs
     KISS.new(cols.transpose.map(&:join)).formatted
   end
 
+  def truth_table?
+    @state.all? { |s| s == DontCare } and @next_state.all? { |ns| ns == DontCare }
+  end
+
   def x_encoding ins, rows
     ins.map { |i| encoding @inputs[i], rows }.join
   end

data/spec/art-decomp/decomposition_spec.rb

@@ -73,9 +73,9 @@ module ArtDecomp describe Decomposition do
       @b4  = mock Blanket, :pins => 4
     end
 
-    it 'should properly report whether it’s decomposable further' do
-      Decomposition.new(@fsm, Set[0], Set[1], @b1, @b, @b).should_not be_decomposable
-      Decomposition.new(@fsm, Set[0], Set[1], @b2, @b, @b).should     be_decomposable
+    it 'should report whether the resulting H block is an FSM' do
+      Decomposition.new(@fsm, Set[0], Set[1], @b1, @b, @b).should_not be_symbolic
+      Decomposition.new(@fsm, Set[0], Set[1], @b2, @b, @b).should     be_symbolic
     end
 
     it 'should properly report whether it’s sensible, based on the target Archs and G and H blocks’ architectures' do

data/spec/art-decomp/executable_spec.rb

@@ -156,6 +156,6 @@ module ArtDecomp describe Executable do
     File.read(log.path).should =~ rex('final best decomposition: 0 cells')
   end
 
-  # FIXME: add specs for --non-disjoint and --deep-ndj
+  # FIXME: add specs for --binary, --non-disjoint and --deep-ndj
 
 end end

data/spec/art-decomp/fsm_spec.rb

@@ -5,13 +5,14 @@ module ArtDecomp describe FSM do
   context 'parsed from an example KISS file' do
 
     before do
+      @ex4   = FSM.from_kiss 'spec/fixtures/ex4'
       @fsm   = FSM.from_kiss 'spec/fixtures/fsm'
       @lion  = FSM.from_kiss 'spec/fixtures/lion'
       @mark1 = FSM.from_kiss 'spec/fixtures/mark1'
       @mc    = FSM.from_kiss 'spec/fixtures/mc'
       @opus  = FSM.from_kiss 'spec/fixtures/opus'
       @s8    = FSM.from_kiss 'spec/fixtures/s8'
-      @s420  = FSM.from_kiss 'spec/fixtures/s420'
+      @tt    = FSM.from_kiss 'spec/fixtures/truth_table'
     end
 
     it 'should parse both KISS files and strings' do
@@ -22,6 +23,12 @@ module ArtDecomp describe FSM do
       lambda { FSM.from_kiss 'spec/fixtures/ex5' }.should_not raise_error
     end
 
+    it 'should handle truth table files by faking a don’t-care state column' do
+      @tt.input_count.should  == 4
+      @tt.output_count.should == 2
+      @tt.beta_q.should       == Blanket[B[0,1,2,3]]
+    end
+
     it 'should properly report the number of inputs' do
       @opus.input_count.should == 5
       @lion.input_count.should == 2
@@ -56,6 +63,7 @@ module ArtDecomp describe FSM do
       @opus.to_kiss.should == File.read('spec/fixtures/opus.to_kiss')
       @lion.to_kiss.should == File.read('spec/fixtures/lion.to_kiss')
       @mc.to_kiss.should   == File.read('spec/fixtures/mc.to_kiss')
+      @tt.to_kiss.should   == File.read('spec/fixtures/truth_table')
     end
 
     it 'should return given inputs’ encoding for the given row(s)' do
@@ -132,13 +140,19 @@ module ArtDecomp describe FSM do
     end
 
     it 'should report its input relevance, and drop irrelevant inputs' do
+      @ex4.input_relevance.should   == [nil, nil, nil, nil, 2, 1, 5, 4, 3]
       @fsm.input_relevance.should   == [2, 1, 3, 0, nil, nil, nil, nil]
       @lion.input_relevance.should  == [0, nil, nil, 1]
       @mark1.input_relevance.should == [nil, nil, nil, nil, 0, 3, 2, 4, 1]
       @mc.input_relevance.should    == [nil, nil, 2, 1, 0]
       @opus.input_relevance.should  == [nil, nil, nil, nil, 2, 3, 4, 0, 1]
       @s8.input_relevance.should    == [3, 2, 1, 0, nil, nil, nil]
-      @s420.input_relevance.should  == [1, 0, 18, nil, nil, nil, nil, nil, 17, 16, 15, 14, 13]
+      @tt.input_relevance.should    == [1, 3, 2]
+    end
+
+    it 'should report whether it’s a truth table or a full-blown FSM' do
+      @tt.should      be_truth_table
+      @fsm.should_not be_truth_table
     end
 
   end

data/spec/fixtures/ex4

@@ -0,0 +1,25 @@
+.i 6
+.o 9
+.p 21
+.s 14
+1----- 1 3 110000000
+1----- 3 2 000000000
+1----- 2 5 001000000
+1----- 5 7 000000000
+10---- 7 7 000000000
+11---- 7 11 100110000
+1----- 11 12 100100000
+1-1--- 12 8 000001100
+1-0--- 12 8 000000100
+1-0--- 8 3 110000000
+1-10-- 8 3 110000000
+1-11-- 8 4 110000000
+1---1- 4 13 000000010
+1---0- 4 13 000000000
+1----- 13 14 001000010
+1----- 14 6 000000000
+10---- 6 6 000000000
+11---- 6 9 100110000
+1----- 9 10 100100000
+1----1 10 3 110000101
+1----0 10 4 110000100

data/spec/fixtures/truth_table

@@ -0,0 +1,4 @@
+-0-- 01
+-111 10
+01-0 00
+110- 00

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: art-decomp
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Piotr Szotkowski
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +01:00
+date: 2009-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,8 +76,8 @@ description:
 email: p.szotkowski@tele.pw.edu.pl
 executables: 
 - ad-validate
-- ad-compare
 - ad-console
+- ad-analyse
 - ad-inputs
 - art-decomp
 extensions: []
@@ -90,7 +90,7 @@ files:
 - README
 - Rakefile
 - VERSION
-- bin/ad-compare
+- bin/ad-analyse
 - bin/ad-console
 - bin/ad-inputs
 - bin/ad-validate
@@ -145,6 +145,7 @@ files:
 - spec/core/integer_spec.rb
 - spec/core/set_spec.rb
 - spec/core/string_spec.rb
+- spec/fixtures/ex4
 - spec/fixtures/ex5
 - spec/fixtures/fsm
 - spec/fixtures/fsm.exp
@@ -164,8 +165,8 @@ files:
 - spec/fixtures/opus.amb.h
 - spec/fixtures/opus.h
 - spec/fixtures/opus.to_kiss
-- spec/fixtures/s420
 - spec/fixtures/s8
+- spec/fixtures/truth_table
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true

data/spec/fixtures/s420

@@ -1,142 +0,0 @@
-.i 19
-.o 2
-.p 137
-.s 18
-.r 1111111111111111
-1----------------1- 1111111111111111 0000000000000000 11
-1----------------00 1111111111111111 0000000000000000 10
-1----------------01 1111111111111111 0000000000000000 11
-0------------------ 1111111111111111 0000000000000000 10
-10----------------1 0000000000000000 0001000000000000 01
-10----------------0 0000000000000000 0001000000000000 00
-00----------------- 0000000000000000 0000000000000000 00
-01----------------1 0000000000000000 0000000000000000 00
-11----------------1 0000000000000000 0000000000000000 01
--1----------------0 0000000000000000 0000000000000000 00
-0------------------ 0001000000000000 0000000000000000 00
-11---------------1- 0001000000000000 0000000000000000 01
-11---------------00 0001000000000000 0000000000000000 00
-11---------------01 0001000000000000 0000000000000000 01
-10---------------00 0001000000000000 0010000000000000 00
-10---------------10 0001000000000000 0010000000000000 01
-10----------------1 0001000000000000 0010000000000000 01
-00----------------- 0010000000000000 0000000000000000 00
-10--------------0-0 0010000000000000 0011000000000000 00
-10--------------1-0 0010000000000000 0011000000000000 01
-10----------------1 0010000000000000 0011000000000000 01
-01----------------- 0010000000000000 0000000000000000 00
-11--------------0-0 0010000000000000 0000000000000000 00
-11--------------1-0 0010000000000000 0000000000000000 01
-11----------------1 0010000000000000 0000000000000000 01
-0------------------ 0011000000000000 0000000000000000 00
-11---------------10 0011000000000000 0000000000000000 01
-11---------------00 0011000000000000 0000000000000000 00
-11----------------1 0011000000000000 0000000000000000 01
-10---------------1- 0011000000000000 0100000000000000 01
-10---------------01 0011000000000000 0100000000000000 01
-10---------------00 0011000000000000 0100000000000000 00
-10----------------1 0100000000000000 0101000000000000 01
-10-------------0--0 0100000000000000 0101000000000000 00
-10-------------1--0 0100000000000000 0101000000000000 01
-00----------------- 0100000000000000 0000000000000000 00
-01-------------0--1 0100000000000000 0000000000000000 00
-11-------------0--1 0100000000000000 0000000000000000 01
--1-------------0--0 0100000000000000 0000000000000000 00
-01-------------1--- 0100000000000000 0000000000000000 00
-11-------------1--- 0100000000000000 0000000000000000 01
-0------------------ 0101000000000000 0000000000000000 00
-11---------------10 0101000000000000 0000000000000000 01
-11---------------00 0101000000000000 0000000000000000 00
-11----------------1 0101000000000000 0000000000000000 01
-10---------------10 0101000000000000 0110000000000000 01
-10---------------00 0101000000000000 0110000000000000 00
-10----------------1 0101000000000000 0110000000000000 01
-0------------------ 0110000000000000 0000000000000000 00
-11--------------1-0 0110000000000000 0000000000000000 01
-11--------------0-0 0110000000000000 0000000000000000 00
-11----------------1 0110000000000000 0000000000000000 01
-10--------------1-- 0110000000000000 0111000000000000 01
-10--------------0-0 0110000000000000 0111000000000000 00
-10--------------0-1 0110000000000000 0111000000000000 01
-0------------------ 0111000000000000 0000000000000000 00
-11---------------1- 0111000000000000 0000000000000000 01
-11---------------00 0111000000000000 0000000000000000 00
-11---------------01 0111000000000000 0000000000000000 01
-10---------------1- 0111000000000000 1000000000000000 01
-10---------------01 0111000000000000 1000000000000000 01
-10---------------00 0111000000000000 1000000000000000 00
-00----------------- 1000000000000000 0000000000000000 00
-10----------------1 1000000000000000 1001000000000000 01
-10------------1---0 1000000000000000 1001000000000000 01
-10------------0---0 1000000000000000 1001000000000000 00
-01------------0---1 1000000000000000 0000000000000000 00
-11------------0---1 1000000000000000 0000000000000000 01
-11------------1---1 1000000000000000 0000000000000000 01
-01------------1---1 1000000000000000 0000000000000000 00
-11------------1---0 1000000000000000 0000000000000000 01
-11------------0---0 1000000000000000 0000000000000000 00
-01----------------0 1000000000000000 0000000000000000 00
-00----------------- 1001000000000000 0000000000000000 00
-10---------------1- 1001000000000000 1010000000000000 01
-10---------------00 1001000000000000 1010000000000000 00
-10---------------01 1001000000000000 1010000000000000 01
-01----------------- 1001000000000000 0000000000000000 00
-11---------------1- 1001000000000000 0000000000000000 01
-11---------------01 1001000000000000 0000000000000000 01
-11---------------00 1001000000000000 0000000000000000 00
-00----------------- 1010000000000000 0000000000000000 00
-10--------------1-- 1010000000000000 1011000000000000 01
-10--------------0-1 1010000000000000 1011000000000000 01
-10--------------0-0 1010000000000000 1011000000000000 00
-01----------------- 1010000000000000 0000000000000000 00
-11--------------1-0 1010000000000000 0000000000000000 01
-11--------------0-0 1010000000000000 0000000000000000 00
-11----------------1 1010000000000000 0000000000000000 01
-00----------------- 1011000000000000 0000000000000000 00
-10---------------00 1011000000000000 1100000000000000 00
-10---------------10 1011000000000000 1100000000000000 01
-10----------------1 1011000000000000 1100000000000000 01
-01----------------- 1011000000000000 0000000000000000 00
-11---------------10 1011000000000000 0000000000000000 01
-11---------------00 1011000000000000 0000000000000000 00
-11----------------1 1011000000000000 0000000000000000 01
-00----------------- 1100000000000000 0000000000000000 00
-10-------------0--1 1100000000000000 1101000000000000 01
-10-------------0--0 1100000000000000 1101000000000000 00
-10-------------1--- 1100000000000000 1101000000000000 01
-11----------------1 1100000000000000 0000000000000000 01
-01----------------1 1100000000000000 0000000000000000 00
-11-------------0--0 1100000000000000 0000000000000000 00
-11-------------1--0 1100000000000000 0000000000000000 01
-01----------------0 1100000000000000 0000000000000000 00
-0------------------ 1101000000000000 0000000000000000 00
-10---------------1- 1101000000000000 1110000000000000 01
-10---------------00 1101000000000000 1110000000000000 00
-10---------------01 1101000000000000 1110000000000000 01
-11---------------1- 1101000000000000 0000000000000000 01
-11---------------00 1101000000000000 0000000000000000 00
-11---------------01 1101000000000000 0000000000000000 01
-10--------------1-- 1110000000000000 1111000000000000 01
-10--------------0-0 1110000000000000 1111000000000000 00
-10--------------0-1 1110000000000000 1111000000000000 01
-00----------------- 1110000000000000 0000000000000000 00
-01----------------- 1110000000000000 0000000000000000 00
-11--------------1-- 1110000000000000 0000000000000000 01
-11--------------0-0 1110000000000000 0000000000000000 00
-11--------------0-1 1110000000000000 0000000000000000 01
-01----------------- 1111000000000000 0000000000000000 00
-11---------------00 1111000000000000 0000000000000000 00
-11---------------10 1111000000000000 0000000000000000 01
-11----------------1 1111000000000000 0000000000000000 01
-00----------------- 1111000000000000 0000000100000000 00
-10---------------10 1111000000000000 0000000100000000 01
-10---------------00 1111000000000000 0000000100000000 00
-10----------------1 1111000000000000 0000000100000000 01
-00----------------- 0000000100000000 0000000000000000 00
-10-----------1----- 0000000100000000 0001000000000000 01
-10-----------0----0 0000000100000000 0001000000000000 00
-10-----------0----1 0000000100000000 0001000000000000 01
-01----------------- 0000000100000000 0000000000000000 00
-11-----------1----0 0000000100000000 0000000000000000 01
-11-----------0----0 0000000100000000 0000000000000000 00
-11----------------1 0000000100000000 0000000000000000 01