z3 0.0.20161117 → 0.0.20170204

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23036614e8d142331481794ca573d49be3d4c18f
-  data.tar.gz: 1d765179f046c53ae950605fbf4d431d9bc3d7b6
+  metadata.gz: c6f02c4166af3fe459893d1ee5d19e181f5bce45
+  data.tar.gz: 62497676a02f20c92a53afe81abee249632d026e
 SHA512:
-  metadata.gz: f49fb4df1ff7df3b283aa2f2eada3b263d13af54ddf0b9e7640d315efcae9fe5cdcaa00b5f4693e5ead379d9babf45923832c269de5dedef84b516a9c1245f78
-  data.tar.gz: c936f488e71e3b8fe99f86ec8602bfde64848d1c008407a73316739dec194e0f99a0567487f3d6371ba775265431bfb44fa64ea52c1a7042941f4b5289a71fcb
+  metadata.gz: 9e48a27d5cf718468b6dc7030e212b7eaf8c141c40cc3456d89ee4f1cb8b37f3075e2505323a830cc9af40999f62b2a91389acf2a24aa6ac3516009310e523f9
+  data.tar.gz: b83dfe9c5600a816de119a7440f0e5bb1df3e048421504d9c4c61dc26c8b19a2f73ea32cc9ebff17b9f89fa6e9b063f24dc91f6ed9d695cd27651e1945974764

data/examples/crossflip

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require "z3"
+require_relative "../lib/z3"
 
 class CrossFlipSolver
   def initialize(board)

data/examples/oneofus

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-require "z3"
-require "pry"
+require_relative "../lib/z3"
 
 class OneofusSolver
   def initialize

data/examples/pyramid_nonogram

@@ -0,0 +1,166 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/z3"
+
+class PyramidNonogram
+  def initialize(size)
+    @size = size
+    @solver = Z3::Solver.new
+    @stripe_index = 0
+  end
+
+  def bottom_to_right(*args)
+    (0...@size).each do |i|
+      match! bottom_to_right_stripe(i), args[i]
+    end
+  end
+
+  def right_to_left(*args)
+    (0...@size).each do |i|
+      match! right_to_left_stripe(i), args[i]
+    end
+  end
+
+  def left_to_bottom(*args)
+    (0...@size).each do |i|
+      match! left_to_bottom_stripe(i), args[i]
+    end
+  end
+
+  def solve!
+    if @solver.satisfiable?
+      @model = @solver.model
+      print_answer!
+    else
+      puts "There is no solution"
+    end
+  end
+
+private
+
+  def match!(cells, constraints)
+    @stripe_index += 1
+    prefix = "#{@stripe_index}"
+    group_vars = []
+    # Groups have size specified by constraints
+    # and start and end within specified cell range
+    (0...constraints.size).each do |i|
+      vs = Z3.Int("#{prefix},#{i+1},s")
+      ve = Z3.Int("#{prefix},#{i+1},e")
+      if constraints[i]
+        @solver.assert ve-vs == constraints[i]-1
+      end
+      @solver.assert vs >= 0
+      @solver.assert ve < cells.size
+      group_vars << [vs,ve]
+    end
+
+    # Gap between groups are at least one
+    (0...constraints.size-1).each do |i|
+      ve0 = group_vars[i][1]
+      vs1 = group_vars[i+1][0]
+      @solver.assert vs1 >= ve0+2
+    end
+
+    # Cell is on  iff  it belongs to a group
+    (0...cells.size).each do |i|
+      if constraints.empty?
+        rule_i = false
+      else
+        rule_i = Z3.Or(
+          *group_vars.map{|vs,ve| Z3.And(vs <= i, i <= ve) }
+        )
+      end
+      @solver.assert cells[i] == rule_i
+    end
+  end
+
+  def right_to_left_stripe(y)
+    (-y..y).map{|x|
+      cell(x,y)
+    }.reverse
+  end
+
+  def bottom_to_right_stripe(i)
+    (0...@size).to_a.reverse.flat_map{|y|
+      [[-y+2*i, y], [-y+2*i+1, y]]
+    }.select{|x,y| (-y..y).include?(x) }.map{|x,y| cell(x,y) }
+  end
+
+  def left_to_bottom_stripe(i)
+    (0...@size).to_a.flat_map{|y|
+      [[y-2*i-1, y], [y-2*i, y]] }
+    .select{|x,y| (-y..y).include?(x) }.map{|x,y| cell(x,y) }
+  end
+
+  def cell(x,y)
+    Z3.Bool("c#{x},#{y}")
+  end
+
+  def print_answer!
+    (0...@size).each do |y|
+      (-@size..@size).each do |x|
+        if (-y..y).include?(x)
+          value = @model[cell(x,y)].to_b
+          if (x+y).odd?
+            cell = value ? "▼" : "▽"
+          else
+            cell = value ? "▲" : "△"
+          end
+        else
+          cell = " "
+        end
+        print cell
+      end
+      print "\n"
+    end
+  end
+end
+
+# Example from:
+# http://www.rankk.org/challenges/images/nonogrampyramid.png
+_ = nil # nil means group of unknown size
+pyramid_nonogram = PyramidNonogram.new(12)
+pyramid_nonogram.bottom_to_right(
+  [2,1,1,5,3,2],
+  [1,2,1,1,1],
+  [3,1,1,3],
+  [1,1,1,2],
+  [3,2,2,3],
+  [2,1,1,1],
+  [2,2],
+  [1,3,1],
+  [2,3],
+  [1,1],
+  [1],
+  [1],
+)
+pyramid_nonogram.right_to_left(
+  [],
+  [1,1],
+  [1],
+  [1,1,2],
+  [1,2,2],
+  [2,3],
+  [1,1,2,2],
+  [4,2,1],
+  [1,2,2],
+  [3,1,1,2,3,1],
+  [1,3,1,2],
+  [2,3,1,4,1,2],
+)
+pyramid_nonogram.left_to_bottom(
+  [_,_,_,_,_,_,_],
+  [_,_,_,_,_],
+  [_,_,_,_,_],
+  [_,_,_,_,_,_],
+  [_,_,_],
+  [_,_,_,_],
+  [_,_,_],
+  [_,_],
+  [],
+  [_,_],
+  [_],
+  [_],
+)
+pyramid_nonogram.solve!

