z3 0.0.20220828 → 0.0.20221020

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94779e8d2fdaee7a213640164c8113fee96135e5247d9dc161d02dae87da6e94
-  data.tar.gz: d11a1326c693216fe857b436460d63176b466cc8b9927378940fc5543506a02e
+  metadata.gz: abba86119ff297f1b65693b634c5f33b11e53ea24f76b5b851d11918bf061694
+  data.tar.gz: bf2253285a83d24d1e7a5264d839506f65b32a45c27203dcf12202daab0c527a
 SHA512:
-  metadata.gz: 5282dc961ae5f4f9dbe08c3f0e225ad3e8849522d5f0f7de7deaa233463479197498c91327dc8e6455478ee4469cbec660f6c278a45b09218a45e3d3d8f5736d
-  data.tar.gz: b884d26fb02ec6714d5ff54e862cbe5dccec2853b4ebcdda84410ccda65fc7693428e163b390a7d71b741a538d5ef9e0c5aac365d8709ff301e0344bb7bd8880
+  metadata.gz: d63a2a62b5f8103eca1c0ae9429a5538cb5a0add23ca14fdceb1759f821d5a0f8ddeb22c06efad3780b5498d8c6ff0fea4f9d0c86c3d1e1dbfd443265f3b4f4a
+  data.tar.gz: 7cd9d08794c1fa4cb2c47575c3977d35a781874c5f27f03ee31eb251e153062f91e8bd38236da887cc1a1fb6e401250038e98cd44d63197e120d84cd8171ef1f

data/lib/z3/expr/array_expr.rb

@@ -1,5 +1,25 @@
 module Z3
   class ArrayExpr < Expr
     public_class_method :new
+
+    def key_sort
+      sort.key_sort
+    end
+
+    def value_sort
+      sort.value_sort
+    end
+
+    def store(key, value)
+      sort.new LowLevel.mk_store(self, key_sort.cast(key), value_sort.cast(value))
+    end
+
+    def select(key)
+      sort.value_sort.new LowLevel.mk_select(self, key_sort.cast(key))
+    end
+
+    def [](key)
+      select(key)
+    end
   end
 end

data/lib/z3/interface.rb

@@ -72,6 +72,10 @@ module Z3
     LowLevel.get_version.join(".")
   end
 
+  def version_at_least?(a, b=0, c=0, d=0)
+    (LowLevel.get_version <=> [a, b, c, d]) >= 0
+  end
+
   def set_param(k,v)
     LowLevel.global_param_set(k,v)
   end

data/spec/array_expr_spec.rb

@@ -4,7 +4,9 @@ module Z3
     let(:a) { sort.var("a") }
     let(:b) { sort.var("b") }
     let(:c) { sort.var("c") }
-    let(:x) { Z3::Bool("x") }
+    let(:x) { Z3::Int("x") }
+    let(:y) { Z3::Int("y") }
+    let(:z) { Z3::Int("z") }
 
     # TODO: Formatting is dreadful
     it "== and !=" do
@@ -14,5 +16,35 @@ module Z3
         c => "const(0)",
       )
     end
+
+    it "select" do
+      expect([a.select(10) == 20]).to have_solution(
+        a => "const(20)",
+      )
+      expect([a[10] == 20]).to have_solution(
+        a => "const(20)",
+      )
+      expect([a[x] == 10, a[y] == 20]).to have_solution(
+        a => "store(const(10), 3, 20)",
+        x => "2",
+        y => "3",
+      )
+    end
+
+    it "store" do
+      expect([a == b.store(10, 20), x == a.select(10)]).to have_solution(
+        x => 20,
+      )
+      expect([a == b.store(10, 20), x == a[10]]).to have_solution(
+        x => 20,
+      )
+      expect([a == b.store(10, 20), x == a[y], y == 10]).to have_solution(
+        x => 20,
+      )
+      expect([a == b.store(10, 20), x == a[y], x == 20]).to have_solution(
+        x => 20,
+        y => 10,
+      )
+    end
   end
 end

data/spec/array_sort_spec.rb

@@ -1,7 +1,7 @@
 module Z3
   describe ArraySort do
