z3 0.0.20220203 → 0.0.20220828

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7d242f957aeaacf005f52841ebc5eaa0b1ecd507cc6d1f80c6ca0f9d2303813
-  data.tar.gz: 926ecb103b3a90f45defb57e90610eeb6b67f160a0f2b5bf64ed448df26e87d7
+  metadata.gz: 94779e8d2fdaee7a213640164c8113fee96135e5247d9dc161d02dae87da6e94
+  data.tar.gz: d11a1326c693216fe857b436460d63176b466cc8b9927378940fc5543506a02e
 SHA512:
-  metadata.gz: 76e3973739810e87ae9fed8765c9a8e7c96efac5a02c100cacfc8a3087f005ac6d866a251defe84a5f79dcec9991a98adef58ea64eb57ede5923a54e41f5a262
-  data.tar.gz: e1c805dc4185374113cb639133d4546df210ab9ceb7dd65be2dd6a82ddfb9d1930f31f7d9a6830fa0a82c217c6eeec3a04a4f720e9ab70fcb48dad3d21824387
+  metadata.gz: 5282dc961ae5f4f9dbe08c3f0e225ad3e8849522d5f0f7de7deaa233463479197498c91327dc8e6455478ee4469cbec660f6c278a45b09218a45e3d3d8f5736d
+  data.tar.gz: b884d26fb02ec6714d5ff54e862cbe5dccec2853b4ebcdda84410ccda65fc7693428e163b390a7d71b741a538d5ef9e0c5aac365d8709ff301e0344bb7bd8880

data/lib/z3/expr/bitvec_expr.rb

@@ -49,11 +49,31 @@ module Z3
     end
 
     def /(other)
-      raise "Use signed_div or unsigned_div"
+      raise Z3::Exception, "Use signed_div or unsigned_div"
+    end
+
+    def signed_div(other)
+      BitvecExpr.SignedDiv(self, other)
+    end
+
+    def unsigned_div(other)
+      BitvecExpr.UnsignedDiv(self, other)
     end
 
     def %(other)
-      raise "Use signed_mod or signed_rem or unsigned_rem"
+      raise Z3::Exception, "Use signed_mod or signed_rem or unsigned_rem"
+    end
+
+    def signed_mod(other)
+      BitvecExpr.SignedMod(self, other)
+    end
+
+    def signed_rem(other)
+      BitvecExpr.SignedRem(self, other)
+    end
+
+    def unsigned_rem(other)
+      BitvecExpr.UnsignedRem(self, other)
     end
 
     def rotate_left(num)
@@ -257,6 +277,31 @@ module Z3
         a.sort.new(LowLevel.mk_bvshl(a, b))
       end
 
+      def SignedDiv(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvsdiv(a, b))
+      end
+
+      def UnsignedDiv(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvudiv(a, b))
+      end
+
+      def SignedMod(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvsmod(a, b))
+      end
+
+      def SignedRem(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvsrem(a, b))
+      end
+
+      def UnsignedRem(a, b)
+        a, b = coerce_to_same_bv_sort(a, b)
+        a.sort.new(LowLevel.mk_bvurem(a, b))
+      end
+
       def Xnor(*args)
         args = coerce_to_same_bv_sort(*args)
         args.inject do |a,b|

data/lib/z3/optimize.rb

@@ -23,9 +23,9 @@ module Z3
       LowLevel.optimize_assert(self, ast)
     end
 
-    def assert_soft(ast)
+    def assert_soft(ast, weight = "1", id = nil)
       reset_model!
-      LowLevel.optimize_assert_soft(self, ast)
+      LowLevel.optimize_assert_soft(self, ast, weight, id)
     end
 
     def check(*args)

data/lib/z3/very_low_level.rb

@@ -4,7 +4,7 @@ require "ffi"
 module Z3
   module VeryLowLevel
     extend FFI::Library
-    ffi_lib ["libz3.so.4.8", "libz3.so", "z3"]
+    ffi_lib ["libz3.so.4.8", "libz3.so", "z3", "libz3"]
 
     class << self
       # Aliases defined just to make APIs below look nicer

data/spec/bitvec_expr_spec.rb

@@ -36,6 +36,19 @@ module Z3
       expect([a == 30, b == 42, c == (a * b)]).to have_solution(c => 236)
     end
 
