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

pyomo.contrib.alternative_solutions #3270

Merged
merged 107 commits into from
Aug 14, 2024
Merged

pyomo.contrib.alternative_solutions #3270

merged 107 commits into from
Aug 14, 2024

Conversation

whart222
Copy link
Member

Summary/Motivation:

A new contrib package for generating alternative solutions

Changes proposed in this PR:

  • Adding pyomo.contrib.alternative_solutions

Legal Acknowledgement

By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the BSD license.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

jlgearh and others added 30 commits February 26, 2023 11:21
@jlgearh
- Adding alternative solutions code from CI-MOR to the alternative_so…
466442d 
…lutions contrib package.
@jlgearh
- Completed an initial version of the solnpool wrapper.
15db08e 
- Updated the solution.py to create a solution class.
@jlgearh
- Refactoring the aos code to be more general for inclusion as a Pyom…
58d18b9 
…o contrib package
@jlgearh
- Cleaning up aos code and adding test cases
7861cda
@jlgearh
Merge branch 'main' of https://github.com/Pyomo/pyomo into aos
ac8eccf
@jlgearh
- Updating OBBT
a698d31
@jlgearh
- Finalizing OBBT code
f36faa1
@jlgearh
- Adding test files
af46d29
@jlgearh
- Updating aos_utils.py and adding test cases
ef2c135 
- Combined var_utils.py with aos_utils.py
@jlgearh
- Added test cases for AOS utils
0b72a21
@jlgearh
- Finished aos_utils and solution test cases
3a98410 
- Working on obbt and solution pool code and tests
@jlgearh
- Updated balas.py to match the pattern in obbt.py and solnpool.py
be7d07e 
- Removed old files
- Updated test cases
@jlgearh
- Updating test cases
53b8bb1
@jlgearh
- Simplified solnpool.py by setting pool mode to 2
407e7c8 
- Updates tests cases with some new tests and some TODOs
@jlgearh
- Added code to enumerate the discrete feasiable points for the diamo…
6b60993 
…nd problem and found the extreme points and domain for a particular objective constraint
@barguel
added some tests
ed4b04e
@jlgearh
- Updating LP Enumeration Code
b512c4c
@jlgearh
- Renamed the canonical_lp.py file to shifted_lp.py, and completed in…
8cf9c95 
…itial development of code needed to put an LP in standard form.

- Create an initial working version of the lp_enum code.
@jlgearh
- Added missing constraint from Lee paper
546959f
@jlgearh
- Added script to run lp enumeration
0641565
@barguel
adding testes
3c241df
@jlgearh
- Added an additional test case
5e15a7f
@jlgearh
Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos
9ea9c06
@barguel
making sure tests run and changing hexagonal cases to pentagonal cases
ac7f3a2
@jlgearh
Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos
d18c117
@jlgearh
Eliminted a double counting issues with constant terms in objectives …
7065b05 
…in the shifted_lp.py code.
@jlgearh
- Fixed issue where constants in expressions were being double counte…
0dff860 
…d in shifted_lp.py
@jlgearh
Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos
42eadd2
@jlgearh
- Updated gitignore file
db92d2c
@jlgearh
Merge branch 'main' of https://github.com/jlgearh/pyomo into aos
7569e78
whart222 and others added 16 commits August 8, 2024 08:39
@whart222
Several changes
ebb2296 
1. Adding documentation to logcontext()

2. Removing mis-use of logcontext.
@whart222
Removing deprecated TODO
ead2c59
@whart222
Raise an exception for models with binary vars
8e22108
@jlgearh
- Updated logic used to tighten bounds for OBBT to use a constraint l…
1a20276 
…ist instead of named constraints and updated associated tests
@whart222
Several changes
65c37a8 
1. Exposing the logcontext class.

2. Adding warnings and debugging information for the balas function.  In
particular, this method now warns if no binary variables are found.

3. Reworking balas example to work with knapsack.
@whart222
Merge branch 'aos' of github.com:jlgearh/pyomo into aos
866284b
@whart222
Spelling fix
91d2562
@whart222
Better exception handling
a1233de 
When the warmstart option is not supported by a solver
@whart222
Revising text describing the simple example here
49b89fc
@emma58
Removing an unneeded comment
a47ecab
@emma58
Setting exception_flag to False for opt.available when aos is trying …
7c597e6 
…to throw its own error
@jlgearh
- Added terminate functionality
ac8b744 
- Updated checks to make sure only an LP is passed
@jlgearh
Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos
baccf1c
@emma58
Merge branch 'main' into aos
60e725a
@emma58
Black
38a48b8
@emma58
Setting objective expr and sense in obbt rather than having to check …
4cff6ff 
…for the component
@emma58 emma58 mentioned this pull request Aug 13, 2024
Open
8 tasks
@emma58
Copy link
Contributor

emma58 commented Aug 13, 2024

@jlgearh, @whart222, I just opened #3342 to track planned changes not addressed in this PR. Please make sure I didn't miss anything when you get a chance.

jlgearh added 2 commits August 13, 2024 09:09
@jlgearh
- Removed the variables argument from the lp_enum scripts since we on…
ea13e94 
…ly allow these methods to be applied for all variables. I will add this as a potential improvement for a future release but we need to work out the theory first.

- Made zero-tolerance an argument in lp_enum.py for consistency
@jlgearh
Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos
c54e58b
@emma58 emma58 merged commit 115b60d into Pyomo:main Aug 14, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlgearh jlgearh jlgearh left review comments

@mrmundt mrmundt mrmundt left review comments

@jsiirola jsiirola jsiirola left review comments

@emma58 emma58 emma58 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
August 2024 Release
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@whart222 @emma58 @jsiirola @blnicho @mrmundt @jlgearh @pyomo-autotest @barguel