z3 0.0.20160330 → 0.0.20160427

data/spec/integration/verbal_arithmetic_spec.rb

@@ -1,7 +1,6 @@
 describe "Verbal Arithmetic" do
-  let(:executable) { "#{__dir__}/../../examples/verbal_arithmetic" }
-  it "can solve verbal arithmetic puzzles" do
-    expect(IO.popen(executable).read).to eq <<EOF
+  it do
+    expect("verbal_arithmetic").to have_output <<EOF
 [["S", 9], ["E", 5], ["N", 6], ["D", 7]]
 [["M", 1], ["O", 0], ["R", 8], ["E", 5]]
 [["M", 1], ["O", 0], ["N", 6], ["E", 5], ["Y", 2]]

data/spec/model_spec.rb

@@ -19,12 +19,19 @@ describe Z3::Model do
     solver.assert(a == 2)
     solver.assert(b == a+2)
     expect(solver.check).to eq(:sat)
-    expect(model.model_eval(a).to_s).to eq("2")
-    expect(model.model_eval(b).to_s).to eq("4")
-    expect(model.model_eval(c).to_s).to eq("c")
-    expect(model.model_eval(a, true).to_s).to eq("2")
-    expect(model.model_eval(b, true).to_s).to eq("4")
-    expect(model.model_eval(c, true).to_s).to eq("0")
+    expect(model.model_eval(a)).to be_same_as(Z3.Const(2))
+    expect(model.model_eval(b)).to be_same_as(Z3.Const(4))
+    expect(model.model_eval(c)).to be_same_as(c)
+    expect(model.model_eval(a, true)).to be_same_as(Z3.Const(2))
+    expect(model.model_eval(b, true)).to be_same_as(Z3.Const(4))
+    expect(model.model_eval(c, true)).to be_same_as(Z3.Const(0))
+  end
+
+  it "#to_a" do
+    solver.assert(a == 2)
+    solver.assert(b == a+2)
+    expect(solver.check).to eq(:sat)
+    expect(model.to_a).to be_same_as([[Z3.Int("a"), Z3.Const(2)], [Z3.Int("b"), Z3.Const(4)]])
   end
 
   it "#to_s" do

data/spec/printer_spec.rb

@@ -0,0 +1,22 @@
+describe Z3::Printer do
+  it "numbers" do
+    expect(Z3::IntSort.new.from_const(42)).to stringify("42")
+    expect(Z3::IntSort.new.from_const(-42)).to stringify("-42")
+    expect(Z3::RealSort.new.from_const(42)).to stringify("42")
+    expect(Z3::RealSort.new.from_const(-42)).to stringify("-42")
+    expect(Z3::RealSort.new.from_const(3.14)).to stringify("157/50")
+    expect(Z3::RealSort.new.from_const(-3.14)).to stringify("-157/50")
+  end
+
+  it "booleans" do
+    expect(Z3.True).to stringify("true")
+    expect(Z3.False).to stringify("false")
+  end
+
+  it "variables" do
+    expect(Z3::Int("a")).to stringify("a")
+    expect(Z3::Real("a")).to stringify("a")
+    expect(Z3::Bool("a")).to stringify("a")
+    expect(Z3::Bitvec("a", 32)).to stringify("a")
+  end
+end

data/spec/real_expr_spec.rb