+    it "/" do
+      expect{ a / b }.to raise_error(Z3::Exception)
+      expect([a == 200, b == 20, c == a.unsigned_div(b)]).to have_solution(c => 10)
+      expect([a == 200, b == 20, c == a.signed_div(b)]).to have_solution(c => 254)
+    end
+
+    it "%" do
+      expect{ a % b }.to raise_error(Z3::Exception)
+      expect([a == 200, b == 20, c == a.signed_mod(b)]).to have_solution(c => 4)
+      expect([a == 200, b == 20, c == a.signed_rem(b)]).to have_solution(c => 240)
+      expect([a == 200, b == 20, c == a.unsigned_rem(b)]).to have_solution(c => 0)
+    end
+
     it "&" do
       expect([a == 50, b == 27, c == (a & b)]).to have_solution(c => 18)
     end

data/spec/integration/abc_path_spec.rb

@@ -1,21 +1,5 @@
-# There are multiple solutions, so this test is nondeterministic
-# This is what Z3 4.8.13 returns
 describe "ABC Path" do
   it do
-    expect("abc_path").to have_output <<'EOF'
-C O R D F B U
-
-N o-n l-k-j L
-  | |/    |
-G p m g-f i I
-  |    x /
-Q q-r e h a H
-   /  |   |
-V s v d-c-b S
-   x \
-T u-t w-x-y X
-
-J P M W K Y E
-EOF
+    expect("abc_path").to have_output_matching_saved_example
   end
 end

data/spec/integration/examples/abc_path-1.txt

@@ -0,0 +1,13 @@
+C O R D F B U
+
+N o-n l-k-j L
+  | |/    |
+G p m g-f i I
+  |    x /
+Q q-r e h a H
+   /  |   |
+V s v d-c-b S
+   x \
+T u-t w-x-y X
+
+J P M W K Y E

data/spec/integration/examples/abc_path-2.txt

@@ -0,0 +1,13 @@
+C O R D F B U
+
+N o-n l-k-j L
+  | |/    |
+G p m g-f i I
+  |    x /
+Q q-r e h b H
+   /  |  /|
+V s v d-c a S
+   x \
+T u-t w-x-y X
+
+J P M W K Y E

data/spec/integration/examples/futoshiki-1.txt

@@ -0,0 +1,17 @@
+2 5 3 4 1 7 6<9 8
+
+1 9 7 2 8 5 3<4<6
+  _
+7<8 2 5>3>1 4<6 9
+^
+8 1<5<9 7 6 2 3 4
+            ^
+4 7>6>1 9 2 5 8 3
+^         ^     ^
+6 4 1 8 2 3 9 5 7
+  _   _ ^   _ _
+9 3 4 6>5 8 7 1 2
+_
+5 2 9>3 6>4 8>7 1
+              _
+3 6 8>7>4 9 1<2 5

data/spec/integration/examples/futoshiki-2.txt

@@ -0,0 +1,17 @@
+2 5 3 4 1 7 6<9 8
+
+1 9 7 2 8 5 3<4<6
+  _
+7<8 2 5>3>1 4<6 9
+^
+8 3<5<9 7 6 2 1 4
+            ^
+4 7>6>1 9 2 5 8 3
+^         ^     ^
+6 4 1 8 2 3 9 5 7
+  _   _ ^   _ _
+9 1 4 6>5 8 7 3 2
+_
+5 2 9>3 6>4 8>7 1
+              _
+3 6 8>7>4 9 1<2 5

data/spec/integration/examples/knights_puzzle-1.txt

@@ -0,0 +1,90 @@
+Solved
+State 0:
+bbb.
+xbxw
+..ww
+x.xw
+w: 2,2 -> 3,0
+
+State 1:
+bbbw
+xbxw
+...w
+x.xw
+b: 1,0 -> 2,2
+
+State 2:
+b.bw
+xbxw
+..bw
+x.xw
+w: 3,1 -> 1,0
+
+State 3:
+bwbw
+xbx.
+..bw
+x.xw
+b: 0,0 -> 1,2
+
+State 4:
+.wbw
+xbx.
+.bbw
+x.xw
+b: 1,2 -> 3,1
+
+State 5:
+.wbw
+xbxb
+..bw
+x.xw
+w: 3,3 -> 1,2
+
+State 6:
+.wbw
+xbxb
+.wbw
+x.x.
+w: 1,2 -> 0,0
+
+State 7:
+wwbw
+xbxb
+..bw
+x.x.
+b: 2,0 -> 1,2
+
+State 8:
+ww.w
+xbxb
+.bbw
+x.x.
+w: 3,2 -> 2,0
+
+State 9:
+wwww
+xbxb
+.bb.
+x.x.
+b: 1,1 -> 3,2
+
+State 10:
+wwww
+x.xb
+.bbb
+x.x.
+b: 1,2 -> 3,3
+
+State 11:
+wwww
+x.xb
+..bb
+x.xb
+w: 3,0 -> 1,1
+
+State 12:
+www.
+xwxb
+..bb
+x.xb

