z3 0.0.20161008 → 0.0.20161010

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f77923728739173352acc32c2b86d15d158df0aa
-  data.tar.gz: 6d14bf2597324dfaeb56fef62126466a80312b59
+  metadata.gz: 6cae47eadb8b6cb435ab68a3c1d5e64e7ab7ef10
+  data.tar.gz: 59e4479e128bad8ea7588b8de42ef9c6ad9af4e5
 SHA512:
-  metadata.gz: 5c298ac6d9809173f284ac05ae13e19a52cebd56cff557f36894a6b8e5168f68bcfee71e1652ae3848d7009a2572bcdc3663e858e66f808b8c8a112f8a1a25bf
-  data.tar.gz: cf216b75b22a6c172f06613972a8d1c0644efee56ea1462df24d040aa189b58558d594d84156ba1e3ebc3e23b24fc4371faa661f519aecd8e2fa0afe47c98da9
+  metadata.gz: 9e3a0cf9fff6457c318ad086e987029fad72a292080572ea0ddc204cf5c054881c95b515977456aed9a07bb57a86718d85c8ac03e4144c5379c7417a1c667696
+  data.tar.gz: 3bf40c2ff99cb57ef7b623415ddf50605bbdde75d524c05c40223ca38d81e3cd58d122d39a1b51dc490bc2575dde884823e24cd2fc06a8568d5ee42f4a4cb216

data/examples/algebra_problems

@@ -10,7 +10,7 @@ class AlgebraProblem
 
   def print_solution!(number)
     puts("Solution to problem %s:" % number)
-    if @solver.check() == :sat
+    if @solver.satisfiable?
       @solver.model.each do |n,v|
         puts "* #{n} = #{v}"
       end

data/examples/bridges

@@ -61,7 +61,7 @@ class Bridges
       end
     end
 
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_answer!
     else
@@ -82,8 +82,8 @@ class Bridges
 
     @data.each do |(x,y),v|
       if v == nil
-        u = @model[@vars[[x,y,"u"]]].to_s.to_i
-        l = @model[@vars[[x,y,"l"]]].to_s.to_i
+        u = @model[@vars[[x,y,"u"]]].to_i
+        l = @model[@vars[[x,y,"l"]]].to_i
         if u > 0
           picture[y*3+1][x*3+1] = " |\u2016"[u]
         elsif l > 0
@@ -97,10 +97,10 @@ class Bridges
     end
 
     @data.each do |(x,y),_|
-      u = @model[@vars[[x,y,"u"]]].to_s.to_i
-      d = @model[@vars[[x,y,"d"]]].to_s.to_i
-      l = @model[@vars[[x,y,"l"]]].to_s.to_i
-      r = @model[@vars[[x,y,"r"]]].to_s.to_i
+      u = @model[@vars[[x,y,"u"]]].to_i
+      d = @model[@vars[[x,y,"d"]]].to_i
+      l = @model[@vars[[x,y,"l"]]].to_i
+      r = @model[@vars[[x,y,"r"]]].to_i
 
       picture[y*3+1][x*3  ] = " -="[l]
       picture[y*3+1][x*3+2] = " -="[r]

data/examples/circuit_problems

@@ -71,7 +71,7 @@ class CircuitProblem
   private
 
   def with_solved_model
-    if @solver.check == :sat
+    if @solver.satisfiable?
       yield @solver.model
     else
       puts "Can't solve the problem"

data/examples/clogic_puzzle

@@ -85,13 +85,13 @@ class CLogicPuzzleSolver
 
     key = %W[iw hu fv lu dv cy og lc gy fq od lo fq is ig gu hs hi ds cy oo os iu fs gu lh dq lv gu iw hv gu di hs cy oc iw gc]
 
