Skip to content

Various changes and refactoring of ProductOfSets #1368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 25, 2021
Merged

Various changes and refactoring of ProductOfSets #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6cccc30
WIP: fix variety of bugs in ProductOfSets
odow May 23, 2021
3b7a777
Fix bugs in .num_rows
odow May 23, 2021
d46adf4
Various updates
odow May 24, 2021
0d18d1c
fix docs
odow May 24, 2021
b972f39
Fix tests
odow May 24, 2021
af78f28
Merge branch 'master' into od/product_of_sets
odow May 24, 2021
a799cf1
Use ordered num_rows
odow May 24, 2021
999b9eb
Fix formatting
odow May 24, 2021
b8d6c1d
Fix formatting bug
odow May 24, 2021
b38accd
Add more tests
odow May 24, 2021
04c4ea4
Update product_of_sets.jl
odow May 25, 2021
80abb20
Update product_of_sets.jl
odow May 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/src/submodules/Utilities/reference.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@ Utilities.rows
```@docs
Utilities.ProductOfSets
Utilities.MixOfScalarSets
Utilities.@mix_of_scalar_sets
Utilities.OrderedProductOfSets
Utilities.OrderedProductOfScalarSets
Utilities.@product_of_sets
```

## Fallbacks
Expand Down
7 changes: 7 additions & 0 deletions src/Utilities/matrix_of_constraints.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ The `.sets::ST` type must implement:
* [`MOI.Utilities.set_index`](@ref)
* [`MOI.Utilities.add_set`](@ref)
* [`MOI.Utilities.rows`](@ref)
* [`MOI.Utilities.final_touch`](@ref)
"""
mutable struct MatrixOfConstraints{T,AT,BT,ST} <: MOI.ModelLike
coefficients::AT
Expand Down Expand Up @@ -135,6 +136,11 @@ function load_terms end
final_touch(coefficients)::Nothing

Informs the `coefficients` that all functions have been added with `load_terms`.
No more modification is allowed unless `MOI.empty!` is called.

final_touch(sets)::Nothing

Informs the `sets` that all functions have been added with `add_set`.
No more modification is allowed unless `MOI.empty!` is called.
"""
function final_touch end
Expand Down Expand Up @@ -392,6 +398,7 @@ function pass_nonvariable_constraints(
end

function final_touch(model::MatrixOfConstraints, index_map)
final_touch(model.sets)
num_rows = MOI.dimension(model.sets)
resize!(model.constants, num_rows)
set_number_of_rows(model.coefficients, num_rows)
Expand Down
Loading