data/spec/integration/examples/knights_puzzle-2.txt

@@ -0,0 +1,90 @@
+Solved
+State 0:
+bbb.
+xbxw
+..ww
+x.xw
+w: 2,2 -> 3,0
+
+State 1:
+bbbw
+xbxw
+...w
+x.xw
+b: 1,0 -> 2,2
+
+State 2:
+b.bw
+xbxw
+..bw
+x.xw
+w: 3,1 -> 1,0
+
+State 3:
+bwbw
+xbx.
+..bw
+x.xw
+b: 0,0 -> 1,2
+
+State 4:
+.wbw
+xbx.
+.bbw
+x.xw
+b: 1,2 -> 3,1
+
+State 5:
+.wbw
+xbxb
+..bw
+x.xw
+w: 3,3 -> 1,2
+
+State 6:
+.wbw
+xbxb
+.wbw
+x.x.
+w: 1,2 -> 0,0
+
+State 7:
+wwbw
+xbxb
+..bw
+x.x.
+b: 2,0 -> 1,2
+
+State 8:
+ww.w
+xbxb
+.bbw
+x.x.
+b: 1,2 -> 3,3
+
+State 9:
+ww.w
+xbxb
+..bw
+x.xb
+w: 3,2 -> 2,0
+
+State 10:
+wwww
+xbxb
+..b.
+x.xb
+b: 1,1 -> 3,2
+
+State 11:
+wwww
+x.xb
+..bb
+x.xb
+w: 3,0 -> 1,1
+
+State 12:
+www.
+xwxb
+..bb
+x.xb

data/spec/integration/examples/knights_puzzle-3.txt

@@ -0,0 +1,90 @@
+Solved
+State 0:
+bbb.
+xbxw
+..ww
+x.xw
+w: 2,2 -> 3,0
+
+State 1:
+bbbw
+xbxw
+...w
+x.xw
+b: 1,0 -> 2,2
+
+State 2:
+b.bw
+xbxw
+..bw
+x.xw
+b: 0,0 -> 1,2
+
+State 3:
+..bw
+xbxw
+.bbw
+x.xw
+w: 3,1 -> 1,0
+
+State 4:
+.wbw
+xbx.
+.bbw
+x.xw
+b: 1,2 -> 3,1
+
+State 5:
+.wbw
+xbxb
+..bw
+x.xw
+w: 3,3 -> 1,2
+
+State 6:
+.wbw
+xbxb
+.wbw
+x.x.
+w: 1,2 -> 0,0
+
+State 7:
+wwbw
+xbxb
+..bw
+x.x.
+b: 2,0 -> 1,2
+
+State 8:
+ww.w
+xbxb
+.bbw
+x.x.
+b: 1,2 -> 3,3
+
+State 9:
+ww.w
+xbxb
+..bw
+x.xb
+w: 3,2 -> 2,0
+
+State 10:
+wwww
+xbxb
+..b.
+x.xb
+b: 1,1 -> 3,2
+
+State 11:
+wwww
+x.xb
+..bb
+x.xb
+w: 3,0 -> 1,1
+
+State 12:
+www.
+xwxb
+..bb
+x.xb

data/spec/integration/futoshiki_spec.rb

@@ -1,23 +1,5 @@
 describe "Futoshiki" do
   it do
-    expect("futoshiki").to have_output <<EOF
-2 5 3 4 1 7 6<9 8
-
-1 9 7 2 8 5 3<4<6
-  _
-7<8 2 5>3>1 4<6 9
-^
-8 1<5<9 7 6 2 3 4
-            ^
-4 7>6>1 9 2 5 8 3
-^         ^     ^
-6 4 1 8 2 3 9 5 7
-  _   _ ^   _ _
-9 3 4 6>5 8 7 1 2
-_
-5 2 9>3 6>4 8>7 1
-              _
-3 6 8>7>4 9 1<2 5
-EOF
+    expect("futoshiki").to have_output_matching_saved_example
   end
 end

data/spec/integration/knights_puzzle_spec.rb

@@ -1,98 +1,5 @@
-# There are multiple solutions, so this test is nondeterministic
-# This is what Z3 4.8.13 returns
 describe "Knights Swap Puzzle" do
   it do
