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.

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

Jump to bottom

AMPL solver duplicate funcadd fix #3206

Merged
merged 12 commits into from
Apr 9, 2024
Merged

AMPL solver duplicate funcadd fix #3206

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e550079
Fix for duplicate add
Mar 22, 2024
53635a9
Fix black and substring issue
Mar 26, 2024
54b3968
Merge branch 'main' into AMPLFUNC_dup_fix
eslickj Mar 26, 2024
6e1d351
Add Robbybp's patch
Mar 27, 2024
befe271
Merge branch 'AMPLFUNC_dup_fix' of https://github.com/eslickj/pyomo i…
Mar 27, 2024
ce34115
Centralize function to merge AMPLFUNC and PYOMO_AMPLFUNC
Apr 4, 2024
11d11e0
Add tests
Apr 4, 2024
30ffed7
Fix error in pyomo_nlp missing undefined amplfunc
Apr 4, 2024
4673c2c
Merge branch 'main' of https://github.com/pyomo/pyomo into AMPLFUNC_d…
Apr 4, 2024
d4c9ddf
Run black
Apr 4, 2024
4849ec5
Run black again
Apr 4, 2024
942df95
NFC: Typo fix in amplfunc_merge.py
blnicho Apr 4, 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
5 changes: 4 additions & 1 deletion pyomo/solvers/plugins/solvers/ASL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,10 @@ def create_command_line(self, executable, problem_files):
#
if 'PYOMO_AMPLFUNC' in env:
if 'AMPLFUNC' in env:
env['AMPLFUNC'] += "\n" + env['PYOMO_AMPLFUNC']
existing = set(env['AMPLFUNC'].split("\n"))
for line in env['PYOMO_AMPLFUNC'].split('\n'):
if line not in existing:
env['AMPLFUNC'] += "\n" + line
else:
env['AMPLFUNC'] = env['PYOMO_AMPLFUNC']

Expand Down
5 changes: 4 additions & 1 deletion pyomo/solvers/plugins/solvers/IPOPT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ def create_command_line(self, executable, problem_files):
#
if 'PYOMO_AMPLFUNC' in env:
if 'AMPLFUNC' in env:
env['AMPLFUNC'] += "\n" + env['PYOMO_AMPLFUNC']
existing = set(env['AMPLFUNC'].split("\n"))
for line in env['PYOMO_AMPLFUNC'].split('\n'):
if line not in existing:
env['AMPLFUNC'] += "\n" + line
else:
env['AMPLFUNC'] = env['PYOMO_AMPLFUNC']

Expand Down
Loading