Fix undefined variable error in zero(Var), one(Var)

jump-dev · Jul 29, 2015 · 2a8eb15 · 2a8eb15
1 parent 463fed8
commit 2a8eb15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/JuMP.jl b/src/JuMP.jl
@@ -336,9 +336,9 @@ end
 getCategory(v::Variable) = v.m.colCat[v.col]
 
 Base.zero(::Type{Variable}) = AffExpr(Variable[],Float64[],0.0)
-Base.zero(::Variable) = zero(typeof(v))
+Base.zero(::Variable) = zero(Variable)
 Base.one(::Type{Variable}) = AffExpr(Variable[],Float64[],1.0)
-Base.one(::Variable) = one(typeof(v))
+Base.one(::Variable) = one(Variable)
 
 verify_ownership(m::Model, vec::Vector{Variable}) = all(v->isequal(v.m,m), vec)
 

diff --git a/test/variable.jl b/test/variable.jl
@@ -36,6 +36,8 @@ facts("[variable] constructors") do
     d = Dict()
     @defVar(mcon, d["bar"][1:10] == 1)
     @fact getValue(d["bar"][1]) --> 1
+    @fact typeof(zero(nobounds)) --> AffExpr
+    @fact typeof(one(nobounds)) --> AffExpr
 end
 
 facts("[variable] get and set bounds") do