Skip to content

Commit 7aaa3c8

Browse files
committed
Merge branch 'master' into abstract-model
2 parents 0768056 + 08878e3 commit 7aaa3c8

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1111
JuMP = "1.16"
1212
Reexport = "1"
1313
julia = "1.6"
14+
Aqua = "0.8"
1415

1516
[extras]
1617
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Two types of logical constraints are supported:
7070
- `` or `logical_or` or `||` (OR, typed with `\vee + tab`).
7171
- `` or `logical_and` or `&&` (AND, typed with `\wedge + tab`).
7272
- `¬` or `logical_not` (NOT, typed with `\neg + tab`).
73-
- `` of `implies` (Implication, typed with `\Longrightarrow + tab`).
73+
- `` or `implies` (Implication, typed with `\Longrightarrow + tab`).
7474
- `` or `iff` or `==` (double implication or equivalence, typed with `\Leftrightarrow + tab`).
7575

7676
The `@constraint` JuMP macro is used to create these constraints using `:=`:

src/reformulate.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
# REFORMULATE
33
################################################################################
44
"""
5-
reformulate_model(model::JuMP.AbstractModel, method::AbstractSolutionMethod)::Nothing
5+
reformulate_model(model::JuMP.AbstractModel, method::AbstractSolutionMethod = BigM())
66
77
Reformulate a `GDPModel` using the specified `method`. Prior to reformulation,
88
all previous reformulation variables and constraints are deleted.
99
"""
10-
function reformulate_model(model::JuMP.AbstractModel, method::AbstractSolutionMethod)
10+
function reformulate_model(model::JuMP.AbstractModel, method::AbstractSolutionMethod = BigM())
1111
#clear all previous reformulations
1212
_clear_reformulations(model)
1313
#reformulate

test/aqua.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Aqua
22
using DisjunctiveProgramming
33

4-
Aqua.test_all(DisjunctiveProgramming, ambiguities = false)
4+
Aqua.test_all(DisjunctiveProgramming, deps_compat = false, ambiguities = false)
5+
Aqua.test_deps_compat(DisjunctiveProgramming, check_extras = (ignore=[:Test, :HiGHS],))
56
Aqua.test_ambiguities(DisjunctiveProgramming)

0 commit comments

Comments
 (0)