Skip to content

Commit

Permalink
fix: use Int64 for opensmt_mk_int_var
Browse files Browse the repository at this point in the history
soonhokong committed May 6, 2015
1 parent a28615c commit 1d340f6
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/expression.jl
Original file line number Diff line number Diff line change
@@ -10,11 +10,11 @@ end
Var(ctx::Context, T::Type{Float64}, name::ASCIIString, lb::Float64, ub::Float64) =
Ex{T}(opensmt_mk_real_var(ctx.ctx, name, lb, ub))
Var(ctx::Context, T::Type{Int64}, name::ASCIIString, lb::Int32, ub::Int32) =
Ex{T}(opensmt_mk_int_var(ctx.ctx, name, lb, ub))
Ex{T}(opensmt_mk_int_var(ctx.ctx, name, Int64(lb), Int64(ub)))
Var(ctx::Context, T::Type{Int64}, name::ASCIIString, lb::Int64, ub::Int64) =
@compat Ex{T}(opensmt_mk_int_var(ctx.ctx, name, Int32(lb), Int32(ub)))
@compat Ex{T}(opensmt_mk_int_var(ctx.ctx, name, lb, ub))
Var(ctx::Context, T::Type{Int64}, name::ASCIIString) =
Ex{T}(opensmt_mk_int_var(ctx.ctx, name, typemin(Cint), typemax(Cint)))
Ex{T}(opensmt_mk_int_var(ctx.ctx, name, typemin(Int64), typemax(Int64)))
Var(ctx::Context,T::Type{Bool}, name::ASCIIString) =
Ex{T}(opensmt_mk_bool_var(ctx.ctx, name))

@@ -24,4 +24,4 @@ Var(T, name::ASCIIString) = Var(global_context(), T, name)

## Printing
## ========
print(io::IO, e::Ex) = opensmt_print_expr(e.e)
print(io::IO, e::Ex) = opensmt_print_expr(e.e)
6 changes: 3 additions & 3 deletions src/wrap_capi.jl
Original file line number Diff line number Diff line change
@@ -102,9 +102,9 @@ opensmt_mk_real_var(ctx::opensmt_context, varname::ASCIIString, lb::Float64, ub:
ccall((:opensmt_mk_real_var, "libdreal"), Ptr{Void},
(Ptr{Void}, Ptr{UInt8}, Float64, Float64), ctx, varname, lb, ub)

opensmt_mk_int_var(ctx::opensmt_context, varname::ASCIIString, lb::Cint, ub::Cint) =
opensmt_mk_int_var(ctx::opensmt_context, varname::ASCIIString, lb::Int64, ub::Int64) =
ccall((:opensmt_mk_int_var, "libdreal"), Ptr{Void},
(Ptr{Void}, Ptr{UInt8}, Cint, Cint), ctx, varname, lb, ub)
(Ptr{Void}, Ptr{UInt8}, Int64, Int64), ctx, varname, lb, ub)

opensmt_mk_cost_var(ctx::opensmt_context, varname::Ptr{UInt8}) =
ccall((:opensmt_mk_cost_var, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{UInt8}), ctx, varname)
@@ -207,4 +207,4 @@ opensmt_mk_tanh(ctx::opensmt_context, e::opensmt_expr) =
ccall((:opensmt_mk_tanh, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{Void}), ctx, e)

opensmt_mk_atan2(ctx::opensmt_context, e::opensmt_expr) =
ccall((:opensmt_mk_atan2, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{Void}), ctx, e)
ccall((:opensmt_mk_atan2, "libdreal"), Ptr{Void}, (Ptr{Void}, Ptr{Void}), ctx, e)

0 comments on commit 1d340f6

Please sign in to comment.