Code

pyomo.contrib.alternative_solutions#3270

Code

Merged

emma58 merged 107 commits intoPyomo:mainPyomo/pyomo:mainfrom jlgearh:aosjlgearh/pyomo:aosCopy head branch name to clipboardAug 14, 2024

+3,722

Commits

Commits on Feb 26, 2023

• - Adding alternative solutions code from CI-MOR to the alternative_solutions contrib package.

  jlgearh

  committed
  466442d

Commits on Feb 28, 2023

• - Completed an initial version of the solnpool wrapper.

  Show description for 15db08e
  jlgearh

  committed
  15db08e

Commits on Apr 10, 2023

• - Refactoring the aos code to be more general for inclusion as a Pyomo contrib package

  jlgearh

  committed
  58d18b9

Commits on Aug 30, 2023

• - Cleaning up aos code and adding test cases

  jlgearh

  committed
  7861cda

• Merge branch 'main' of https://github.com/Pyomo/pyomo into aos

  jlgearh

  committed
  ac8eccf

Commits on Sep 5, 2023

• - Updating OBBT

  jlgearh

  committed
  a698d31

Commits on Sep 13, 2023

• - Finalizing OBBT code

  jlgearh

  committed
  f36faa1

• - Adding test files

  jlgearh

  committed
  af46d29

Commits on Oct 3, 2023

• - Updating aos_utils.py and adding test cases

  Show description for ef2c135
  jlgearh

  committed
  ef2c135

Commits on Oct 5, 2023

• - Added test cases for AOS utils

  jlgearh

  committed
  0b72a21

• - Finished aos_utils and solution test cases

  Show description for 3a98410
  jlgearh

  committed
  3a98410

Commits on Oct 6, 2023

• - Updated balas.py to match the pattern in obbt.py and solnpool.py

  Show description for be7d07e
  jlgearh

  committed
  be7d07e

Commits on Oct 9, 2023

• - Updating test cases

  jlgearh

  committed
  53b8bb1

• - Simplified solnpool.py by setting pool mode to 2

  Show description for 407e7c8
  jlgearh

  committed
  407e7c8

Commits on Oct 10, 2023

• - Added code to enumerate the discrete feasiable points for the diamond problem and found the extreme points and domain for a particular objective constraint

  jlgearh

  committed
  6b60993

Commits on Oct 17, 2023

• added some tests

  barguel

  committed
  ed4b04e

Commits on Oct 19, 2023

• - Updating LP Enumeration Code

  jlgearh

  committed
  b512c4c

Commits on Oct 20, 2023

• - Renamed the canonical_lp.py file to shifted_lp.py, and completed initial development of code needed to put an LP in standard form.

  Show description for 8cf9c95
  jlgearh

  committed
  8cf9c95

• - Added missing constraint from Lee paper

  jlgearh

  committed
  546959f

Commits on Oct 25, 2023

• - Added script to run lp enumeration

  jlgearh

  committed
  0641565

Commits on Jan 8, 2024

• adding testes

  barguel

  committed
  3c241df

Commits on Jan 10, 2024

• - Added an additional test case

  jlgearh

  committed
  5e15a7f

• Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos

  jlgearh

  committed
  9ea9c06

Commits on Jan 12, 2024

• making sure tests run and changing hexagonal cases to pentagonal cases

  barguel

  committed
  ac7f3a2

Commits on Jan 17, 2024

• Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos

  jlgearh

  committed
  d18c117

Commits on Jan 23, 2024

• Eliminted a double counting issues with constant terms in objectives in the shifted_lp.py code.

  jlgearh

  committed
  7065b05

• - Fixed issue where constants in expressions were being double counted in shifted_lp.py

  jlgearh

  committed
  0dff860

• Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos

  jlgearh

  committed
  42eadd2

Commits on Feb 8, 2024

• - Updated gitignore file

  jlgearh

  committed
  db92d2c

• Merge branch 'main' of https://github.com/jlgearh/pyomo into aos

  jlgearh

  committed
  7569e78

Commits on Apr 8, 2024

• Working through tests

  whart222

  committed
  194ddd2

• Merge remote-tracking branch 'up/main' into aos

  whart222

  committed
  d5a2b57

Commits on Apr 9, 2024

• Two changes

  Show description for bb24237
  whart222

  committed
  bb24237

• Adding test to improve coverage

  whart222

  committed
  654a2d2

• Testing output with strings

  whart222

  committed
  a8c4fcc

• Adding solnpool tests

  Show description for d10da79
  whart222

  committed
  d10da79

• Reformatting with black

  whart222

  committed
  c49af49

• Enable seeding of numpy RNG

  whart222

  committed
  f162e97

• Changes to enable top-level imports

  whart222

  committed
  28e31a0

• Various changes needed to make tests work

  whart222

  committed
  c3ae9e7

• Adding Balas tests

  Show description for 8f563e3
  whart222

  committed
  8f563e3

• Adding top-level imports

  whart222

  committed
  146a05b

• Reformatting with black

  whart222

  committed
  98be8f7

• Fixing some solver interface issues

  whart222

  committed
  e055273

Commits on Apr 10, 2024

• Various changes to improve test coverage

  whart222

  committed
  4ddcb5b

Commits on Apr 12, 2024

• Various updates to improve coverage

  Show description for d0cef46
  whart222

  committed
  d0cef46

Commits on May 21, 2024

• Adding some documentation

  whart222

  committed
  5abdce0

