Skip to content
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.

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

structure_overall PR 43 #2

Closed
wants to merge 73 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
cee5c22
Reformulate nonlinear constraints correctly for CHR
Mar 9, 2022
01afcae
Create linear_constraint_tests.jl
Apr 21, 2022
b60b7eb
Merge branch 'master' of https://github.com/shivankj11/DisjunctivePro…
Apr 21, 2022
e0cc38f
Revert "Merge branch 'master' of https://github.com/shivankj11/Disjun…
Apr 21, 2022
c1256dd
Update linear_constraint_tests.jl
shivankj11 Apr 21, 2022
a1bfc45
Merge branch 'hdavid16:master' into master
shivankj11 May 3, 2022
31e9dbc
Merge branch 'hdavid16:master' into master
shivankj11 May 8, 2022
fcf3844
Merge branch 'hdavid16:master' into master
shivankj11 May 15, 2022
cbe4c33
Use more restrictive JuMP compat bounds
odow Jun 24, 2022
191593c
Merge pull request #48 from odow/patch-1
hdavid16 Jul 29, 2022
d42d32c
Add files via upload
hdavid16 Aug 24, 2022
f3f3ec4
Update README.md
hdavid16 Aug 24, 2022
a118804
Add files via upload
hdavid16 Aug 24, 2022
1693ad4
allow naming CP-type logic constraints
hdavid16 Sep 10, 2022
b07a814
update to new JuMP Nonlinear API
hdavid16 Sep 10, 2022
ea2dc0c
remove old commented lines
hdavid16 Sep 10, 2022
3c6b643
update named reformulated nl constraint
hdavid16 Sep 10, 2022
6e7b55c
up example
hdavid16 Sep 10, 2022
e35b79f
bug fixes & clean
hdavid16 Sep 10, 2022
dcab5d6
Merge pull request #50 from hdavid16/nonlinear
hdavid16 Sep 10, 2022
5f19e5a
Update Project.toml
hdavid16 Sep 10, 2022
ed22679
update julia compat
hdavid16 Sep 10, 2022
2460400
clean up @disjunction
hdavid16 Sep 11, 2022
2502562
close #24
hdavid16 Sep 11, 2022
7a8aebf
compact add_disjunction!
hdavid16 Sep 11, 2022
a5c6d6e
use .ext dictionary to store object dict
hdavid16 Sep 12, 2022
88867e4
-store constraints in a disjunctions in m.ext
hdavid16 Sep 12, 2022
521a8b6
Merge pull request #52 from hdavid16:ext_dict
hdavid16 Sep 12, 2022
21df5c2
update docstring
hdavid16 Sep 12, 2022
e11566a
bug fix
hdavid16 Sep 12, 2022
06f0f07
indicator vars can't be used on more than 1 disj
hdavid16 Sep 12, 2022
ce0be3c
close #53
hdavid16 Sep 13, 2022
305ab91
up version
hdavid16 Sep 13, 2022
7ebd400
Merge branch 'master' of https://github.com/hdavid16/DisjunctiveProgr…
hdavid16 Sep 13, 2022
d074ecf
split nonlinearconstraint without parsing to Expr
hdavid16 Sep 13, 2022
2e9f250
clean
hdavid16 Sep 13, 2022
02b6fa3
close #55
hdavid16 Sep 13, 2022
a8cc06c
add Suppressor as dep
hdavid16 Sep 28, 2022
d390986
JuliaCon 2022 Paper
hdavid16 Oct 10, 2022
9281683
minor change
hdavid16 Oct 10, 2022
09639c9
update xor
hdavid16 Oct 10, 2022
7e404e9
clarify CP text
hdavid16 Oct 10, 2022
e1c8a5a
add note to CNF conversion
hdavid16 Oct 11, 2022
6065033
bug fixes:
hdavid16 Oct 11, 2022
2348017
bug fix when disjunct has single ConstraintRef
hdavid16 Oct 11, 2022
6a858da
up version
hdavid16 Oct 11, 2022
d5937eb
fix bugs to make more robust
hdavid16 Oct 12, 2022
87592d4
fix bug when only positive BigM is passed by user (make it negative)
hdavid16 Oct 12, 2022
29faaf2
bug fix
hdavid16 Oct 12, 2022
896293e
fix bug: don't disaggregate boolean variables and disaggregated vars …
hdavid16 Oct 13, 2022
8fc934f
update version in paper
hdavid16 Oct 13, 2022
5a03217
reduce allocaitons
hdavid16 Nov 4, 2022
a7bf324
attempt to improve speed using by storing disaggregated vars in a Set…
hdavid16 Nov 4, 2022
2592c94
avoid stackoverflow error for large disjunctions
hdavid16 Nov 4, 2022
1b1b49e
update version
hdavid16 Nov 4, 2022
591d71c
reduce allocations:
hdavid16 Nov 9, 2022
afd934a
Reference updates
shivankj11 Dec 23, 2022
3c0bd3e
Merge branch 'master' of https://github.com/shivankj11/DisjunctivePro…
shivankj11 Dec 23, 2022
919c05b
Delete linear_constraint_tests.jl
hdavid16 Dec 24, 2022
5097695
Merge pull request #61 from shivankj11/master
hdavid16 Dec 24, 2022
bc193fb
update docstring and kwarg types
hdavid16 Dec 31, 2022
f1be88a
single disjunct constraints are allowed
hdavid16 Jan 3, 2023
e1bfb33
speed up by using filter! and disag. vars. Dict
hdavid16 Jan 5, 2023
7b49496
check that disjunction is not empty
hdavid16 Jan 5, 2023
e56e480
clean up
hdavid16 Jan 5, 2023
694eb85
up version
hdavid16 Jan 5, 2023
098c8d3
update notation: constraint added, not replaced
hdavid16 Jan 10, 2023
4d0f337
fix bug in how m.ext is updated
hdavid16 Jan 10, 2023
7c1bf50
return new NL constraints; change name split func
hdavid16 Jan 10, 2023
ee34be8
track nested perspective functions to avoid issues
hdavid16 Jan 10, 2023
b11f39c
fix Interval arithmetic can't be applied to quadratic constraints to …
hdavid16 Jan 21, 2023
5b1554e
fix #63
hdavid16 May 12, 2023
f91885c
merge https://github.com/pulsipher/DisjunctiveProgramming.jl/tree/str…
hdavid16 Oct 11, 2023
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
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
*.jl.*.cov
*.jl.cov
*.jl.mem
.DS_Store
/Manifest.toml
/test/Manifest.toml
/dev/
/docs/build/
/docs/site/
/docs/src/examples/*/*.md
/docs/src/examples/*/*.png
/docs/Manifest.toml
.vscode/
18 changes: 8 additions & 10 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
name = "DisjunctiveProgramming"
uuid = "0d27d021-0159-4c7d-b4a7-9ccb5d9366cf"
authors = ["hdavid16 <[email protected]>"]
version = "0.3.0"
version = "0.4.0"

[deps]
IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[compat]
IntervalArithmetic = "0.20"
JuMP = "1"
Suppressor = "0.2"
Symbolics = "4"
julia = "1"
JuMP = "1.15"
Reexport = "0.2, 1"
julia = "1.6"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Test"]
test = ["Aqua", "HiGHS", "Test"]
244 changes: 187 additions & 57 deletions README.md

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions docs/.gitignore

This file was deleted.

260 changes: 0 additions & 260 deletions docs/build/assets/documenter.js

This file was deleted.

Loading