z3 0.0.20181229 → 0.0.20220320

data/spec/set_expr_spec.rb

@@ -1,3 +1,5 @@
+# This test is really bad, all of these have multiple solutions.
+# And it changes between Z3 versions
 module Z3
   describe SetExpr do
     let(:sort) { SetSort.new(IntSort.new) }
@@ -21,13 +23,15 @@ module Z3
         expect([
           a.include?(1),
           a.include?(2),
+          !a.include?(3),
+          !b.include?(1),
           b.include?(2),
           b.include?(3),
           c == a.union(b),
         ]).to have_solution(
-          a => "(lambda ((x!1 Int)) (or (= x!1 1) (= x!1 2)))",
-          b => "(lambda ((x!1 Int)) (or (= x!1 3) (= x!1 2)))",
-          c => "(lambda ((x!1 Int)) (or (= x!1 1) (= x!1 3) (= x!1 2)))",
+          a => "store(const(true), 3, false)",
+          b => "store(const(true), 1, false)",
+          c => "map(store(const(true), 3, false), store(const(true), 1, false))",
         )
       end
 
@@ -41,9 +45,9 @@ module Z3
           b.include?(3),
           c == a.difference(b),
         ]).to have_solution(
-          a => "(lambda ((x!1 Int)) (or (= x!1 1) (= x!1 2)))",
-          b => "(lambda ((x!1 Int)) (not (= x!1 1)))",
-          c => "(lambda ((x!1 Int)) (= x!1 1))",
+          a => "store(const(true), 3, false)",
+          b => "store(const(true), 1, false)",
+          c => "map(store(const(true), 3, false), store(const(false), 1, true))",
         )
       end
 
@@ -51,13 +55,15 @@ module Z3
         expect([
           a.include?(1),
           a.include?(2),
+          !a.include?(3),
+          !b.include?(1),
           b.include?(2),
           b.include?(3),
           c == a.intersection(b),
         ]).to have_solution(
-          a => "(lambda ((x!1 Int)) (or (= x!1 1) (= x!1 2)))",
-          b => "(lambda ((x!1 Int)) (or (= x!1 3) (= x!1 2)))",
-          c => "(lambda ((x!1 Int)) (or (= x!1 1) (= x!1 3) (= x!1 2)))",
+          a => "store(const(true), 3, false)",
+          b => "store(const(true), 1, false)",
+          c => "map(store(const(true), 3, false), store(const(true), 1, false))",
         )
       end
     end

data/spec/solver_spec.rb

@@ -37,8 +37,7 @@ module Z3
       solver.assert b >= 2
       solver.assert Z3.Or(a == 2, a == -2)
       stats = solver.statistics
-      # "mk bool var" added in 4.6.0
-      expect(stats.keys).to match_array(["rlimit count", "max memory", "memory", "num allocs", "mk bool var"])
+      expect(stats.keys).to match_array(["rlimit count", "max memory", "memory", "num allocs"])
     end
 
     # This is a very simple example of unknown satisfiablity

data/spec/spec_helper.rb

@@ -28,6 +28,21 @@ RSpec::Matchers.define :have_output do |expected|
   match do |file_name|
     executable_path = "#{__dir__}/../examples/#{file_name}"
     actual = IO.popen("ruby -r./spec/coverage_helper #{executable_path}").read
