fixed mistake

JuliaFirstOrder · Dec 2, 2018 · e7479b3 · e7479b3
1 parent 8ab41c3
commit e7479b3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/functions/cubeNormL2.jl b/src/functions/cubeNormL2.jl
@@ -40,12 +40,12 @@ end
 
 function prox!(y::AbstractArray{T}, f::CubeNormL2{R}, x::AbstractArray{T}, gamma::R=one(R)) where {R, T <: RealOrComplex{R}}
     norm_x = norm(x)
-    scale = 2 / (1 + sqrt(1 + 12 * f.lambda * norm_x))
+    scale = 2 / (1 + sqrt(1 + 12 * gamma * f.lambda * norm_x))
     y .= scale .* x
     return f.lambda * (scale * norm_x)^3
 end
 
 function prox_naive(f::CubeNormL2{R}, x::AbstractArray{T}, gamma=one(R)) where {R, T <: RealOrComplex{R}}
-  y = 2 / (1 + sqrt(1 + 12 * f.lambda * norm(x))) * x
+  y = 2 / (1 + sqrt(1 + 12 * gamma * f.lambda * norm(x))) * x
   return y, f.lambda * norm(y)^3
 end
diff --git a/test/test_cubeNormL2.jl b/test/test_cubeNormL2.jl
@@ -17,7 +17,7 @@ for R in [Float16, Float32, Float64]
             gamma = R(0.5)+rand(R)
             y, f_y = prox_test(f, x, gamma)
             grad_f_y, f_y = gradient(f, y)
-            @test grad_f_y ≈ x - y
+            @test grad_f_y ≈ (x - y)/gamma
         end
     end
 end