From 68b13bc9fbf8e77579268b7b0510abdfb975c492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Fri, 29 Mar 2019 11:34:53 +0100 Subject: [PATCH 1/2] Add missing sets for functionize bridges --- src/Bridges/Bridges.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bridges/Bridges.jl b/src/Bridges/Bridges.jl index e95284f73a..0a12484016 100644 --- a/src/Bridges/Bridges.jl +++ b/src/Bridges/Bridges.jl @@ -87,9 +87,9 @@ include("slackbridge.jl") (MOI.VectorAffineFunction, MOI.VectorQuadraticFunction) ) include("functionize_bridge.jl") -@bridge ScalarFunctionize ScalarFunctionizeBridge () (MOI.Interval, MOI.LessThan, MOI.GreaterThan) () () (MOI.SingleVariable,) () () () +@bridge ScalarFunctionize ScalarFunctionizeBridge () (MOI.EqualTo, MOI.Interval, MOI.LessThan, MOI.GreaterThan) () () (MOI.SingleVariable,) () () () @bridge(VectorFunctionize, VectorFunctionizeBridge, (), (), - (MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone, + (MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, MOI.PositiveSemidefiniteConeSquare, MOI.PositiveSemidefiniteConeTriangle, MOI.LogDetConeTriangle, MOI.RootDetConeTriangle), From 0863cb1dbb600a7b24950c4faf5db717b2321bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Fri, 29 Mar 2019 11:37:34 +0100 Subject: [PATCH 2/2] Add missing exponential cones --- src/Bridges/Bridges.jl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Bridges/Bridges.jl b/src/Bridges/Bridges.jl index 0a12484016..23a2287c3f 100644 --- a/src/Bridges/Bridges.jl +++ b/src/Bridges/Bridges.jl @@ -89,10 +89,11 @@ include("slackbridge.jl") include("functionize_bridge.jl") @bridge ScalarFunctionize ScalarFunctionizeBridge () (MOI.EqualTo, MOI.Interval, MOI.LessThan, MOI.GreaterThan) () () (MOI.SingleVariable,) () () () @bridge(VectorFunctionize, VectorFunctionizeBridge, (), (), - (MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, MOI.SecondOrderCone, - MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, - MOI.PositiveSemidefiniteConeSquare, MOI.PositiveSemidefiniteConeTriangle, MOI.LogDetConeTriangle, - MOI.RootDetConeTriangle), + (MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, + MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, + MOI.ExponentialCone, MOI.DualExponentialCone, + MOI.PositiveSemidefiniteConeSquare, MOI.PositiveSemidefiniteConeTriangle, MOI.LogDetConeTriangle, + MOI.RootDetConeTriangle), (MOI.PowerCone, MOI.DualPowerCone, MOI.SOS1, MOI.SOS2), (), (), (MOI.VectorOfVariables,), () )