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

[WIP] Coramin #3174

Draft
wants to merge 153 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
3121fa1
moving coramin to contrib
michaelbynum Oct 27, 2023
6bf34d5
update imports
michaelbynum Oct 27, 2023
3e8b60f
update imports
michaelbynum Oct 27, 2023
0406fe2
update imports
michaelbynum Oct 27, 2023
4f81ae9
update tests
michaelbynum Oct 27, 2023
0c857d0
fix tests
michaelbynum Oct 27, 2023
2755bac
update tests
michaelbynum Oct 27, 2023
255bc45
run black
michaelbynum Oct 27, 2023
35ac7d4
fix typos
michaelbynum Oct 27, 2023
a54bceb
fix typos
michaelbynum Oct 27, 2023
ccbc0b9
fix typos
michaelbynum Oct 27, 2023
4d97757
fix typos
michaelbynum Oct 27, 2023
8d1e68e
working on simplification contrib package
michaelbynum Nov 8, 2023
8015d7e
working on simplification contrib package
michaelbynum Nov 8, 2023
56e8ac8
working on ginac interface for simplification
michaelbynum Nov 20, 2023
932d3d6
ginac interface improvements
michaelbynum Nov 20, 2023
208a5da
simplification interface
michaelbynum Nov 20, 2023
6ef8914
bugs
michaelbynum Nov 21, 2023
af47ef7
simplification tests
michaelbynum Nov 21, 2023
7262885
Merge branch 'main' into coramin
michaelbynum Dec 7, 2023
a6f0e2a
coramin improvements
michaelbynum Dec 22, 2023
52b6ad3
clean up diving heuristic
michaelbynum Dec 23, 2023
cb09908
revert changes to interval.py
michaelbynum Dec 26, 2023
205811e
working on branch and bound
michaelbynum Dec 26, 2023
2e205a5
working on branch and bound
michaelbynum Dec 26, 2023
9e62469
working on branch and bound
michaelbynum Dec 26, 2023
c803f56
branch and bound improvements
michaelbynum Dec 28, 2023
5840de0
BnB improvements
michaelbynum Jan 9, 2024
475ec06
simplification tests
michaelbynum Jan 10, 2024
491db9f
update GHA to install ginac
michaelbynum Jan 10, 2024
b3a1ff9
run black
michaelbynum Jan 10, 2024
de8743a
syntax
michaelbynum Jan 10, 2024
ee9f830
install ginac in GHA
michaelbynum Jan 10, 2024
36cfd63
install ginac in GHA
michaelbynum Jan 10, 2024
8269539
install ginac in GHA
michaelbynum Jan 10, 2024
7bb0ff5
install ginac in GHA
michaelbynum Jan 10, 2024
546dad1
install ginac in GHA
michaelbynum Jan 10, 2024
37a955b
install ginac in GHA
michaelbynum Jan 10, 2024
05134ce
install ginac in GHA
michaelbynum Jan 10, 2024
1151927
install ginac in GHA
michaelbynum Jan 11, 2024
2c4fdbe
skip tests when dependencies are not available
michaelbynum Jan 11, 2024
9ebd79b
install ginac in GHA
michaelbynum Jan 11, 2024
0bd1563
update simplification tests
michaelbynum Jan 11, 2024
26007ac
run black
michaelbynum Jan 11, 2024
fc36411
add pytest marker for simplification
michaelbynum Jan 11, 2024
2007de4
Merge branch 'main' into ginac
michaelbynum Jan 11, 2024
5ba03e2
update GHA
michaelbynum Jan 11, 2024
90cdeba
update GHA
michaelbynum Jan 11, 2024
17cb11d
debugging GHA
michaelbynum Jan 11, 2024
d1fe244
test simplification with ginac and sympy
michaelbynum Jan 11, 2024
9159c3c
test simplification with ginac and sympy
michaelbynum Jan 11, 2024
457f2b3
fixing simplification tests
michaelbynum Jan 11, 2024
1e7c3f1
fixing simplification tests
michaelbynum Jan 11, 2024
b2d969f
fixing simplification tests
michaelbynum Jan 11, 2024
372487e
Merge branch 'gdp_minlp' into coramin2
michaelbynum Jan 11, 2024
f60271d
Merge branch 'ginac' into coramin2
michaelbynum Jan 11, 2024
da2fe3d
fixing simplification tests
michaelbynum Jan 11, 2024
514e93d
Merge branch 'gdp_minlp' into coramin2
michaelbynum Jan 11, 2024
e525732
Coramin: remove ComponentWeakRef
michaelbynum Jan 12, 2024
b73d0cc
Coramin: allow aux_var to be a float
michaelbynum Jan 12, 2024
0c475f8
Merge branch 'gdp_minlp' into coramin2
michaelbynum Jan 12, 2024
7c17a18
coramin: working on heuristics
michaelbynum Jan 12, 2024
70237d3
coramin: cleanup
michaelbynum Jan 15, 2024
9f7d546
Merge branch 'main' into coramin2
michaelbynum Jan 16, 2024
7bf699f
working on heuristics
michaelbynum Jan 17, 2024
c2067a1
Merge branch 'gdp_minlp' into coramin2
michaelbynum Jan 17, 2024
ee615ea
working on heuristics
michaelbynum Jan 17, 2024
d37b304
Merge remote-tracking branch 'main_fork/main' into ginac
michaelbynum Jan 22, 2024
2b1596b
fixing simplification tests
michaelbynum Jan 22, 2024
d75c5f8
fixing simplification tests
michaelbynum Jan 22, 2024
dae0205
run black
michaelbynum Jan 22, 2024
313108d
fixing simplification tests
michaelbynum Jan 22, 2024
5ff4d4d
fixing simplification tests
michaelbynum Jan 22, 2024
010a997
fixing simplification tests
michaelbynum Jan 22, 2024
2c59b29
fixing simplification tests
michaelbynum Jan 22, 2024
d67d90d
fixing simplification tests
michaelbynum Jan 22, 2024
3fcec35
fixing simplification tests
michaelbynum Jan 22, 2024
b5550fe
fixing simplification tests
michaelbynum Jan 22, 2024
8984389
fixing simplification tests
michaelbynum Jan 22, 2024
6246430
Merge remote-tracking branch 'main_fork/main' into coramin2
michaelbynum Jan 22, 2024
42cd7a9
Merge branch 'ginac' into coramin2
michaelbynum Jan 22, 2024
85fba42
coramin: cleanup
michaelbynum Jan 22, 2024
646bbd7
coramin: B&B
michaelbynum Jan 22, 2024
c204466
coramin: B&B
michaelbynum Jan 22, 2024
b5a1dcf
coramin: B&B
michaelbynum Jan 22, 2024
f74c399
coramin: B&B
michaelbynum Jan 22, 2024
a7349fc
coramin: cleanup
michaelbynum Jan 22, 2024
125b7c7
Merge branch 'main' into ginac
michaelbynum Jan 24, 2024
7b9053a
coramin cut generators
michaelbynum Jan 24, 2024
334b7cb
Merge remote-tracking branch 'main_fork/main' into coramin2
michaelbynum Jan 24, 2024
9836e14
coramin cleanup
michaelbynum Jan 24, 2024
1f28b9f
coramin cleanup
michaelbynum Jan 24, 2024
4b700ba
coramin: update tests
michaelbynum Jan 24, 2024
1e82694
coramin: update tests
michaelbynum Jan 24, 2024
7b9760a
coramin: update tests
michaelbynum Jan 24, 2024
2203c80
coramin: cleanup
michaelbynum Jan 26, 2024
f55fb1a
coramin: update tests
michaelbynum Jan 26, 2024
ee36bd8
coramin: clean up domain reduction
michaelbynum Jan 30, 2024
c7bf0ef
add utility to compare feasible regions of two models
michaelbynum Jan 31, 2024
1dfb506
coramin cleanup
michaelbynum Jan 31, 2024
ac7a40d
coramin: working on tests
michaelbynum Jan 31, 2024
1d0e44d
identify variables cache
michaelbynum Jan 31, 2024
ac48999
coramin: working on tests
michaelbynum Feb 1, 2024
3801016
update tests
michaelbynum Feb 7, 2024
6c4d827
update tests
michaelbynum Feb 7, 2024
26df9b5
coramin: working on tests
michaelbynum Feb 7, 2024
acb2f9d
coramin: working on tests
michaelbynum Feb 8, 2024
92163f2
cleanup
michaelbynum Feb 21, 2024
0dff80f
cleanup
michaelbynum Feb 21, 2024
c49c2df
cleanup
michaelbynum Feb 21, 2024
2c42772
Merge remote-tracking branch 'michaelbynum/ginac' into ginac
michaelbynum Feb 21, 2024
ce308d9
Merge branch 'main' into ginac
michaelbynum Feb 21, 2024
29d6a19
cleanup
michaelbynum Feb 21, 2024
350f3d0
Merge remote-tracking branch 'main_fork/main' into ginac
michaelbynum Feb 21, 2024
f9b039c
Merge branch 'ginac' into coramin2
michaelbynum Feb 21, 2024
f195650
fix division by zero error in linear presolve
michaelbynum Feb 22, 2024
e2f46b2
Merge branch 'zero_presolve' into coramin2
michaelbynum Feb 22, 2024
fd656e0
run black
michaelbynum Feb 22, 2024
8de4b3c
Merge branch 'zero_presolve' into coramin2
michaelbynum Feb 22, 2024
2aae9c5
merge zero_presolve
michaelbynum Feb 25, 2024
8d9926e
merge zero_presolve
michaelbynum Feb 25, 2024
d543fb9
Merge branch 'zero_presolve' into coramin2
michaelbynum Feb 25, 2024
23131ce
run black
michaelbynum Feb 25, 2024
a2a6f2b
fix typo
michaelbynum Feb 25, 2024
19f0c5d
update optional requirements
michaelbynum Feb 25, 2024
b88cfd6
update imports
michaelbynum Feb 25, 2024
7f62934
update GHA
michaelbynum Feb 25, 2024
706b793
fix imports
michaelbynum Feb 25, 2024
e3330de
fix tests
michaelbynum Feb 25, 2024
81684d6
update GHA
michaelbynum Feb 25, 2024
8d51683
fix available
michaelbynum Feb 25, 2024
87637f6
run black
michaelbynum Feb 25, 2024
8781914
Merge remote-tracking branch 'main_fork/main' into coramin2
michaelbynum Mar 3, 2024
9f6afd9
osil parser
michaelbynum Mar 4, 2024
9f7a1f0
use osil parser in tests
michaelbynum Mar 4, 2024
e0e9f34
bugs
michaelbynum Mar 4, 2024
b36459b
update tests
michaelbynum Mar 4, 2024
7e7364a
update tests
michaelbynum Mar 4, 2024
1c3fe3a
update tests
michaelbynum Mar 4, 2024
e07bae8
update tests
michaelbynum Mar 4, 2024
74f751f
run black
michaelbynum Mar 4, 2024
4b86141
typo
michaelbynum Mar 4, 2024
45a27bf
add some __init__ files
michaelbynum Mar 4, 2024
0f3b245
update imports
michaelbynum Mar 4, 2024
4a90f09
update imports
michaelbynum Mar 4, 2024
21ee445
update GHA
michaelbynum Mar 4, 2024
01cc572
update imports
michaelbynum Mar 4, 2024
96e2b03
update imports
michaelbynum Mar 4, 2024
c1d0324
merge main
michaelbynum Mar 6, 2024
01e0658
Merge branch 'main' into coramin2
michaelbynum Apr 8, 2024
e859b78
fix bug
michaelbynum Apr 23, 2024
1261ff9
Merge branch 'main' into coramin2
michaelbynum May 4, 2024
8b2c4e2
Merge remote-tracking branch 'main_fork/main' into coramin2
michaelbynum May 8, 2024
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
Prev Previous commit
Next Next commit
update imports
  • Loading branch information
