match neg(x) docs definition (#277)

jump-dev · Mar 22, 2019 · 7f11002 · 7f11002
1 parent 3fb5415
commit 7f11002
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/atoms/lp_cone/min.jl b/src/atoms/lp_cone/min.jl
@@ -78,4 +78,4 @@ end
 min(x::AbstractExpr, y::AbstractExpr) = MinAtom(x, y)
 min(x::AbstractExpr, y::Value) = min(x, Constant(y))
 min(x::Value, y::AbstractExpr) = min(Constant(x), y)
-neg(x::AbstractExpr) = min(x, Constant(0, Negative()))
+neg(x::AbstractExpr) = max(-x, Constant(0, Positive()))
diff --git a/test/test_lp.jl b/test/test_lp.jl
@@ -88,11 +88,11 @@
 
     @testset "neg atom" begin
         x = Variable(3)
-        p = minimize(1, [x >= -2, x <= -2, neg(x) >= -3])
+        p = minimize(1, [x >= -2, x <= -2, neg(x) <= 3])
         @test vexity(p) == ConvexVexity()
         solve!(p, solver)
         @test p.optval ≈ 1 atol=TOL
-        @test evaluate(sum(neg(x))) ≈ -6 atol=TOL
+        @test evaluate(sum(neg(x))) ≈ 6 atol=TOL
     end
 
     @testset "sumlargest atom" begin