-    let(:int_int_array)   { ArraySort.new(IntSort.new, IntSort.new) }
-    let(:int_real_array)  { ArraySort.new(IntSort.new, RealSort.new) }
+    let(:int_int_array)  { ArraySort.new(IntSort.new, IntSort.new) }
+    let(:int_real_array) { ArraySort.new(IntSort.new, RealSort.new) }
 
     it "can instantiate variables" do
       expect(int_int_array.var("a").inspect).to eq("Array(Int, Int)<a>")

data/spec/float_expr_spec.rb

@@ -102,8 +102,9 @@ 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")
+
       # Denormals changed
-      if Z3.version >= '4.5'
+      if Z3.version_at_least?(4, 6)
         expect(float_double.from_const(1234 * 0.5**1040).to_s).to eq("0.00470733642578125B-1022")
         expect(float_single.from_const(1234 * 0.5**136).to_s).to eq("1.205078125B-126")
         # This is what we get, all of these are wrong, by a lot:

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

@@ -0,0 +1,90 @@
+Solved
+State 0:
+bbb.
+xbxw
+..ww
+x.xw
+w: 3,3 -> 1,2
+
+State 1:
+bbb.
+xbxw
+.www
+x.x.
+b: 1,1 -> 3,0
+
+State 2:
+bbbb
+x.xw
+.www
+x.x.
+w: 3,2 -> 1,1
+
+State 3:
+bbbb
+xwxw
+.ww.
+x.x.
+b: 2,0 -> 3,2
+
+State 4:
+bb.b
+xwxw
+.wwb
+x.x.
+w: 1,2 -> 2,0
+
+State 5:
+bbwb
+xwxw
+..wb
+x.x.
+b: 0,0 -> 1,2
+
+State 6:
+.bwb
+xwxw
+.bwb
+x.x.
+b: 1,2 -> 3,3
+
+State 7:
+.bwb
+xwxw
+..wb
+x.xb
+w: 3,1 -> 1,2
+
+State 8:
+.bwb
+xwx.
+.wwb
+x.xb
+b: 1,0 -> 3,1
+
+State 9:
+..wb
+xwxb
+.wwb
+x.xb
+w: 2,2 -> 1,0
+
+State 10:
+.wwb
+xwxb
+.w.b
+x.xb
+b: 3,0 -> 2,2
+
+State 11:
+.ww.
+xwxb
+.wbb
+x.xb
+w: 1,2 -> 0,0
+
+State 12:
+www.
+xwxb
+..bb
+x.xb

data/spec/set_expr_spec.rb

@@ -17,7 +17,7 @@ module Z3
       )
     end
 
-    if Z3.version >= "4.5"
+    if Z3.version_at_least?(4, 5)
       # Only works in z3 4.5, 4.4 (like on Ubuntu) returns bad stuff
       it "union" do
         expect([

data/spec/solver_spec.rb

@@ -43,7 +43,7 @@ module Z3
     # This is a very simple example of unknown satisfiablity
     # so we might need more complex one in the future
     # This is now satisfiable in 4.6.0
-    if Z3.version >= "4.6"
+    if Z3.version_at_least?(4, 6)
       it "unknown satisfiability (until 4.6 fix)" do
         solver.assert a**3 == a
         expect(solver.check).to eq(:sat)

data/spec/z3_spec.rb

@@ -2,4 +2,14 @@ describe Z3 do
   it "#version return version number of Z3 library" do
     expect(Z3.version).to match(/\A\d+\.\d+\.\d+\.\d+\z/)
   end
+
+  it "#version_at_least return if version matches" do
+    version = Z3.version.split(".").map(&:to_i)
+    expect(Z3.version_at_least?(*version)).to eq(true)
+    expect(Z3.version_at_least?(*version[0,2])).to eq(true)
+    expect(Z3.version_at_least?(*version[0,1])).to eq(true)
+    expect(Z3.version_at_least?(version[0])).to eq(true)
+    expect(Z3.version_at_least?(*version[0,2], 999)).to eq(false)
+    expect(Z3.version_at_least?(999)).to eq(false)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20220828
+  version: 0.0.20221020
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -287,6 +287,7 @@ files:
 - spec/integration/examples/knights_puzzle-1.txt
 - spec/integration/examples/knights_puzzle-2.txt
 - spec/integration/examples/knights_puzzle-3.txt
+- spec/integration/examples/knights_puzzle-4.txt
 - spec/integration/four_hackers_puzzle_spec.rb
 - spec/integration/futoshiki_spec.rb
 - spec/integration/geometry_problem_spec.rb