Skip to content
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
2e2cb24
fix a bug in bigm_mixin
sadavis1 Jun 6, 2025
72003c4
non-working attempt at threaded mbigm
sadavis1 Jun 6, 2025
526bca4
Working attempt at parallel mbigm when using baron, but leads to a de…
sadavis1 Jun 9, 2025
69b22ce
delete unused code
sadavis1 Jun 9, 2025
cf09d52
Improve several edge cases
sadavis1 Jun 10, 2025
89218cf
Handle edge cases "better"
sadavis1 Jun 11, 2025
cdb0103
Handle ipopt in a somewhat better way
sadavis1 Jun 12, 2025
160fc22
apply black
sadavis1 Jun 12, 2025
83a2a20
apply black on more files
sadavis1 Jun 12, 2025
2e5e07e
Cleanup and formatting
sadavis1 Jun 12, 2025
21ea319
black yet again
sadavis1 Jun 12, 2025
523bbaa
Merge branch 'main' of github.com:Pyomo/pyomo into mbigm-parallel
sadavis1 Jun 12, 2025
c9794a5
Switch from multithreading to multiprocessing
sadavis1 Jun 18, 2025
a2d52cf
fix a bug, also reflow my block comments
sadavis1 Jun 18, 2025
2ff8888
Merge branch 'main' of github.com:Pyomo/pyomo into mbigm-parallel
sadavis1 Jun 18, 2025
738223b
Import plugins manually, also remove unused imports
sadavis1 Jun 18, 2025
bb7a816
remove debug code
sadavis1 Jun 18, 2025
1c0bb3e
Set 'name' class attribute of LegacySolver objects to the legacy name
sadavis1 Jun 20, 2025
d57501d
Consider and fix more edge cases
sadavis1 Jun 20, 2025
2de93fb
Test process spawning methods
sadavis1 Jun 20, 2025
2c5d3e5
reorder some imports
sadavis1 Jun 20, 2025
bcbb9ab
Revert "Set 'name' class attribute of LegacySolver objects to the leg…
sadavis1 Jun 24, 2025
edc0f30
Pickle classes instead of passing solver names
sadavis1 Jun 24, 2025
9e93f17
Move thread pool setup out of _transform_DisjunctionDatas
sadavis1 Jun 24, 2025
c37d305
check for a rather implausible error case
sadavis1 Jun 30, 2025
a65467e
terminate subprocesses more gently in an attempt to make codecov work
sadavis1 Jun 30, 2025
ffe3a5e
Merge branch 'main' of github.com:Pyomo/pyomo into mbigm-parallel
sadavis1 Jun 30, 2025
56d12ed
reduce lines of code
sadavis1 Jun 30, 2025
547e800
Merge branch 'main' of github.com:Pyomo/pyomo into mbigm-parallel
sadavis1 Jun 30, 2025
e14f0e2
Address review comments
sadavis1 Jul 22, 2025
bfe2809
Merge branch 'main' of github.com:Pyomo/pyomo into mbigm-parallel
sadavis1 Jul 22, 2025
c5a1e9f
apply kwargs from CONFIG to apply_to documentation
sadavis1 Jul 22, 2025
4b303f8
apply black
sadavis1 Jul 22, 2025
7d3ffd9
Merge branch 'main' into mbigm-parallel
jsiirola Aug 1, 2025
fb5e4c1
Update to use new document_class_CONFIG decorator
jsiirola Aug 1, 2025
79e7576
NFC: update docs so doc= is self-contained
jsiirola Aug 1, 2025
77bc5c0
NFC: move references into the bibliography
jsiirola Aug 1, 2025
e5fd3f2
Prevent str domains from triggering UninitializedConfig* resolution
jsiirola Aug 4, 2025
2b2a423
NFC: fixing some doc typos
jsiirola Aug 4, 2025
55ced91
Merge branch 'main' into mbigm-parallel
jsiirola Aug 4, 2025
418ef42
Merge branch 'main' into mbigm-parallel
mrmundt Aug 5, 2025
630b0ea
Fixing a docstring typo
emma58 Aug 5, 2025
9a7c7a5
Fixing a lot of variables that should have been snake case
emma58 Aug 5, 2025
1790bbf
skipping tests when dill isn't available
emma58 Aug 5, 2025
b993d07
Adding missing arg in docstring
emma58 Aug 5, 2025
b47d610
Merge branch 'main' into mbigm-parallel
jsiirola Aug 6, 2025
611f4bd
Guarding a test against gurobi direct being unavailable even when gur…
emma58 Aug 6, 2025
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
6 changes: 5 additions & 1 deletion pyomo/gdp/plugins/bigm_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@
# This software is distributed under the 3-clause BSD License.
# ___________________________________________________________________________

import logging

from pyomo.gdp import GDP_Error
from pyomo.common.collections import ComponentSet
from pyomo.contrib.fbbt.expression_bounds_walker import ExpressionBoundsVisitor
import pyomo.contrib.fbbt.interval as interval
from pyomo.core import Suffix

logger = logging.getLogger(__name__)


def _convert_M_to_tuple(M, constraint, disjunct=None):
if not isinstance(M, (tuple, list)):
Expand All @@ -23,7 +27,7 @@ def _convert_M_to_tuple(M, constraint, disjunct=None):
else:
try:
M = (-M, M)
except:
except Exception:
logger.error(
"Error converting scalar M-value %s "
"to (-M,M). Is %s not a numeric type?" % (M, type(M))
Expand Down
Loading
Loading