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

merge https://github.com/pulsipher/DisjunctiveProgramming.jl/tree/str… #68

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
*.jl.*.cov
*.jl.cov
*.jl.mem
.DS_Store
/Manifest.toml
*.aux
*.bbl
*.blg
*.fdb_latexmk
*.fls
*.log
*.out
*.gz
/test/Manifest.toml
/dev/
/docs/build/
/docs/site/
/docs/src/examples/*/*.md
/docs/src/examples/*/*.png
/docs/Manifest.toml
.vscode/
14 changes: 7 additions & 7 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name = "DisjunctiveProgramming"
uuid = "0d27d021-0159-4c7d-b4a7-9ccb5d9366cf"
authors = ["hdavid16 <[email protected]>"]
version = "0.3.6"
version = "0.4.0"

[deps]
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]
JuMP = "1.2"
Suppressor = "0.2"
Symbolics = "4"
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"]
246 changes: 187 additions & 59 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
Loading