-    if solver.check == :sat
+    if solver.satisfiable?
       model = solver.model
       model_vars = {}
       model.each do |k,v|
         v = v.to_s.sub(/\A#x/, "").to_i(16)
         model_vars[k] = v
-        puts "#{k.to_s}=#{v.to_s}"
+        puts "#{k}=#{v}"
       end
       result = key.map do |ab|
         a,b = ab.chars

data/examples/four_hackers_puzzle

@@ -60,11 +60,11 @@ class LogicPuzzle
 
   def solve!
     add_assertions!
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @solver.model.each do |k,v|
         k = k.to_s.gsub("|", "")
         i, name = k.split("-", 2)
-        puts "#{k} = #{@dict[name][v.to_s.to_i]}"
+        puts "#{k} = #{@dict[name][v.to_i]}"
       end
     else
       puts "Puzzle has no solutions"

data/examples/geometry_problem

@@ -30,7 +30,7 @@ solver.assert(b_d == 20)
 
 solver.assert(a_c**2 == (ax-cx)**2 + (ay-cy)**2)
 
-if solver.check == :sat
+if solver.satisfiable?
   model = solver.model
   model.each do |n,v|
     puts "* #{n} = #{v}"

data/examples/kakuro

@@ -38,7 +38,7 @@ class Kakuro
       end
     end
 
-    if @solver.check() == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_board!
     else
@@ -58,7 +58,7 @@ class Kakuro
         cell = @data[[x,y]]
         if cell == nil
           if @model and @cells.has_key?([x,y])
-            a = @model[@cells[[x,y]]].to_s
+            a = @model[@cells[[x,y]]]
             print(" [#{a}] ")
           else
             print("  _  ")

data/examples/kinematics_problems

@@ -16,7 +16,7 @@ class KinematicsProblem
 
   def print_solution!(number)
     puts("Solution to problem %s:" % number)
-    if @solver.check() == :sat
+    if @solver.satisfiable?
       @solver.model.each do |n,v|
         puts "* #{n} = #{v}"
       end

data/examples/knights_puzzle

@@ -29,18 +29,18 @@ class KnightsPuzzle
 
   def print_board(t)
     puts "State #{t}:"
-    puts @boards[t].transpose.map{|row| row.map{|c| ".wbx"[@model[c].to_s.to_i]}.join }.join("\n")
+    puts @boards[t].transpose.map{|row| row.map{|c| ".wbx"[@model[c].to_i]}.join }.join("\n")
   end
 
   def print_move(t)
-    move = Hash[@moves[t].map{|k,v| [k,@model[v].to_s.to_i]}]
+    move = Hash[@moves[t].map{|k,v| [k,@model[v].to_i]}]
     figure = " wbx"[move[:figure]]
     puts "#{figure}: #{move[:start_x]},#{move[:start_y]} -> #{move[:end_x]},#{move[:end_y]}"
     puts ""
   end
 
   def solve!
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       puts "Solved"
       @num_moves.times do |t|

data/examples/letter_connections

@@ -116,7 +116,7 @@ class LetterConnections
         )
       end
     end
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_answer!
     else
@@ -170,9 +170,9 @@ class LetterConnections
   def print_answer!
     (0...@ysize).each do |y|
       (0...@xsize).each do |x|
-        li = @model[@line[[x,y]]].to_s.to_i
+        li = @model[@line[[x,y]]].to_i
         l = @rletters[li]
-        d = @model[@dir[[x,y]]].to_s.to_i
+        d = @model[@dir[[x,y]]].to_i
         if [x,y] == @starts[l]
           print("\u2190\u2191\u2192\u2193"[d]+l+" ")
         elsif [x,y] == @ends[l]

data/examples/light_up

@@ -39,7 +39,7 @@ class LightUp
       end
     end
 
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_answer!
     else
@@ -76,7 +76,7 @@ class LightUp
       (0...@xsize).each do |x|
         if @data[[x,y]] != "."
           print(@data[[x,y]])
-        elsif @model[@lamps[[x,y]]].to_s == "1"
+        elsif @model[@lamps[[x,y]]].to_i == 1
           print("*")
         else
           print(" ")

data/examples/minisudoku

@@ -32,7 +32,7 @@ class MiniSudokuSolver
       end
     end
 
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_answer!
     else

data/examples/nonogram

@@ -15,7 +15,7 @@ class Nonogram
     @ysize.times do |y|
       @xsize.times do |x|
         v = @model[@cells[y][x]]
-        if v.to_s == "true"
+        if v.to_b
           print "\u2588"
         else
           print "\u00b7"
@@ -26,7 +26,7 @@ class Nonogram
   end
 
   def print_all_answers!
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_answer!
       current_solution = []
@@ -36,7 +36,7 @@ class Nonogram
       #   current_solution << (@model[var] != val)
       # end
       # @solver.assert Z3.Or(*current_solution)
-      # if @solver.check == :sat
+      # if @solver.satisfiable?
       #   puts "solution is not unique"
       #   print_answer!
       # else

data/examples/selfref

@@ -192,10 +192,10 @@ class SelfRefPuzzleSolver
     assert q[20] == 5
 
     # Print solutions
-    if @solver.check == :sat
+    if @solver.satisfiable?
       model = @solver.model
       (1..20).each do |i|
-        a = model[q[i]].to_s.to_i
+        a = model[q[i]].to_i
         puts "Q%2d: %s" % [i, " ABCDE"[a]]
       end
     else

data/examples/sudoku

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-
 require "pathname"
 require_relative "../lib/z3"
 