data/examples/regexp_crossword_solver

@@ -62,16 +62,16 @@ class RegexpCrosswordSolver
   end
 
   def print_answer
-    if @solver.satisfiable?
+    while @solver.satisfiable?
       @model = @solver.model
       @ysize.times do |y|
         puts @xsize.times.map{|x|
           @model[@crossword[[x,y]]].to_i.chr
         }.join.inspect[1...-1]
       end
-    else
-      raise
-      print "Crossword has no solution"
+      break # If you want more solutions...
+      puts ""
+      @solver.assert Z3.Or(*@crossword.values.map{|v| @model[v] != v})
     end
   end
 end

data/examples/regexp_solver

@@ -24,12 +24,11 @@ class RegexpSolver
   end
 
   def print_answer
-    if @solver.satisfiable?
+    while @solver.satisfiable?
       @model = @solver.model
       puts @str.map{|c| @model[c].to_i.chr }.join.inspect[1...-1]
-    else
-      raise
-      print "Crossword has no solution"
+      break # If you want more solutions...
+      @solver.assert Z3.Or(*@str.map{|v| @model[v] != v})
     end
   end
 end

data/examples/simple_regexp_parser.rb

@@ -95,11 +95,13 @@ class SimpleRegexpParser
   # Groups and qualifiers interact in weird ways, (a){3} is actually aa(a)
   # We need to do extensive rewriting to make it work
   def repeat_group(part, min, max)
-    base = part[2]
+    _, group, base = part
     if max == -1
-      if min == 0 # (a)* -> |a*(a)
+      # (a)* -> ()|a*(a)
+      # with same group id for both ()s
+      if min == 0
         alternative(
-          empty,
+          [:group, group, empty],
           sequence(repeat(base, min, max), part)
         )
       else # (a){2,} -> a{1,}(a)
@@ -109,9 +111,10 @@ class SimpleRegexpParser
       :empty
     else
       if min == 0
-        # (a){2,3} -> |a{1,2}(a)
+        # (a){2,3} -> ()|a{1,2}(a)
+        # with same group id for both ()s
         alternative(
-          empty,
+          [:group, group, empty],
           sequence(repeat(base, min, max-1), part)
         )
       else # (a){2,3} -> a{1,2}(a)

data/spec/float_expr_spec.rb

@@ -101,7 +101,12 @@ module Z3
       expect(positive_infinity.to_s).to eq("+oo")
       expect(negative_infinity.to_s).to eq("-oo")
       expect(nan.to_s).to eq("NaN")
-      expect(float_double.from_const(1234 * 0.5**1040).to_s).to eq("1.205078125B-1030")
+      # Denormals changed
+      if Z3.version >= '4.5'
+        expect(float_double.from_const(1234 * 0.5**1040).to_s).to eq("0.00470733642578125B-1022")
+      else
+        expect(float_double.from_const(1234 * 0.5**1040).to_s).to eq("1.205078125B-1030")
+      end
     end
 
     it "zero?" do

data/spec/integration/pyramid_nonogram_spec.rb