@@ -0,0 +1,64 @@
+describe Z3::RealExpr do
+  let(:a) { Z3::Real("a") }
+  let(:b) { Z3::Real("b") }
+  let(:c) { Z3::Real("c") }
+  let(:x) { Z3::Bool("x") }
+
+  it "+" do
+    expect([a == 2, b == 4, c == a + b]).to have_solution(c => 6)
+  end
+
+  it "-" do
+    expect([a == 2, b == 4, c == a - b]).to have_solution(c => -2)
+  end
+
+  it "*" do
+    expect([a == 2, b == 4, c == a * b]).to have_solution(c => 8)
+  end
+
+  it "/" do
+    expect([a ==  10, b ==  3, c == a / b]).to have_solution(c => "10/3")
+    expect([a == -10, b ==  3, c == a / b]).to have_solution(c => "-10/3")
+    expect([a ==  10, b == -3, c == a / b]).to have_solution(c => "-10/3")
+    expect([a == -10, b == -3, c == a / b]).to have_solution(c => "10/3")
+  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)
+  end
+
+  it "!=" do
+    expect([a == 2, b == 2, x == (a != b)]).to have_solution(x => false)
+    expect([a == 2, b == 3, x == (a != b)]).to have_solution(x => true)
+  end
+
+  it ">" do
+    expect([a == 3, b == 2, x == (a > b)]).to have_solution(x => true)
+    expect([a == 2, b == 2, x == (a > b)]).to have_solution(x => false)
+    expect([a == 1, b == 2, x == (a > b)]).to have_solution(x => false)
+  end
+
+  it ">=" do
+    expect([a == 3, b == 2, x == (a >= b)]).to have_solution(x => true)
+    expect([a == 2, b == 2, x == (a >= b)]).to have_solution(x => true)
+    expect([a == 1, b == 2, x == (a >= b)]).to have_solution(x => false)
+  end
+
+  it "<" do
+    expect([a == 3, b == 2, x == (a < b)]).to have_solution(x => false)
+    expect([a == 2, b == 2, x == (a < b)]).to have_solution(x => false)
+    expect([a == 1, b == 2, x == (a < b)]).to have_solution(x => true)
+  end
+
+  it "<=" do
+    expect([a == 3, b == 2, x == (a <= b)]).to have_solution(x => false)
+    expect([a == 2, b == 2, x == (a <= b)]).to have_solution(x => true)
+    expect([a == 1, b == 2, x == (a <= b)]).to have_solution(x => true)
+  end
+
+  it "**" do
+    expect([a == 3, b == 4, c == (a ** b)]).to have_solution(c => 81)
+    expect([a == 81, b == 0.25, c == (a ** b)]).to have_solution(c => 3)
+  end
+end

data/spec/real_sort_spec.rb

@@ -0,0 +1,24 @@
+describe Z3::RealSort do
+  it "can instantiate constants" do
+    expect(subject.from_const(0).inspect).to eq("Real<0>")
+    expect(subject.from_const(42).inspect).to eq("Real<42>")
+    expect(subject.from_const(1_000_000_000_000).inspect).to eq("Real<1000000000000>")
+    expect(subject.from_const(-1_000_000_000_000).inspect).to eq("Real<-1000000000000>")
+    expect(subject.from_const(0.0).inspect).to eq("Real<0>")
+    expect(subject.from_const(-0.0).inspect).to eq("Real<0>")
+    expect(subject.from_const(3.14).inspect).to eq("Real<157/50>")
+    expect(subject.from_const(-3.14).inspect).to eq("Real<-157/50>")
+  end
+
+  it "raises exception when trying to convert constants of wrong type" do
+    expect{ subject.from_const(true) }.to raise_error(Z3::Exception)
+    expect{ subject.from_const(false) }.to raise_error(Z3::Exception)
+    expect{ subject.from_const(1.0 / 0.0) }.to raise_error(Z3::Exception)
+    expect{ subject.from_const(-1.0 / 0.0) }.to raise_error(Z3::Exception)
+    expect{ subject.from_const(0.0 / 0.0) }.to raise_error(Z3::Exception)
+  end
+
+  it "can instantiate variables" do
+    expect(Z3.Real("a").inspect).to eq("Real<a>")
+  end
+end

data/spec/solver_spec.rb

@@ -19,4 +19,15 @@ describe Z3::Solver do
     solver.pop
     expect(solver.check).to eq(:sat)
   end
+
+  it "#assertions" do
+    solver.assert a + b == 4
+    solver.assert b >= 2
+    solver.assert Z3.Or(a == 2, a == -2)
+    expect(solver.assertions).to be_same_as([
+      a + b == 4,
+      b >= 2,
+      (a == 2) | (a == -2),
+    ])
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require "pry"
+
 if ENV["COVERAGE"]
   require 'simplecov'
   SimpleCov.start
@@ -5,23 +7,6 @@ end
 
 require_relative "../lib/z3"
 
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
@@ -46,58 +31,48 @@ RSpec.configure do |config|
     # `true` in RSpec 4.
     mocks.verify_partial_doubles = true
   end
+end
 
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
+RSpec::Matchers.define :have_output do |expected|
+  match do |file_name|
+    executable_path = "#{__dir__}/../examples/#{file_name}"
+    actual = IO.popen(executable_path).read
+    actual.gsub(/ *$/, "") == expected.gsub(/ *$/, "")
+  end
+end
 
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
+RSpec::Matchers.define :be_same_as do |expected|
+  match do |file_name|
+    [actual.class, actual.inspect] == [expected.class, expected.inspect]
+  end
+end
 
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
+RSpec::Matchers.define :stringify do |expected|
+  match do |actual|
+    actual.to_s == expected
   end