+    @expected = expected.gsub(/ *$/, "")
+    @actual = actual.gsub(/ *$/, "")
+    @actual == @expected
+  end
+
+  failure_message do |actual|
+    "Expected:\n#{@expected.chomp}\nBut got:\n#{@actual}"
+  end
+end
+
+RSpec::Matchers.define :have_output_no_color do |expected|
+  match do |file_name|
+    executable_path = "#{__dir__}/../examples/#{file_name}"
+    actual = IO.popen("ruby -r./spec/coverage_helper #{executable_path}").read
+    actual = actual.gsub(/\e\[.*?m/, "")
     actual.gsub(/ *$/, "") == expected.gsub(/ *$/, "")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20181229
+  version: 0.0.20220320
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-29 00:00:00.000000000 Z
+date: 2022-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -103,29 +117,59 @@ files:
 - ".rspec"
 - README.md
 - Rakefile
+- examples/abc_path
+- examples/abc_path-1.txt
 - examples/algebra_problems
+- examples/aquarium
+- examples/aquarium-1.txt
 - examples/basic_int_math
 - examples/basic_logic
 - examples/bit_tricks
 - examples/bridges
 - examples/bridges-1.txt
+- examples/cats_organized_neatly
+- examples/cats_organized_neatly-10.txt
+- examples/cats_organized_neatly-3.txt
+- examples/cats_organized_neatly-48.txt
 - examples/circuit_problems
 - examples/clogic_puzzle
+- examples/color_nonogram
+- examples/color_nonogram-1.txt
 - examples/crossflip
+- examples/dominion
+- examples/dominion-1.txt
+- examples/dominosa
+- examples/dominosa-1.txt
+- examples/eulero
+- examples/eulero-1.txt
 - examples/four_hackers_puzzle
+- examples/futoshiki
+- examples/futoshiki-1.txt
 - examples/geometry_problem
+- examples/kakurasu
+- examples/kakurasu-1.txt
 - examples/kakuro
 - examples/kakuro-1.txt
+- examples/killer_sudoku
+- examples/killer_sudoku-1.txt
+- examples/killer_sudoku-2.txt
 - examples/kinematics_problems
 - examples/knights_puzzle
+- examples/kropki
+- examples/kropki-1.txt
 - examples/letter_connections
 - examples/letter_connections-1.txt
 - examples/light_up
 - examples/light_up-1.txt
 - examples/minisudoku
 - examples/minisudoku-1.txt
+- examples/miracle_sudoku
+- examples/miracle_sudoku-1.txt
 - examples/mortal_coil_puzzle
 - examples/mortal_coil_puzzle-9.txt
+- examples/nanro
+- examples/nanro-1.txt
+- examples/nine_clocks
 - examples/nonogram
 - examples/oneofus
 - examples/pyramid_nonogram
@@ -151,11 +195,26 @@ files:
 - examples/regexp_crossword_solver
 - examples/regexp_solver
 - examples/regexp_string_matcher.rb
+- examples/renzoku
+- examples/renzoku-1.txt
+- examples/sandwich_sudoku
+- examples/sandwich_sudoku-1.txt
 - examples/selfref
 - examples/simple_regexp_parser.rb
+- examples/skyscrapers
+- examples/skyscrapers-1.txt
+- examples/skyscrapers-2.txt
+- examples/star_battle
+- examples/star_battle-1.txt
+- examples/stitches
+- examples/stitches-1.txt
 - examples/sudoku
 - examples/sudoku-1.txt
+- examples/suguru
+- examples/suguru-1.txt
 - examples/verbal_arithmetic
+- examples/yajilin
+- examples/yajilin-1.txt
 - examples/zebra_puzzle
 - lib/z3.rb
 - lib/z3/ast.rb
@@ -207,30 +266,51 @@ files:
 - spec/goal_spec.rb
 - spec/int_expr_spec.rb
 - spec/int_sort_spec.rb
+- spec/integration/abc_path_spec.rb
 - spec/integration/algebra_problems_spec.rb
+- spec/integration/aquarium_spec.rb
 - spec/integration/basic_int_math_spec.rb
 - spec/integration/basic_logic_spec.rb
 - spec/integration/bit_tricks_spec.rb
 - spec/integration/bridges_spec.rb
+- spec/integration/cats_organized_neatly_spec.rb
 - spec/integration/cicruit_problem_spec.rb
+- spec/integration/color_nonogram_spec.rb
 - spec/integration/crossflip_spec.rb
+- spec/integration/dominion_spec.rb
+- spec/integration/dominosa_spec.rb
+- spec/integration/eulero_spec.rb
 - spec/integration/four_hackers_puzzle_spec.rb
+- spec/integration/futoshiki_spec.rb
 - spec/integration/geometry_problem_spec.rb
+- spec/integration/kakurasu_spec.rb
 - spec/integration/kakuro_spec.rb
+- spec/integration/killer_sudoku_spec.rb
 - spec/integration/kinematics_problems_spec.rb
 - spec/integration/knights_puzzle_spec.rb
+- spec/integration/kropki_spec.rb
 - spec/integration/letter_connections_spec.rb
 - spec/integration/light_up_spec.rb
 - spec/integration/minisudoku_spec.rb
+- spec/integration/miracle_sudoku_spec.rb
 - spec/integration/mortal_coil_puzzle_spec.rb
+- spec/integration/nanro_spec.rb
+- spec/integration/nine_clocks_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/renzoku_spec.rb
+- spec/integration/sandwich_sudoku_spec.rb
 - spec/integration/selfref_spec.rb
+- spec/integration/skyscraper_spec.rb
+- spec/integration/star_battle_spec.rb
+- spec/integration/stitches_spec.rb
 - spec/integration/sudoku_spec.rb
+- spec/integration/suguru_spec.rb
 - spec/integration/verbal_arithmetic_spec.rb
+- spec/integration/yajilin_spec.rb
 - spec/integration/zebra_puzzle_spec.rb
 - spec/interface_spec.rb
 - spec/model_spec.rb
@@ -251,7 +331,8 @@ files:
 homepage: https://github.com/taw/z3
 licenses:
 - MIT
-metadata: {}
+metadata:
+  msys2_mingw_dependencies: z3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -268,8 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - z3 library (4.8+)
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Z3 Constraint Solver