z3 0.0.20221020 → 0.0.20230311

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abba86119ff297f1b65693b634c5f33b11e53ea24f76b5b851d11918bf061694
-  data.tar.gz: bf2253285a83d24d1e7a5264d839506f65b32a45c27203dcf12202daab0c527a
+  metadata.gz: bba953278a11ef2e902d7f7103195a57c2d94b1a515de357e23c4cce3a8ced81
+  data.tar.gz: c4dc956299e225582b8913d135adcd67595fcfb28c20565a1121b5d5ed73f983
 SHA512:
-  metadata.gz: d63a2a62b5f8103eca1c0ae9429a5538cb5a0add23ca14fdceb1759f821d5a0f8ddeb22c06efad3780b5498d8c6ff0fea4f9d0c86c3d1e1dbfd443265f3b4f4a
-  data.tar.gz: 7cd9d08794c1fa4cb2c47575c3977d35a781874c5f27f03ee31eb251e153062f91e8bd38236da887cc1a1fb6e401250038e98cd44d63197e120d84cd8171ef1f
+  metadata.gz: ca74743545f86daa86cb85a3f33ce0db5e3d159dcbe133e85a389b795d5ca6ad5b15842e275ef18a21e0a3317d010d1906143fc8bd6cbc27513777d0186a88df
+  data.tar.gz: a6ef5bb470556ad7d1bb39c54537ca9516aa64cc0bfb53fc8984352033ced94443e0272de9fa078a451f680af3a08d4c2c706e43f134a564bb2aef9fd677a8be

data/lib/z3/expr/arith_expr.rb

@@ -40,6 +40,26 @@ module Z3
       sort.new(LowLevel.mk_unary_minus(self))
     end
 
+    def zero?
+      self == 0
+    end
+
+    def nonzero?
+      self != 0
+    end
+
+    def positive?
+      self > 0
+    end
+
+    def negative?
+      self < 0
+    end
+
+    def abs
+      (self < 0).ite(-self, self)
+    end
+
     # Recast so 1 + x:Float
     # is:  (+ 1.0 x)
     # not: (+ (to_real 1) x)

data/lib/z3/expr/bitvec_expr.rb

@@ -246,6 +246,26 @@ module Z3
       BitvecExpr.UnsignedLe(self, other)
     end
 
+    def zero?
+      self == 0
+    end
+
+    def nonzero?
+      self != 0
+    end
+
+    def positive?
+      self.signed_gt 0
+    end
+
+    def negative?
+      self.signed_lt 0
+    end
+
+    def abs
+      self.negative?.ite(-self, self)
+    end
+
     def coerce(other)
       other_sort = Expr.sort_for_const(other)
       max_sort = [sort, other_sort].max

data/lib/z3/expr/float_expr.rb

@@ -81,6 +81,10 @@ module Z3
       BoolSort.new.new LowLevel.mk_fpa_is_zero(self)
     end
 
+    def nonzero?
+      Z3.And(~zero?, ~nan?)
+    end
+
     def max(other)
       FloatExpr.Max(self, other)
     end

data/lib/z3/expr/int_expr.rb

@@ -4,6 +4,10 @@ module Z3
       IntExpr.Mod(self, other)
     end
 
+    def %(other)
+      IntExpr.Mod(self, other)
+    end
+
     def rem(other)
       IntExpr.Rem(self, other)
     end

data/spec/bitvec_expr_spec.rb

@@ -231,5 +231,38 @@ module Z3
       expect([a == 0b0101_0110, e == 0b1101, d == a.concat(e)]).to have_solution(d => 0b0101_0110_1101)
       expect([a == 0b0101_0110, e == 0b1101, d == e.concat(a)]).to have_solution(d => 0b1101_0101_0110)
     end
+
+    it "zero?" do
+      expect([a == 0, x == a.zero?]).to have_solution(x => true)
+      expect([a == 100, x == a.zero?]).to have_solution(x => false)
+      expect([a == 200, x == a.zero?]).to have_solution(x => false)
+    end
+
+    it "nonzero?" do
+      expect([a == 0, x == a.nonzero?]).to have_solution(x => false)
+      expect([a == 100, x == a.nonzero?]).to have_solution(x => true)
+      expect([a == 200, x == a.nonzero?]).to have_solution(x => true)
+    end
+
+    # Inherently signed
+    it "positive?" do
+      expect([a == 0, x == a.positive?]).to have_solution(x => false)
+      expect([a == 100, x == a.positive?]).to have_solution(x => true)
+      expect([a == 200, x == a.positive?]).to have_solution(x => false)
+    end
+
+    # Inherently signed
+    it "negative?" do
+      expect([a == 0, x == a.negative?]).to have_solution(x => false)
+      expect([a == 100, x == a.negative?]).to have_solution(x => false)
+      expect([a == 200, x == a.negative?]).to have_solution(x => true)
+    end
+
+    # Inherently signed
+    it "abs" do
+      expect([a == 0, b == a.abs]).to have_solution(b => 0)
+      expect([a == 100, b == a.abs]).to have_solution(b => 100)
+      expect([a == 200, b == a.abs]).to have_solution(b => 56)
+    end
   end
 end

