Fix trilinear case 5b

PSORLab · Nov 7, 2020 · 3c6b022 · 3c6b022 · mewilhel · Nov 10, 2020
1 parent 6f14455
commit 3c6b022
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/forward_operators/trilinear.jl b/src/forward_operators/trilinear.jl
@@ -553,16 +553,16 @@ function trilinear_case_5(x::MC{N,T}, y::MC{N,T}, z::MC{N,T}, q::Interval{Float6
 
    else
 
-       delY = zU - zL
+       delY = yU - yL
        θcc1 = xyzLLL - xyzLUU - xyzULL + xyzULU
        θcc2 = xyzLUL - xyzULL - xyzLUU + xyzUUU
 
        cc_b1 = -2.0*xyzLLU
        cc_b2 = -2.0*xyzUUL
        cc_b3 = -(xyzLLL + xyzLUL)
        cc_b4 = -(xyzULU + xyzUUU)
-       cc_b5 = θcc1*zU/delY - xyzLLL - xyzULU + xyzLUU
-       cc_b6 = -θcc2*zL/delY - xyzLUL - xyzUUU + xyzULL
+       cc_b5 = θcc1*yU/delY - xyzLLL - xyzULU + xyzLUU
+       cc_b6 = -θcc2*yL/delY - xyzLUL - xyzUUU + xyzULL
 
        cc_ax1, cc_ax2, cc_ax3, cc_ax4, cc_ax5, cc_ax6 = yzLU, yzUL, yzLL, yzUU, yzLL, yzUU
        cc_ay1, cc_ay2, cc_ay3, cc_ay4, cc_ay5, cc_ay6 = xzLU, xzUL, xzLL, xzUU, -θcc1/delY, θcc2/delY

diff --git a/test/forward_mccormick.jl b/test/forward_mccormick.jl
@@ -2075,8 +2075,8 @@ end
    q5bv = (x[9]*y[9])*z[9]
    #@test isapprox(q5b.cv, 0.0, atol = 1E-3)
    #@test isapprox(q5b.cc, 0.0, atol = 1E-3)
-   @show q5b
-   @show q5bv
+   #@show q5b
+   #@show q5bv
 
    # TODO: SWITCHED RELAXATIONS
    q6 = trilinear(x[10], y[10], z[10])