@@ -33,7 +32,7 @@ class SudokuSolver
       end
     end
 
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_answer!
     else

data/examples/verbal_arithmetic

@@ -23,7 +23,7 @@ class VerbalArithmetic
     @solver.assert word_value(@a) + word_value(@b) == word_value(@c)
     @solver.assert Z3.Distinct(*@vars.values)
 
-    if @solver.check == :sat
+    if @solver.satisfiable?
       @model = @solver.model
       print_answer!
     else
@@ -39,7 +39,7 @@ class VerbalArithmetic
 
   def print_answer!
     [@a,@b,@c].each do |word|
-      p word.map{|v| [v.to_s, @model[v].to_s.to_i]}
+      p word.map{|v| [v.to_s, @model[v].to_i]}
     end
   end
 end

data/lib/z3/expr/bool_expr.rb

@@ -28,6 +28,21 @@ module Z3
       BoolExpr.IfThenElse(self, a, b)
     end
 
+    def to_b
+      s = to_s
+      if ast_kind == :app and (s == "true" or s == "false")
+        s == "true"
+      else
+        obj = simplify
+        s = obj.to_s
+        if ast_kind == :app and (s == "true" or s == "false")
+          s == "true"
+        else
+          raise Z3::Exception, "Can't convert expression #{to_s} to Boolean"
+        end
+      end
+    end
+
     public_class_method :new
 
     class << self

data/lib/z3/expr/int_expr.rb

@@ -8,6 +8,19 @@ module Z3
       IntExpr.Rem(self, other)
     end
 
+    def to_i
+      if ast_kind == :numeral
+        LowLevel.get_numeral_string(self).to_i
+      else
+        obj = simplify
+        if obj.ast_kind == :numeral
+          LowLevel.get_numeral_string(obj).to_i
+        else
+          raise Z3::Exception, "Can't convert expression #{to_s} to Integer"
+        end
+      end
+    end
+
     public_class_method :new
     class << self
       def coerce_to_same_int_sort(*args)

data/lib/z3/solver.rb

@@ -4,32 +4,50 @@ module Z3
     def initialize
       @_solver = LowLevel.mk_solver
       LowLevel.solver_inc_ref(self)
+      reset_model!
     end
 
     def push
+      reset_model!
       LowLevel.solver_push(self)
     end
 
     def pop(n=1)
+      reset_model!
       LowLevel.solver_pop(self, n)
     end
 
     def reset
+      reset_model!
       LowLevel.solver_reset(self)
     end
 
     def assert(ast)
+      reset_model!
       LowLevel.solver_assert(self, ast)
     end
 
     def check
-      check_sat_results(LowLevel.solver_check(self))
+      reset_model!
+      result = check_sat_results(LowLevel.solver_check(self))
+      @has_model = true if result == :sat
+      result
+    end
+
+    def satisfiable?
+      check == :sat
+    end
+
+    def unsatisfiable?
+      check == :unsat
     end
 
     def model
-      Z3::Model.new(
-        LowLevel.solver_get_model(self)
-      )
+      if @has_model
+        @model ||= Z3::Model.new(LowLevel.solver_get_model(self))
+      else
+        raise Z3::Exception, "You need to check that it's satisfiable before asking for the model"
+      end
     end
 
     def assertions
@@ -43,6 +61,7 @@ module Z3
     end
 
     def prove!(ast)
+      @has_model = false
       push
       assert(~ast)
       case check
@@ -64,6 +83,11 @@ module Z3
 
     private
 
