Merge pull request #1 from fredo-dedup/fixzeroreg

fix signature of prox! for ZeroReg
lindahua · May 16, 2015 · 4635e1e · 4635e1e
2 parents adaa5fb + 51b6d01
commit 4635e1e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/regularizer.jl b/src/regularizer.jl
@@ -28,7 +28,7 @@ value{T<:Real}(::ZeroReg, θ::StridedArray{T}) = zero(T)
 value_and_addgrad!{T<:Real,N}(::ZeroReg, β::T, g::StridedArray{T,N}, α::T, θ::StridedArray{T,N}) =
     (zero(T), g)
 
-prox!{T<:Real}(r::StridedArray{T}, θ::StridedArray{T}, λ::Real) =
+prox!{T<:Real}(::ZeroReg, r::StridedArray{T}, θ::StridedArray{T}, λ::Real) =
     copy!(r, θ)