Skip to content

Commit 151abec

Browse files
committed
_copy_variable function added.
VariableRef changed to AbstractVariableRef.
1 parent 2010800 commit 151abec

2 files changed

Lines changed: 15 additions & 18 deletions

File tree

test/constraints/mbm.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,7 @@ function test_reformulate_disjunction()
148148
@constraint(model, lessthan, x <= 2, Disjunct(Y[1]))
149149
@constraint(model, greaterthan, x >= 1, Disjunct(Y[1]))
150150
@constraint(model, interval, 0 <= x <= 55, Disjunct(Y[2]))
151-
152151
disj = disjunction(model, [Y[1], Y[2]])
153-
154152
ref_cons = reformulate_disjunction(model, constraint_object(disj), MBM(HiGHS.Optimizer))
155153
@test ref_cons[1].func == JuMP.@expression(model, x - 53 * binary_variable(Y[2])) && ref_cons[1].set == MOI.LessThan(2.0)
156154
@test ref_cons[2].func == JuMP.@expression(model, x + 53 * binary_variable(Y[2])) && ref_cons[2].set == MOI.GreaterThan(1.0)

test/runtests.jl

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
import DisjunctiveProgramming as DP
22
using DisjunctiveProgramming
33
using Test
4-
using Revise
54
include("utilities.jl")
65

76
# RUN ALL THE TESTS
8-
# include("aqua.jl")
9-
# include("model.jl")
10-
# include("jump.jl")
11-
# include("variables/query.jl")
12-
# include("variables/logical.jl")
13-
# include("constraints/selector.jl")
14-
# include("constraints/proposition.jl")
15-
# include("constraints/disjunct.jl")
16-
# include("constraints/indicator.jl")
17-
# include("constraints/bigm.jl")
18-
# include("constraints/hull.jl")
19-
# include("constraints/fallback.jl")
20-
# include("constraints/disjunction.jl")
21-
# include("print.jl")
22-
# include("solve.jl")
7+
include("aqua.jl")
8+
include("model.jl")
9+
include("jump.jl")
10+
include("variables/query.jl")
11+
include("variables/logical.jl")
12+
include("constraints/selector.jl")
13+
include("constraints/proposition.jl")
14+
include("constraints/disjunct.jl")
15+
include("constraints/indicator.jl")
16+
include("constraints/bigm.jl")
17+
include("constraints/hull.jl")
18+
include("constraints/fallback.jl")
19+
include("constraints/disjunction.jl")
20+
include("print.jl")
21+
include("solve.jl")
2322
include("constraints/mbm.jl")

0 commit comments

Comments
 (0)