Skip to content

Commit 60cbf9f

Browse files
authored
[Bridges] change print_active_bridges to use types instead of runtime objects (#2128)
1 parent bece3e7 commit 60cbf9f

File tree

16 files changed

+296
-109
lines changed

16 files changed

+296
-109
lines changed

src/Bridges/Bridges.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ function _general_bridge_tests(bridge::B) where {B<:AbstractBridge}
360360
length(MOI.get(bridge, MOI.ListOfVariableIndices())) ==
361361
MOI.get(bridge, MOI.NumberOfVariables())
362362
)
363+
if MOI.get(bridge, MOI.NumberOfVariables()) > 0
364+
Test.@test !isempty(added_constrained_variable_types(B))
365+
end
363366
if B <: Objective.AbstractBridge
364367
Test.@test set_objective_function_type(B) <: MOI.AbstractFunction
365368
end

src/Bridges/Constraint/bridges/count_distinct_reif.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ end
129129
function MOI.Bridges.added_constrained_variable_types(
130130
::Type{<:ReifiedCountDistinctToMILPBridge},
131131
)
132-
return Tuple{Type}[(MOI.ZeroOne,)]
132+
return Tuple{Type}[(MOI.Reals,), (MOI.ZeroOne,)]
133133
end
134134

135135
function MOI.Bridges.added_constraint_types(

src/Bridges/Constraint/bridges/det.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ function MOI.supports_constraint(
144144
end
145145

146146
function MOI.Bridges.added_constrained_variable_types(::Type{<:LogDetBridge})
147-
return Tuple{Type}[]
147+
return Tuple{Type}[(MOI.Reals,)]
148148
end
149149

150150
function MOI.Bridges.added_constraint_types(
@@ -366,7 +366,7 @@ function MOI.supports_constraint(
366366
end
367367

368368
function MOI.Bridges.added_constrained_variable_types(::Type{<:RootDetBridge})
369-
return Tuple{Type}[]
369+
return Tuple{Type}[(MOI.Reals,)]
370370
end
371371

372372
function MOI.Bridges.added_constraint_types(

src/Bridges/Constraint/bridges/geomean.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ function MOI.supports_constraint(
173173
end
174174

175175
function MOI.Bridges.added_constrained_variable_types(::Type{<:GeoMeanBridge})
176-
return Tuple{Type}[]
176+
return Tuple{Type}[(MOI.Reals,)]
177177
end
178178

179179
function MOI.Bridges.added_constraint_types(

src/Bridges/Constraint/bridges/indicator_sos.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ end
9999
function MOI.Bridges.added_constrained_variable_types(
100100
::Type{<:IndicatorSOS1Bridge},
101101
)
102-
return Tuple{Type}[]
102+
return Tuple{Type}[(MOI.Reals,)]
103103
end
104104

105105
function MOI.Bridges.added_constraint_types(

src/Bridges/Constraint/bridges/norm_one.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function MOI.supports_constraint(
6060
end
6161

6262
function MOI.Bridges.added_constrained_variable_types(::Type{<:NormOneBridge})
63-
return Tuple{Type}[]
63+
return Tuple{Type}[(MOI.Reals,)]
6464
end
6565

6666
function MOI.Bridges.added_constraint_types(

src/Bridges/Constraint/bridges/norm_spec_nuc_to_psd.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ end
316316
function MOI.Bridges.added_constrained_variable_types(
317317
::Type{<:NormNuclearBridge},
318318
)
319-
return Tuple{Type}[]
319+
return Tuple{Type}[(MOI.Reals,)]
320320
end
321321

322322
function MOI.Bridges.added_constraint_types(

src/Bridges/Constraint/bridges/relentr_to_exp.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ end
7878
function MOI.Bridges.added_constrained_variable_types(
7979
::Type{<:RelativeEntropyBridge},
8080
)
81-
return Tuple{Type}[]
81+
return Tuple{Type}[(MOI.Reals,)]
8282
end
8383

8484
function MOI.Bridges.added_constraint_types(

src/Bridges/Constraint/bridges/table.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ end
8989
function MOI.Bridges.added_constrained_variable_types(
9090
::Type{<:TableToMILPBridge},
9191
)
92-
return Tuple{Type}[]
92+
return Tuple{Type}[(MOI.Reals,)]
9393
end
9494

9595
function MOI.Bridges.added_constraint_types(

src/Bridges/Objective/bridges/slack.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function supports_objective_function(
8888
end
8989

9090
function MOI.Bridges.added_constrained_variable_types(::Type{<:SlackBridge})
91-
return Tuple{Type}[]
91+
return Tuple{Type}[(MOI.Reals,)]
9292
end
9393

9494
function MOI.Bridges.added_constraint_types(

0 commit comments

Comments
 (0)