michaelbynum committed Oct 27, 2023
commit 3e8b60fa54fb687ed6efd85e5c6c26226ba47cb9
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import coramin
from pyomo.contrib.coramin.third_party.minlplib_tools import get_minlplib, get_minlplib_instancedata
import unittest
from pyomo.common import unittest
from pyomo.contrib import appsi
import os
import logging
Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/algorithms/tests/test_ecp_bounder.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pyomo.environ as pe
import coramin
from pyomo.contrib.coramin.algorithms.ecp_bounder import ECPBounder
import unittest
from pyomo.common import unittest
import logging
from pyomo.contrib import appsi

Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/domain_reduction/tests/test_dbt.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pyomo.contrib.coramin.domain_reduction.dbt import TreeBlock, TreeBlockError, convert_pyomo_model_to_bipartite_graph, \
_VarNode, _ConNode, _RelNode, split_metis, num_cons_in_graph, collect_vars_to_tighten_by_block, decompose_model, \
perform_dbt, OBBTMethod, FilterMethod
import unittest
from pyomo.common import unittest
import pyomo.environ as pe
import coramin
from networkx import is_bipartite
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pyomo.environ as pe
import coramin
import unittest
from pyomo.common import unittest
from pyomo.contrib import appsi


Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/domain_reduction/tests/test_obbt.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import coramin
import unittest
from pyomo.common import unittest
import pyomo.environ as pyo
from pyomo.contrib import appsi

Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/relaxations/tests/test_alphabb.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import unittest
from pyomo.common import unittest
import itertools
import math
import pyomo.environ as pe
Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/relaxations/tests/test_auto_relax.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pyomo.environ as pe
import coramin
import unittest
from pyomo.common import unittest
from pyomo.core.expr.calculus.diff_with_pyomo import reverse_sd
from pyomo.core.expr.visitor import identify_variables, identify_components
import math
Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/relaxations/tests/test_copy.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from pyomo.contrib.coramin.relaxations.copy_relaxation import copy_relaxation_with_local_data
import unittest
from pyomo.common import unittest
import pyomo.environ as pe
import coramin
from pyomo.common.collections import ComponentSet
Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/relaxations/tests/test_iterators.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import coramin
import unittest
from pyomo.common import unittest
import pyomo.environ as pe
from pyomo.common.collections import ComponentSet

Expand Down
2 changes: 1 addition & 1 deletion pyomo/contrib/coramin/relaxations/tests/test_mccormick.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pyomo.environ as pyo
import unittest
from pyomo.common import unittest
import coramin


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import unittest
from pyomo.common import unittest
import pyomo.environ as pe
import coramin
from pyomo.core.base.block import _BlockData
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import unittest
from pyomo.common import unittest
import pyomo.environ as pe
from pyomo.opt import assert_optimal_termination
import coramin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import unittest
from pyomo.common import unittest
import math
import pyomo.environ as pe
import coramin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import coramin
import unittest
from pyomo.common import unittest
import os
from pyomo.common.fileutils import this_file_dir
from urllib.request import urlopen
Expand Down