@@ -0,0 +1,18 @@
+describe "Pyramid Nonogram" do
+  it do
+    expect("pyramid_nonogram").to have_output <<EOF
+            △
+           ▲▽▲
+          △▼△▽△
+         ▲▼△▽▲▽▲
+        △▼▲▽▲▼△▼△
+       ▲▼▲▽△▽△▽▲▼△
+      ▲▼△▽△▼▲▽△▼△▼△
+     △▼△▽△▽△▽▲▼△▼▲▼▲
+    △▼▲▽△▼▲▽▲▽△▽△▽△▽△
+   ▲▽△▼▲▼△▽△▼▲▽▲▽▲▽▲▼▲
+  △▽△▽△▼▲▽▲▽△▽△▼▲▼△▼△▽△
+ ▲▼△▼△▽△▽▲▼▲▼△▽▲▽▲▼▲▽△▼▲
+EOF
+  end
+end

data/spec/set_expr_spec.rb

@@ -15,47 +15,49 @@ module Z3
       )
     end
 
-    # FIXME: This is not even real spec at this point, just a no-crash-spec
-    it "union" do
-      expect([
-        a.include?(1),
-        a.include?(2),
-        b.include?(2),
-        b.include?(3),
-        c == a.union(b),
-      ]).to have_solution(
-        a => "(declare-fun k! (Int) Bool)",
-        b => "(declare-fun k! (Int) Bool)",
-        c => "(declare-fun k! (Int) Bool)",
-      )
-    end
+    if Z3.version >= "4.5"
+      # Only works in z3 4.5, 4.4 (like on Ubuntu) returns bad stuff
+      it "union" do
+        expect([
+          a.include?(1),
+          a.include?(2),
+          b.include?(2),
+          b.include?(3),
+          c == a.union(b),
+        ]).to have_solution(
+          a => "store(store(const(false), 1, true), 2, true)",
+          b => "store(store(const(false), 3, true), 2, true)",
+          c => "store(store(store(const(false), 1, true), 3, true), 2, true)",
+        )
+      end
 
-    it "difference" do
-      expect([
-        a.include?(1),
-        a.include?(2),
-        b.include?(2),
-        b.include?(3),
-        c == a.difference(b),
-      ]).to have_solution(
-        a => "(declare-fun k! (Int) Bool)",
-        b => "(declare-fun k! (Int) Bool)",
-        c => "(declare-fun k! (Int) Bool)",
-      )
-    end
+      it "difference" do
+        expect([
+          a.include?(1),
+          a.include?(2),
+          b.include?(2),
+          b.include?(3),
+          c == a.difference(b),
+        ]).to have_solution(
+          a => "store(store(const(false), 1, true), 2, true)",
+          b => "store(const(true), 1, false)",
+          c => "store(const(false), 1, true)",
+        )
+      end
 
-    it "intersection" do
-      expect([
-        a.include?(1),
-        a.include?(2),
-        b.include?(2),
-        b.include?(3),
-        c == a.intersection(b),
-      ]).to have_solution(
-        a => "(declare-fun k! (Int) Bool)",
-        b => "(declare-fun k! (Int) Bool)",
-        c => "(declare-fun k! (Int) Bool)",
-      )
+      it "intersection" do
+        expect([
+          a.include?(1),
+          a.include?(2),
+          b.include?(2),
+          b.include?(3),
+          c == a.intersection(b),
+        ]).to have_solution(
+          a => "store(store(const(false), 1, true), 2, true)",
+          b => "store(store(const(false), 3, true), 2, true)",
+          c => "store(store(store(const(false), 1, true), 3, true), 2, true)",
+        )
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -80,7 +80,11 @@ RSpec::Matchers.define :have_solution do |expected|
   failure_message do |asts|
     solver = setup_solver(asts)
     if solver.satisfiable?
-      "expected #{asts.inspect} to have solution #{expected.inspect}, instead got #{solver.model}"
+      "expected #{asts.inspect} to have solution:\n#{
+        expected.map{|var,val| "#{var}=#{val}\n"}.join
+      }instead got:\n#{
+        solver.model.map{|var,val| "#{var}=#{solver.model[var]}\n"}.join
+      }"
     else
       "expected #{asts.inspect} to have solution #{expected.inspect}, instead not solvable"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20161117
+  version: 0.0.20170204
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -128,6 +128,7 @@ files:
 - examples/mortal_coil_puzzle-9.txt
 - examples/nonogram
 - examples/oneofus
+- examples/pyramid_nonogram
 - examples/regexp_crossword/beginner-1.txt
 - examples/regexp_crossword/beginner-2.txt
 - examples/regexp_crossword/beginner-3.txt
@@ -221,6 +222,7 @@ files:
 - spec/integration/mortal_coil_puzzle_spec.rb
 - spec/integration/nonogram_spec.rb
 - spec/integration/oneofus_spec.rb
+- spec/integration/pyramid_nonogram_spec.rb
 - spec/integration/regexp_crossword_solver_spec.rb
 - spec/integration/regexp_solver_spec.rb
 - spec/integration/selfref_spec.rb
@@ -261,7 +263,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - z3 library
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Z3 Constraint Solver