data/spec/float_expr_spec.rb

@@ -129,6 +129,17 @@ module Z3
       expect([x == nan.zero?]).to have_solution(x => false)
     end
 
+    # Same as positive or negative
+    # +0, -0, and NaN are all false
+    it "nonzero?" do
+      expect([x == positive_zero.nonzero?]).to have_solution(x => false)
+      expect([x == negative_zero.nonzero?]).to have_solution(x => false)
+      expect([x == positive_infinity.nonzero?]).to have_solution(x => true)
+      expect([x == negative_infinity.nonzero?]).to have_solution(x => true)
+      expect([x == float_double.from_const(1.5).nonzero?]).to have_solution(x => true)
+      expect([x == nan.nonzero?]).to have_solution(x => false)
+    end
+
     it "infinite?" do
       expect([x == positive_zero.infinite?]).to have_solution(x => false)
       expect([x == positive_infinity.infinite?]).to have_solution(x => true)
@@ -179,5 +190,28 @@ module Z3
       expect([x == float_double.from_const(-1.5).negative?]).to have_solution(x => true)
       expect([x == nan.negative?]).to have_solution(x => false)
     end
+
+    # We can't simply do have_solution(b => positive_zero)
+    # as positive_zero == negative_zero
+    it "abs" do
+      expect([a == positive_zero, b == a.abs]).to have_solution(a.abs => positive_zero)
+      expect([a == negative_zero, b == a.abs]).to have_solution(a.abs => positive_zero)
+      expect([a == positive_infinity, b == a.abs]).to have_solution(b => positive_infinity)
+      expect([a == negative_infinity, b == a.abs]).to have_solution(b => positive_infinity)
+      expect([a == float_double.from_const(1.5), b == a.abs]).to have_solution(b => float_double.from_const(1.5))
+      expect([a == float_double.from_const(-1.5), b == a.abs]).to have_solution(b => float_double.from_const(1.5))
+      expect([a == nan, b == a.abs]).to have_no_solution
+    end
+
+    # This means you need to be extra careful when using Z3::Float
+    # as == means something else on them than mathematical ==
+    #
+    # Also have_solutions helper doesn't work as it relies on ==
+    it "zeroes" do
+      expect([a == positive_zero, b == a, b.positive?]).to have_solution(b => positive_zero)
+      expect([a == negative_zero, b == a, b.negative?]).to have_solution(b => negative_zero)
+      expect([a == positive_zero, b == a, b.positive?]).to have_solution(b => positive_zero)
+      expect([a == negative_zero, b == a, b.negative?]).to have_solution(b => negative_zero)
+    end
   end
 end

data/spec/int_expr_spec.rb

@@ -39,6 +39,15 @@ module Z3
       expect([a == -10, b == -3, c == a.mod(b)]).to have_solution(c => 2)
     end
 
+    # It doesn't match Ruby on negative right side, but nobody does modulo a negative anyway
+    # Python Z3 API does the same thing
+    it "%" do
+      expect([a ==  10, b ==  3, c == a % b]).to have_solution(c => 1)
+      expect([a ==  10, b == -3, c == a % b]).to have_solution(c => 1)
+      expect([a == -10, b ==  3, c == a % b]).to have_solution(c => 2)
+      expect([a == -10, b == -3, c == a % b]).to have_solution(c => 2)
+    end
+
     it "==" do
       expect([a == 2, b == 2, x == (a == b)]).to have_solution(x => true)
       expect([a == 2, b == 3, x == (a == b)]).to have_solution(x => false)
@@ -81,6 +90,36 @@ module Z3
       expect([a == 3, b == -a]).to have_solution(b => -3)
     end
 