+end
 
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
+RSpec::Matchers.define :have_solution do |expected|
+  match do |asts|
+    solver = setup_solver(asts)
+    solver.check == :sat and expected.all?{|var,val| solver.model[var].to_s == val.to_s}
+  end
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
+  failure_message do |asts|
+    solver = setup_solver(asts)
+    if solver.check == :sat
+      "expected #{asts.inspect} to have solution #{expected.inspect}, instead got #{solver.model}"
+    else
+      "expected #{asts.inspect} to have solution #{expected.inspect}, instead not solvable"
+    end
+  end
 
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
+  def setup_solver(asts)
+    Z3::Solver.new.tap do |solver|
+      asts.each do |ast|
+        solver.assert ast
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20160330
+  version: 0.0.20160427
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -35,60 +77,81 @@ files:
 - examples/basic_int_math
 - examples/basic_logic
 - examples/bit_tricks
-- examples/bridges_solver
-- examples/clogic_puzzle_solver
+- examples/bridges
+- examples/bridges-1.txt
+- examples/clogic_puzzle
 - examples/four_hackers_puzzle
 - examples/geometry_problem
-- examples/kakuro_solver
+- examples/kakuro
+- examples/kakuro-1.txt
 - examples/kinematics_problems
-- examples/knights_puzzle_solver
-- examples/letter_connections_solver
-- examples/light_up_solver
-- examples/minisudoku_solver
-- examples/selfref_solver
-- examples/sudoku_solver
+- examples/knights_puzzle
+- examples/letter_connections
+- examples/letter_connections-1.txt
+- examples/light_up
+- examples/light_up-1.txt
+- examples/minisudoku
+- examples/minisudoku-1.txt
+- examples/nonogram
+- examples/selfref
+- examples/sudoku
+- examples/sudoku-1.txt
 - examples/verbal_arithmetic
 - lib/z3.rb
+- lib/z3/ast.rb
 - lib/z3/context.rb
 - lib/z3/exception.rb
+- lib/z3/expr/arith_expr.rb
+- lib/z3/expr/bitvec_expr.rb
+- lib/z3/expr/bool_expr.rb
+- lib/z3/expr/expr.rb
+- lib/z3/expr/int_expr.rb
+- lib/z3/expr/real_expr.rb
 - lib/z3/func_decl.rb
 - lib/z3/interface.rb
 - lib/z3/low_level.rb
 - lib/z3/low_level_auto.rb
 - lib/z3/model.rb
+- lib/z3/printer.rb
 - lib/z3/solver.rb
 - lib/z3/sort/bitvec_sort.rb
 - lib/z3/sort/bool_sort.rb
 - lib/z3/sort/int_sort.rb
 - lib/z3/sort/real_sort.rb
 - lib/z3/sort/sort.rb
-- lib/z3/value/arith_value.rb
-- lib/z3/value/bitvec_value.rb
-- lib/z3/value/bool_value.rb
-- lib/z3/value/int_value.rb
-- lib/z3/value/real_value.rb
-- lib/z3/value/value.rb
 - lib/z3/very_low_level.rb
 - lib/z3/very_low_level_auto.rb
+- spec/bitvec_expr_spec.rb
+- spec/bitvec_sort_spec.rb
+- spec/bool_expr_spec.rb
+- spec/bool_sort_spec.rb
+- spec/expr_spec.rb
+- spec/int_expr_spec.rb
+- spec/int_sort_spec.rb
 - spec/integration/algebra_problems_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/four_hackers_puzzle_spec.rb
 - spec/integration/geometry_problem_spec.rb
 - spec/integration/kakuro_spec.rb
 - spec/integration/kinematics_problems_spec.rb
+- spec/integration/knights_puzzle_spec.rb
 - spec/integration/letter_connections_spec.rb
 - spec/integration/light_up_spec.rb
 - spec/integration/minisudoku_spec.rb
+- spec/integration/nonogram_spec.rb
 - spec/integration/selfref_spec.rb
 - spec/integration/sudoku_spec.rb
 - spec/integration/verbal_arithmetic_spec.rb
 - spec/model_spec.rb
+- spec/printer_spec.rb
+- spec/real_expr_spec.rb
+- spec/real_sort_spec.rb
 - spec/solver_spec.rb
 - spec/sort_spec.rb
 - spec/spec_helper.rb
-- spec/value_spec.rb
 - spec/z3_spec.rb
 homepage: https://github.com/taw/z3
 licenses: