Code

Doe with blocks#13

Code

Closed

jialuw96 wants to merge 174 commits intodoe-reviewjialuw96/pyomo:doe-reviewfrom doe_with_blocksjialuw96/pyomo:doe_with_blocksCopy head branch name to clipboard

+5,476-3,542

Commits

Commits on Sep 7, 2022

• Adding Pyomo.DOE logo files.

  adowling2

  committed
  ce39b7d

Commits on Sep 18, 2022

• Moved files into version 1 folder

  adowling2

  committed
  0eb99f5

• Added version 2

  adowling2

  committed
  8b9f470

Commits on Nov 28, 2022

• Beginning of a GDP-to-MIP transformation base class

  emma58

  committed
  411cc31

Commits on Dec 5, 2022

• Merging, fixing some imports

  emma58

  committed
  3ace706

• Attempting to merge the change to logical to disjunctive

  emma58

  committed
  a1f315d

• Almost moving most of the common pre-transformation stuff to the base class, but there is a bug where the Disjunctions that logical-to-disjunctive creates don't get transformed

  emma58

  committed
  e14187e

• Calling logical transformation in hull

  emma58

  committed
  ed53a3a

Commits on Dec 7, 2022

• Add support for callbacks in Python.

  djunglas

  committed
  aeff0ff

Commits on Dec 20, 2022

• Switch default NL writer to nlv2

  jsiirola

  committed
  7403826

Commits on Dec 28, 2022

• Fixing some bugs in scaling transformation

  

  Andrew Lee

  committed
  22d7aca

Commits on Dec 30, 2022

• Improving handling of constraint scaling in propagate_solution

  

  Andrew Lee

  committed
  fe7f9d8

Commits on Jan 3, 2023

• Catching overflow errors in calcuate_variable_from_constraint

  

  Andrew Lee

  committed
  b406ca1

Commits on Jan 4, 2023

• Making a BigM mix-in class and moving multiple bigm onto the base class

  emma58

  committed
  414daae

• Making a BigM mix-in class and moving multiple bigm onto the base class

  emma58

  committed
  0e88f26

• Merge branch 'gdp-transformation-base-class' of github.com:emma58/pyomo into gdp-transformation-base-class

  emma58

  committed
  0dda4e8

Commits on Jan 5, 2023

• Mostly finishes moving common functionality in bigm and hull to the base class, breaks hull tests because of transformed constraint naming

  emma58

  committed
  31f61ff

• Merge branch 'main' into gdp-transformation-base-class

  emma58

  committed
  1b565a9

• Fixing some (not yet all) of the hull tests to not rely on the names of the transformed constraints.

  emma58

  committed
  1f196d3

Commits on Jan 6, 2023

• Fixing the remaining hull tests to not rely on the names of the transformed constraints.

  emma58

  committed
  873a4fe

• Redoing hull baselines because the names of transformed constraints changed

  emma58

  committed
  703aaee

• Making self._config in the transformation constructor so that hacky things like GDPopt and mess with it and never call apply_to. We might want to revisit this in the future

  emma58

  committed
  b84d600

• Making self._config in the transformation constructor so that hacky things like GDPopt can mess with it and never call apply_to. We might want to revisit this in the future

  emma58

  committed
  9c93dda

• Merge branch 'gdp-transformation-base-class' of github.com:emma58/pyomo into gdp-transformation-base-class

  emma58

  committed
  d0827db

Commits on Jan 9, 2023

• Standardizing return values of '_add_transformation_block', multiple bigm now uses the base class implementation

  emma58

  committed
  a5a4c38

• Combining multiple bigm and base class implementations of '_get_disjunct_transformation_block'

  emma58

  committed
  b7f4e69

• Moving _warn_for_active_disjunct to the base class--only hull can't use it

  emma58

  committed
  92cad40

• We assume _transform_constraint is implemented right now--making that explicit in the base class

  emma58

  committed
  44dfd62

• Finishing moving multiple bigm onto the base class

  emma58

  committed
  cde8f01

• Fixing the FME tests that break whenever anything changes in hull

  emma58

  committed
  a4eb1ca

• Merge branch 'main' into gdp-transformation-base-class

  emma58

  committed
  688f3c5

• Update NLv2 writer to be compatible with v1 Complementarity

  jsiirola

  committed
  ef9b937

• Restoring back to default config options after apply_to. This is why transformations should be stateless, but this enables GDPopt to use bigm more modularly than it is actually implemented.

  emma58

  committed
  9f3708d

• Make sens tests less sensitive to variable ordering

  jsiirola

  committed
  8a8cb76

• Deleting self._config at the end of apply_to, it's sneakily a class attribute so very scary if it sticks around. This makes it GDPopt's responsibility to add and delete it, which is fair since GDPo…

  Show description for b4bc14b
  emma58

  committed
  b4bc14b