-    expect("knights_puzzle").to have_output <<EOF
-Solved
-State 0:
-bbb.
-xbxw
-..ww
-x.xw
-w: 2,2 -> 3,0
-
-State 1:
-bbbw
-xbxw
-...w
-x.xw
-b: 1,0 -> 2,2
-
-State 2:
-b.bw
-xbxw
-..bw
-x.xw
-w: 3,1 -> 1,0
-
-State 3:
-bwbw
-xbx.
-..bw
-x.xw
-b: 0,0 -> 1,2
-
-State 4:
-.wbw
-xbx.
-.bbw
-x.xw
-b: 1,2 -> 3,1
-
-State 5:
-.wbw
-xbxb
-..bw
-x.xw
-w: 3,3 -> 1,2
-
-State 6:
-.wbw
-xbxb
-.wbw
-x.x.
-w: 1,2 -> 0,0
-
-State 7:
-wwbw
-xbxb
-..bw
-x.x.
-b: 2,0 -> 1,2
-
-State 8:
-ww.w
-xbxb
-.bbw
-x.x.
-w: 3,2 -> 2,0
-
-State 9:
-wwww
-xbxb
-.bb.
-x.x.
-b: 1,1 -> 3,2
-
-State 10:
-wwww
-x.xb
-.bbb
-x.x.
-b: 1,2 -> 3,3
-
-State 11:
-wwww
-x.xb
-..bb
-x.xb
-w: 3,0 -> 1,1
-
-State 12:
-www.
-xwxb
-..bb
-x.xb
-EOF
+    expect("knights_puzzle").to have_output_matching_saved_example
   end
 end

data/spec/optimize_spec.rb

@@ -2,7 +2,7 @@
 
 # Disabled as it crashes on Z3 4.8.13
 module Z3
-  xdescribe Optimize do
+  describe Optimize do
     let(:optimize) { Optimize.new }
     let(:a) { Z3.Int("a") }
     let(:b) { Z3.Int("b") }
@@ -34,6 +34,15 @@ module Z3
       ])
     end
 
+    it "#assert_soft" do
+      optimize.assert_soft a > 0
+      optimize.assert_soft a < 0
+      optimize.assert_soft a < 10
+      optimize.maximize a
+      expect(optimize).to be_satisfiable
+      expect(optimize.model[a].to_i).to eq 9
+    end
+
     it "#statistics" do
       optimize.assert a + b == 4
       optimize.assert b >= 2
@@ -42,16 +51,6 @@ module Z3
       expect(stats.keys).to match_array(["rlimit count", "max memory", "memory", "num allocs"])
     end
 
-    # This is a very simple example of unknown satisfiablity
-    # so we might need more complex one in the future
-    # Unlike Z3::Solver, this is unknown even 4.6.0
-    it "unknown satisfiability" do
-      optimize.assert a**3 == a
-      expect(optimize.check).to eq(:unknown)
-      expect{optimize.satisfiable?}.to raise_error("Satisfiability unknown")
-      expect{optimize.unsatisfiable?}.to raise_error("Satisfiability unknown")
-    end
-
     it "unknown satisfiability" do
       optimize.assert a**a == a
       expect(optimize.check).to eq(:unknown)

data/spec/spec_helper.rb

@@ -38,6 +38,20 @@ RSpec::Matchers.define :have_output do |expected|
   end
 end
 
+RSpec::Matchers.define :have_output_matching_saved_example do
+  match do |file_name|
+    executable_path = "#{__dir__}/../examples/#{file_name}"
+    actual = IO.popen("ruby -r./spec/coverage_helper #{executable_path}").read
+    @actual = actual.gsub(/ *$/, "")
+    @expected = Pathname("spec/integration/examples").glob("#{file_name}-*.txt").map(&:read).map{|o| o.gsub(/ *$/, "")}
+    @expected.include?(@actual)
+  end
+
+  failure_message do |actual|
+    "Expected one of saved examples, but got:\n#{@actual}"
+  end
+end
+
 RSpec::Matchers.define :have_output_no_color do |expected|
   match do |file_name|
     executable_path = "#{__dir__}/../examples/#{file_name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20220203
+  version: 0.0.20220828
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -280,6 +280,13 @@ files:
 - spec/integration/dominion_spec.rb
 - spec/integration/dominosa_spec.rb
 - spec/integration/eulero_spec.rb
+- spec/integration/examples/abc_path-1.txt
+- spec/integration/examples/abc_path-2.txt
+- spec/integration/examples/futoshiki-1.txt
+- spec/integration/examples/futoshiki-2.txt
+- spec/integration/examples/knights_puzzle-1.txt
+- spec/integration/examples/knights_puzzle-2.txt
+- spec/integration/examples/knights_puzzle-3.txt
 - spec/integration/four_hackers_puzzle_spec.rb
 - spec/integration/futoshiki_spec.rb
 - spec/integration/geometry_problem_spec.rb
@@ -349,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - z3 library (4.8+)
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Z3 Constraint Solver