+    it "zero?" do
+      expect([a == 0, x == a.zero?]).to have_solution(x => true)
+      expect([a == 100, x == a.zero?]).to have_solution(x => false)
+      expect([a == -200, x == a.zero?]).to have_solution(x => false)
+    end
+
+    it "nonzero?" do
+      expect([a == 0, x == a.nonzero?]).to have_solution(x => false)
+      expect([a == 100, x == a.nonzero?]).to have_solution(x => true)
+      expect([a == -200, x == a.nonzero?]).to have_solution(x => true)
+    end
+
+    it "positive?" do
+      expect([a == 0, x == a.positive?]).to have_solution(x => false)
+      expect([a == 100, x == a.positive?]).to have_solution(x => true)
+      expect([a == -200, x == a.positive?]).to have_solution(x => false)
+    end
+
+    it "negative?" do
+      expect([a == 0, x == a.negative?]).to have_solution(x => false)
+      expect([a == 100, x == a.negative?]).to have_solution(x => false)
+      expect([a == -200, x == a.negative?]).to have_solution(x => true)
+    end
+
+    it "abs" do
+      expect([a == 3, b == 2, c == (a - b).abs]).to have_solution(c => 1)
+      expect([a == 2, b == 3, c == (a - b).abs]).to have_solution(c => 1)
+      expect([a == 2, b == 2, c == (a - b).abs]).to have_solution(c => 0)
+    end
+
     it "simplify" do
       a = Z3.Const(5)
       b = Z3.Const(3)

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

@@ -0,0 +1,90 @@
+Solved
+State 0:
+bbb.
+xbxw
+..ww
+x.xw
+b: 0,0 -> 1,2
+
+State 1:
+.bb.
+xbxw
+.bww
+x.xw
+w: 2,2 -> 3,0
+
+State 2:
+.bbw
+xbxw
+.b.w
+x.xw
+b: 1,0 -> 2,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/real_expr_spec.rb

@@ -64,6 +64,36 @@ module Z3
       expect([a == 81, b == 0.25, c == (a ** b)]).to have_solution(c => 3)
     end
 
+    it "zero?" do
+      expect([a == 0, x == a.zero?]).to have_solution(x => true)
+      expect([a == 100, x == a.zero?]).to have_solution(x => false)
+      expect([a == -200, x == a.zero?]).to have_solution(x => false)
+    end
+
+    it "nonzero?" do
+      expect([a == 0, x == a.nonzero?]).to have_solution(x => false)
+      expect([a == 100, x == a.nonzero?]).to have_solution(x => true)
+      expect([a == -200, x == a.nonzero?]).to have_solution(x => true)
+    end
+
+    it "positive?" do
+      expect([a == 0, x == a.positive?]).to have_solution(x => false)
+      expect([a == 100, x == a.positive?]).to have_solution(x => true)
+      expect([a == -200, x == a.positive?]).to have_solution(x => false)
+    end
+
+    it "negative?" do
+      expect([a == 0, x == a.negative?]).to have_solution(x => false)
+      expect([a == 100, x == a.negative?]).to have_solution(x => false)
+      expect([a == -200, x == a.negative?]).to have_solution(x => true)
+    end
+
+    it "abs" do
+      expect([a == 3, b == 2, c == (a - b).abs]).to have_solution(c => 1)
+      expect([a == 2, b == 3, c == (a - b).abs]).to have_solution(c => 1)
+      expect([a == 2, b == 2, c == (a - b).abs]).to have_solution(c => 0)
+    end
+
     it "unary -" do
       expect([a == 3, b == -a]).to have_solution(b => -3)
       expect([a == 0, b == -a]).to have_solution(b => 0)

data/spec/spec_helper.rb

@@ -155,3 +155,22 @@ RSpec::Matchers.define :have_solutions do |expected|
     end
   end
 end
+
+RSpec::Matchers.define :have_no_solution do
+  match do |asts|
+    solver = setup_solver(asts)
+    !solver.satisfiable?
+  end
+
+  failure_message do |asts|
+    "expected #{asts.inspect} to have no solutions, but solution found"
+  end
+
+  def setup_solver(asts)
+    Z3::Solver.new.tap do |solver|
+      asts.each do |ast|
+        solver.assert ast
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20221020
+  version: 0.0.20230311
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -288,6 +288,7 @@ files:
 - spec/integration/examples/knights_puzzle-2.txt
 - spec/integration/examples/knights_puzzle-3.txt
 - spec/integration/examples/knights_puzzle-4.txt
+- spec/integration/examples/knights_puzzle-5.txt
 - spec/integration/four_hackers_puzzle_spec.rb
 - spec/integration/futoshiki_spec.rb
 - spec/integration/geometry_problem_spec.rb
@@ -357,7 +358,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - z3 library (4.8+)
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Z3 Constraint Solver