• Specify file determinism when generating NL files

  jsiirola

  committed
  a782da0

• Pass all file determinism values provided by user

  jsiirola

  committed
  ee18cf4

• Ignore double-negation when comparing NL files

  jsiirola

  committed
  5049948

• Deleting the list of targets we stick on the transformation too

  emma58

  committed
  0264cbc

• Track change of file determinism flag

  jsiirola

  committed
  744b1ec

• Support running the nl_diff as a script

  jsiirola

  committed
  1f23c90

• Use nl_diff to compare NL files

  jsiirola

  committed
  916aa25

• Merge branch 'main' into activate-nlv2

  jsiirola

  authored
  b9c4bae

• Never storing list of targets on the transformation at all

  emma58

  committed
  347bfb2

• Debugging LBB failure

  emma58

  committed
  f718375

• More debugging

  emma58

  committed
  1b0f9b6

• Moving GDPopt LBB test to use Gurobi as minlp solver (it's quadratic) because BARON 23.1.5 seems to be wrong...

  emma58

  committed
  1217597

Commits on Jan 10, 2023

• Merge branch 'fix-gdpopt-failure' into gdp-transformation-base-class

  emma58

  committed
  8e6bf02

• Merge branch 'main' of https://github.com/Pyomo/pyomo into xpress-support-callbacks

  djunglas

  committed
  0cefb96

• Remove invalid assertion.

  Show description for ee6832e
  djunglas

  committed
  ee6832e

• Updating doctests to be more forgiving of small changes in ipopt traces

  jsiirola

  committed
  c121314

• Merge remote-tracking branch 'refs/remotes/me/activate-nlv2' into activate-nlv2

  jsiirola

  committed
  6a440a1

• Merge branch 'main' into activate-nlv2

  jsiirola

  authored
  e1e000e

• Minor fix

  

  Andrew Lee

  committed
  cd6d23c

• Adding regression test for calc_var_value issue

  

  Andrew Lee

  committed
  ece2185

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

  

  Andrew Lee

  committed
  31222e6

• Undoing changes to incidence analysis that crept in

  

  Andrew Lee

  committed
  475b5a1

• Fix invalid file_determinism value

  jsiirola

  committed
  c3cfed6

• Adding mark to skip test if sympy not avaialble

  

  Andrew Lee

  committed
  54d640e

• Update to support PySide6 and display units and domain.

  

  John Eslick

  committed
  eaceabd

Commits on Jan 11, 2023

• remove stray sleep

  

  John Eslick

  committed
  caa0090

• :x

  

  John Eslick

  committed
  6620542

• Merge branch 'main' of https://github.com/Pyomo/pyomo into xpress-support-callbacks

  djunglas

  committed
  50caafd

• Rework PintUnitExtractionVisitor for efficiency and to always return a pint Unit

  jsiirola

  committed
  8c291a7

• Cache the PintUnitExtractionVisitor

  jsiirola

  committed
  3c0b4f7

• get_units() will always return a _PyomoUnit (even for dimensionless)

  jsiirola

  committed
  d8dfa1b

• Support comparing _PyomoUnits without generating expressions

  jsiirola

  committed
  5102d92

• NFC: removing whitespaec

  jsiirola

  committed
  4b4ba95

• Updating units tests to reflect get_units() returning dimensionless

  jsiirola

  committed
  3d06acf

• Adding tests for Pyomo#1570

  jsiirola

  committed
  b120d6b

• Fix dummy classes

  

  John Eslick

  committed
  1e7eeaa

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

  

  John Eslick

  committed
  054bc8c

• NFC: whitespace / typos

  jsiirola

  committed
  d32fc42

• Simplify string formatting

  jsiirola

  committed
  d63a916

• Remove unreachable code

  jsiirola

  committed
  c796e73

Commits on Jan 13, 2023

• Clarifying error message for when Ms are spcified as lists and tuples

  emma58

  committed
  4bea1f2

• Merge branch 'main' into gdp-transformation-base-class

  emma58

  authored
  dce5985

Commits on Jan 16, 2023

• Merge branch 'main' into gdp-transformation-base-class

  emma58

  committed
  308f418

• Fixing bigm tests that rely on the error message for M values

  emma58

  committed
  e270f7c

• Standardizing some function names to refer to 'bigM' when referring to what is given to args and Suffixes and generically.

  emma58

  committed
  4c310ee

• Merge branch 'gdp-transformation-base-class' of github.com:emma58/pyomo into gdp-transformation-base-class

  emma58

  committed
  90b0064

Commits on Jan 17, 2023

• Name the public facing field problem rather than prob.

  djunglas

  committed
  e2cb7ca

• Use snake case instead of long variable names.

  djunglas

  committed
  6f3b049

• Fix typo.

  djunglas

  committed
  917ccb0

• Fix comment.

  djunglas

  committed
  bc623a2

• Spell out the name of the callback context.

  Show description for 206f323
  djunglas

  committed
  206f323

• Use more verbose variable name.

  djunglas

  committed
  9e4fc23

• Fix typo.

  djunglas

  committed
  ebde260

• Fix typo.

  djunglas

  committed
  863ff86

• Addressing comments

  

  Andrew Lee

  committed
  f28adb8

• More comments

  

  Andrew Lee

  committed
  869fc14

• Merge branch 'main' into scaling_bugs

  jsiirola

  authored
  2a6fee1

Commits on Jan 18, 2023

• Merge branch 'main' into activate-nlv2

  jsiirola

  committed
  c245f66

• Merge branch 'main' into activate-nlv2

  jsiirola

  committed
  004b47f

• Skip QCP_simple nl test for cplex 12.6.0.0

  jsiirola

  committed
  16fa5b3

• Remove use of as_numeric for Complementarity args

  Show description for 49c1d80
  jsiirola

  committed
  49c1d80

Commits on Jan 19, 2023

• Add state vars attribute to test model

  shermanjasonaf

  committed
  0f039da

• Fix retrieval of master/polishing block state vars

  shermanjasonaf

  committed
  6ce2da8

• Remove state variable attribute print statements

  shermanjasonaf

  committed
  205fc90

• Update handling / warning for \r\n line endings and external functions

  jsiirola

  committed
  2632779

• Switch to using an actual file for line ending tests

  jsiirola

  committed
  0a9e43c

Commits on Jan 20, 2023

• Merge branch 'main' into viewer_update

  blnicho

  authored
  8498946

• Update to handle streams where tell() is always 0

  jsiirola

  committed
  5de09a2

• Fixing dangling reference

  jsiirola

  committed
  eab2eb3

Commits on Jan 21, 2023

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

  

  John Eslick

  committed
  2a93717

• UB and LB edit

  

  John Eslick

  committed
  8ff6544

• Merge branch 'viewer_update' of https://github.com/eslickj/pyomo into viewer_update

  

  John Eslick

  committed
  a5ff3dc

Commits on Jan 23, 2023

• Fix messed up skip

  

  John Eslick

  committed
  7b9852f

• Run black

  

  John Eslick

  committed
  c76acfa

• Merge branch 'main' into activate-nlv2

  jsiirola

  committed
  9610cee

• Explicitly test suffixes for NL v1 and v2 writers

  jsiirola

  committed
  8554619

• Map 'inf'/'-inf' bounds to None

  jsiirola

  committed
  e097826

Commits on Jan 24, 2023

• Merge branch 'main' into gdp-transformation-base-class

  jsiirola

  authored
  60c9670

• Fix typo in PyQt5 code

  

  John Eslick

  committed
  3bd78fb

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

  

  John Eslick

  committed
  5c7a63e

• Merge pull request Pyomo#2700 from shermanjasonaf/fix-load-dr-polishing-sol

  Show description for e13fe45
  emma58

  authored
  e13fe45

• Merge pull request Pyomo#2678 from andrewlee94/scaling_bugs

  Show description for 200e777
  emma58

  authored
  200e777

Commits on Jan 25, 2023

• Change GAMS solver type for time limit adjustment

  shermanjasonaf

  committed
  1fd7586

• Clarifying option documentation

  jsiirola

  committed
  50d518a

• Make references to GAMS shell type more specific

  shermanjasonaf

  committed
  745aa17

Commits on Jan 26, 2023

• Add tests

  

  John Eslick

  committed
  c5a189f

• run black

  

  John Eslick

  committed
  32e2f90

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

  

  John Eslick

  committed
  bb3290c

• Add tests for residual_table

  

  John Eslick

  committed
  cf1e2a6

• Improve ComponentItemModel testing

  

  John Eslick

  committed
  8e927e5

• Fix a bunch of ors to in

  

  John Eslick

  committed
  f62302a

• NFC: fix comment typo

  jsiirola

  committed
  f77f748

• Add check for pyomo units availability

  

  John Eslick

  committed
  00f15f3

Commits on Jan 27, 2023

• More testing

  

  John Eslick

  committed
  c81dbd6

• run black

  

  John Eslick

  committed
  303bd9a

• Merge pull request Pyomo#2676 from jsiirola/activate-nlv2

  Show description for 7edd5f0
  mrmundt

  authored
  7edd5f0

• Merge branch 'main' into units-dimensionless

  blnicho

  authored
  f2e3372

• Merge pull request Pyomo#2706 from shermanjasonaf/fix-adjust-pyros-time-lim

  Show description for 141baf0
  blnicho

  authored
  141baf0

Commits on Jan 28, 2023

• Removing debuging

  emma58

  committed
  65ebbf8

• Merge branch 'gdp-transformation-base-class' of github.com:emma58/pyomo into gdp-transformation-base-class

  emma58

  committed
  92a81ef

• Python3-ing super calls

  emma58

  committed
  42cb8b8

• Not having base class implementations of apply_to and apply_to_impl--renaming those methods so there aren't confuing overrides

  emma58

  committed
  8d97f88

• Merge branch 'main' into gdp-transformation-base-class

  emma58

  authored
  b620e19

Commits on Jan 30, 2023

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

  

  John Eslick

  committed
  2948af2

• Update the standalone app and more tests.

  

  John Eslick

  committed
  5cf5482

• fix missed skip

  

  John Eslick

  committed
  a2e22bb

• Fix bugs tabulating the number of skipped suffix values

  jsiirola

  committed
  e445b1c

• Improve grammar in logged warning

  jsiirola

  committed
  8f06da4

• Fix reporting a negative number of skipped keys

  jsiirola

  committed
  e755ae7

• Test logging warnings for skipped suffix values

  jsiirola

  committed
  3fef1cf

• Merge pull request Pyomo#2691 from jsiirola/units-dimensionless

  Show description for 85c3f33
  blnicho

  authored
  85c3f33

• Merge pull request Pyomo#2294 from jialuw96/doe-review

  Show description for 449180c
  blnicho

  authored
  449180c

• Merge branch 'main' into pyomodoe-logo

  adowling2

  authored
  0462454

• Updated Pyomo.DoE logo

  adowling2

  committed
  82bb3f5

• Merge pull request Pyomo#2710 from jsiirola/nlv2-suffix-fix

  Show description for fb7f8c7
  jsiirola

  authored
  fb7f8c7

• Adding forgotten handler in multiple bigm

  emma58

  committed
  aedb47f

• Merge branch 'gdp-transformation-base-class' of github.com:emma58/pyomo into gdp-transformation-base-class

  emma58

  committed
  0055cfa

• Merge pull request Pyomo#2527 from adowling2/pyomodoe-logo

  Show description for 1021ed2
  blnicho

  authored
  1021ed2

Commits on Jan 31, 2023

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

  

  John Eslick

  committed
  60bbc35

• Fix pyqt5 test fail

  

  John Eslick

  committed
  ba53ef4

• Merge pull request Pyomo#2648 from fico-xpress/xpress-support-callbacks

  Show description for 3224654
  mrmundt

  authored
  3224654

• Fix dimensionless unit test

  

  John Eslick

  committed
  a1c0690

• Revert "Add support for Xpress callbacks in Pyomo."

  mrmundt

  authored
  38f83e0

• Merge pull request Pyomo#23 from Pyomo/revert-2648-xpress-support-callbacks

  Show description for 7fa676b
  mrmundt

  authored
  7fa676b

• Fixing Sphinx warnings

  blnicho

  committed
  7839615

• Merge pull request Pyomo#2713 from mrmundt/revert-2648

  Show description for ba6f483
  mrmundt

  authored
  ba6f483

• Merge pull request Pyomo#2712 from blnicho/fix-sphinx-warnings

  Show description for 0ef8cde
  blnicho

  authored
  0ef8cde

Commits on Feb 2, 2023

• Merge pull request Pyomo#2689 from eslickj/viewer_update

  Show description for 9ee4235
  mrmundt

  authored
  9ee4235

Commits on Feb 4, 2023

• update the example to have no scenario index

  jialuw96

  committed
  2555067

Commits on Feb 5, 2023

• update measurement and scenario class to provide helper data structure

  jialuw96

  committed
  a1d002b

• Merge pull request Pyomo#2687 from emma58/gdp-transformation-base-class

  Show description for 6fde970
  jsiirola

  authored
  6fde970

Commits on Feb 6, 2023

• end of the day commit. Update compute_FIM() with blocks. Pending debugging.

  jialuw96

  committed
  1866a70

Commits on Feb 7, 2023

• changed sequential_finite mode. begin debugging

  jialuw96

  committed
  803fbda

• debugged measurements.

  jialuw96

  committed
  13ce77e

• debugged compute_FIM sequential finite mode

  jialuw96

  committed
  a6a2049

• update jacobian computation

  jialuw96

  committed
  2f8e1e5

• debugged sequential finite, removing the continuousSet and discretizer for global model

  jialuw96

  committed
  651d7f3

• codes before closing this branch

  jialuw96

  committed
  bef83d9

• Merge branch 'Pyomo:main' into doe_with_blocks

  jialuw96

  authored
  40132df