z3 0.0.20220630 → 0.0.20220828

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9289c94f0a177c8e59d2c18c65775344414bb3558151ac58fc02e932b3a7eb1
-  data.tar.gz: 3171e750dc3a36d1534ffc0c069274ff8bc7bc4d59d15e6792add5c4ab5f90b6
+  metadata.gz: 94779e8d2fdaee7a213640164c8113fee96135e5247d9dc161d02dae87da6e94
+  data.tar.gz: d11a1326c693216fe857b436460d63176b466cc8b9927378940fc5543506a02e
 SHA512:
-  metadata.gz: d19511280987279176db440a5c5f3764d9029b49c74185c32cbf3dd01e6f02bcefa92b5800b24d4e872f052cb40a8daddf756783c81f3fdb63055d1be950b119
-  data.tar.gz: '09eedf827d3dfae3c56fd6d1c165160cdb5e3aeab0e2faae429dd81da91b7eaafd6640a6f28ed2a1b45e8a3a3c3e12a03d38327e86ac497b69e974e5f431cee6'
+  metadata.gz: 5282dc961ae5f4f9dbe08c3f0e225ad3e8849522d5f0f7de7deaa233463479197498c91327dc8e6455478ee4469cbec660f6c278a45b09218a45e3d3d8f5736d
+  data.tar.gz: b884d26fb02ec6714d5ff54e862cbe5dccec2853b4ebcdda84410ccda65fc7693428e163b390a7d71b741a538d5ef9e0c5aac365d8709ff301e0344bb7bd8880

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/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.20220630
+  version: 0.0.20220828
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-30 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