+    def reset_model!
+      @has_model = false
+      @model = nil
+    end
+
     def check_sat_results(r)
       {
         -1 => :unsat,

data/spec/bool_expr_spec.rb

@@ -57,11 +57,18 @@ module Z3
     it "~" do
       expect([a ==  true, b == ~a]).to have_solution(b => false)
       expect([a == false, b == ~a]).to have_solution(b =>  true)
-     end
+    end
+
+    it "if then else" do
+      expect([a ==  true, x == a.ite(2, 3)]).to have_solution(x => 2)
+      expect([a == false, x == a.ite(2, 3)]).to have_solution(x => 3)
+    end
 
-     it "if then else" do
-       expect([a ==  true, x == a.ite(2, 3)]).to have_solution(x => 2)
-       expect([a == false, x == a.ite(2, 3)]).to have_solution(x => 3)
-     end
+    it "to_b" do
+      expect{Z3.Bool("a").to_b}.to raise_error(Z3::Exception)
+      expect(Z3.Const(true).to_b).to eq(true)
+      expect(Z3.Const(false).to_b).to eq(false)
+      expect((Z3.Const(true) & Z3.Const(false)).to_b).to eq(false)
+    end
   end
 end

data/spec/int_expr_spec.rb

@@ -87,5 +87,11 @@ module Z3
       expect((a+b).inspect).to eq("Int<5 + 3>")
       expect((a+b).simplify.inspect).to eq("Int<8>")
     end
+
+    it "to_i" do
+      expect{Z3.Int("a").to_i}.to raise_error(Z3::Exception)
+      expect(Z3.Const(2).to_i).to eq(2)
+      expect((Z3.Const(2) + Z3.Const(40)).to_i).to eq(42)
+    end
   end
 end

data/spec/model_spec.rb

@@ -10,7 +10,7 @@ module Z3
     it "knows how many variables are in the model" do
       solver.assert(a == 2)
       solver.assert(b == a+2)
-      expect(solver.check).to eq(:sat)
+      expect(solver).to be_satisfiable
       expect(model.num_consts).to eq(2)
       expect(model.num_funcs).to eq(0)
       expect(model.num_sorts).to eq(0)
@@ -19,7 +19,7 @@ module Z3
     it "can evaluate variables" do
       solver.assert(a == 2)
       solver.assert(b == a+2)
-      expect(solver.check).to eq(:sat)
+      expect(solver).to be_satisfiable
       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)
@@ -31,14 +31,14 @@ module Z3
     it "#to_a" do
       solver.assert(a == 2)
       solver.assert(b == a+2)
-      expect(solver.check).to eq(:sat)
+      expect(solver).to be_satisfiable
       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
       solver.assert(a == 2)
       solver.assert(b == a+2)
-      expect(solver.check).to eq(:sat)
+      expect(solver).to be_satisfiable
       expect(model.to_s).to eq("Z3::Model<a=2, b=4>")
       expect(model.inspect).to eq("Z3::Model<a=2, b=4>")
     end

data/spec/solver_spec.rb

@@ -7,18 +7,18 @@ module Z3
 
     it "basic functionality" do
       solver.assert(a == b)
-      expect(solver.check).to eq(:sat)
+      expect(solver).to be_satisfiable
       solver.assert(a != b)
-      expect(solver.check).to eq(:unsat)
+      expect(solver).to be_unsatisfiable
     end
 
     it "push/pop" do
       solver.assert(a == b)
       solver.push
       solver.assert(a != b)
-      expect(solver.check).to eq(:unsat)
+      expect(solver).to be_unsatisfiable
       solver.pop
-      expect(solver.check).to eq(:sat)
+      expect(solver).to be_satisfiable
     end
 
     it "#assertions" do

data/spec/spec_helper.rb

@@ -74,12 +74,12 @@ end
 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}
+    solver.satisfiable? and expected.all?{|var,val| solver.model[var].to_s == val.to_s}
   end
 
   failure_message do |asts|
     solver = setup_solver(asts)
-    if solver.check == :sat
+    if solver.satisfiable?
       "expected #{asts.inspect} to have solution #{expected.inspect}, instead got #{solver.model}"
     else
       "expected #{asts.inspect} to have solution #{expected.inspect}, instead not solvable"
@@ -112,7 +112,7 @@ RSpec::Matchers.define :have_solutions do |expected|
     vars = vars[0]
     solver = setup_solver(asts)
     solutions = []
-    while solver.check == :sat
+    while solver.satisfiable?
       model = solver.model
       solution = Hash[vars.map{|v| [v, model.model_eval(v, true)] }]
       solutions << solution

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z3
 version: !ruby/object:Gem::Version
-  version: 0.0.20161008
+  version: 0.0.20161010
 platform: ruby
 authors:
 - Tomasz Wegrzanowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -118,6 +118,7 @@ files:
 - lib/z3/ast.rb
 - lib/z3/context.rb
 - lib/z3/exception.rb
+- lib/z3/expr/.DS_Store
 - lib/z3/expr/arith_expr.rb
 - lib/z3/expr/array_expr.rb
 - lib/z3/expr/bitvec_expr.rb
@@ -137,6 +138,7 @@ files:
 - lib/z3/printer.rb
 - lib/z3/probe.rb
 - lib/z3/solver.rb
+- lib/z3/sort/.DS_Store
 - lib/z3/sort/array_sort.rb
 - lib/z3/sort/bitvec_sort.rb
 - lib/z3/sort/bool_sort.rb
@@ -149,6 +151,7 @@ files:
 - lib/z3/tactic.rb
 - lib/z3/very_low_level.rb
 - lib/z3/very_low_level_auto.rb
+- spec/.DS_Store
 - spec/array_expr_spec.rb
 - spec/array_sort_spec.rb
 - spec/bitvec_expr_spec.rb