• Adding a shifted pentagonal test

  whart222

  committed
  8ac2c6e

• Reformatting with black

  whart222

  committed
  da840b1

Commits on May 22, 2024

• Configure Gurobi to avoid using MIP heuristics

  Show description for f912d7f
  whart222

  committed
  f912d7f

• Fixing misspellings

  whart222

  committed
  45ddc79

• Remove strong dependence on gurobipy

  whart222

  committed
  46b4f11

• Merge branch 'main' into aos

  whart222

  authored
  5b13115

Commits on Jun 26, 2024

• Reformatting

  whart222

  committed
  6f85aeb

Commits on Jun 27, 2024

• Updating Balas test

  Show description for 2b11d19
  whart222

  committed
  2b11d19

• Unreformatting.

  Show description for 83800ae
  whart222

  committed
  83800ae

Commits on Jul 3, 2024

• Fixing tests to work without gurobi

  whart222

  committed
  7ac7560

• Reformatting

  whart222

  committed
  61f90b5

• Merge branch 'main' into aos

  whart222

  authored
  0727b3c

Commits on Jul 7, 2024

• Merge branch 'main' into aos

  whart222

  authored
  6637a75

Commits on Jul 8, 2024

• Merge branch 'main' into aos

  blnicho

  authored
  f55e712

• Adding guards for when numpy is not installed

  whart222

  committed
  8274809

• Reformatting with black

  whart222

  committed
  209fb66

• Removing the "no_time" tests

  whart222

  committed
  439b1f8

Commits on Jul 9, 2024

• - Updated the lp_enum_solnpool so that lp enumeration can be done using Gurobi's solution pool capability

  jlgearh

  committed
  570f7da

Commits on Jul 10, 2024

• Merge branch 'main' into aos

  whart222

  authored
  b4b7a85

• Reformatting and adding numpy guards

  whart222

  committed
  317c321

• Reformatting

  whart222

  committed
  9d1d355

• Fixing spelling

  whart222

  committed
  caec738

• Merge branch 'main' into aos

  mrmundt

  authored
  c6674b6

• Commenting out test that fails

  whart222

  committed
  45ed7c3

• Adding guards for gurobipy

  whart222

  committed
  6853e62

Commits on Jul 29, 2024

• Resolving PR issues

  whart222

  committed
  a1c14ab

• Further updates for the PR

  whart222

  committed
  a28b7b4

• Fix test errors when gurobi not installed

  whart222

  committed
  1ab6d2a

• Removing pytest.mark.skipif logic

  whart222

  committed
  4d1e346

• Fixing doc

  whart222

  committed
  dbf8408

Commits on Jul 31, 2024

• Merge branch 'main' into aos

  blnicho

  authored
  21e3a02

Commits on Aug 2, 2024

• Adding online documentation

  whart222

  committed
  67f0cf9

• Fixing docs

  whart222

  committed
  a2639e5

• Typo fix

  whart222

  committed
  5f3d9fc

Commits on Aug 5, 2024

• Using glpk for doctests

  whart222

  committed
  6345ece

Commits on Aug 6, 2024

• Resolving PR concerns

  whart222

  committed
  c3f12da

• Reformatting

  whart222

  committed
  15b47bc

• Raising exceptions when a solver is not available

  whart222

  committed
  7ade8ac

• Using logging instead of quiet/debug

  whart222

  committed
  835733b

• Changed objective re-initialization

  whart222

  committed
  d4c4266

Commits on Aug 7, 2024

• Reverting a recent change

  Show description for b86ec2d
  whart222

  committed
  b86ec2d

Commits on Aug 8, 2024

• Several changes

  Show description for ebb2296
  whart222

  committed
  ebb2296

• Removing deprecated TODO

  whart222

  committed
  ead2c59

• Raise an exception for models with binary vars

  whart222

  committed
  8e22108

Commits on Aug 12, 2024

• - Updated logic used to tighten bounds for OBBT to use a constraint list instead of named constraints and updated associated tests

  jlgearh

  committed
  1a20276

• Several changes

  Show description for 65c37a8
  whart222

  committed
  65c37a8

• Merge branch 'aos' of github.com:jlgearh/pyomo into aos

  whart222

  committed
  866284b

• Spelling fix

  whart222

  committed
  91d2562

• Better exception handling

  Show description for a1233de
  whart222

  committed
  a1233de

• Revising text describing the simple example here

  whart222

  committed
  49b89fc

• Removing an unneeded comment

  emma58

  committed
  a47ecab

• Setting exception_flag to False for opt.available when aos is trying to throw its own error

  emma58

  committed
  7c597e6

• - Added terminate functionality

  Show description for ac8b744
  jlgearh

  committed
  ac8b744

• Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos

  jlgearh

  committed
  baccf1c

Commits on Aug 13, 2024

• Merge branch 'main' into aos

  emma58

  authored
  60e725a

• Black

  emma58

  committed
  38a48b8

• Setting objective expr and sense in obbt rather than having to check for the component

  emma58

  committed
  4cff6ff

• - Removed the variables argument from the lp_enum scripts since we only allow these methods to be applied for all variables. I will add this as a potential improvement for a future release but we n…

  Show description for ea13e94
  jlgearh

  committed
  ea13e94

• Merge branch 'aos' of https://github.com/jlgearh/pyomo into aos

  jlgearh

  committed
  c54e58b

• Fixing typos

  whart222

  committed
  c107616