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

contrib.piecewise: Adding nonlinear-to-piecewise-linear transformation #3333

Merged
merged 58 commits into from
Aug 20, 2024
Merged

contrib.piecewise: Adding nonlinear-to-piecewise-linear transformation #3333

merged 58 commits into from
Aug 20, 2024

Commits on Mar 28, 2024

  1. Adding initial draft of nonlinear to pwl transformation

    @emma58
    emma58 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    0f6fe16 View commit details
    Browse the repository at this point in the history

  2. Not screaming about fixed Var bounds, but this still doesn't work bec… 

    …ause the space isn't full-dimensional
    @emma58
    emma58 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    b34820b View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Complete rewrite of nonlinear to piecewise linear

    @emma58
    emma58 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    33fd778 View commit details
    Browse the repository at this point in the history

  2. Adding handler to safely ignore LogicalConstraints in piecewise linea… 

    …r to GDP transformations
    @emma58
    emma58 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    3271a0e View commit details
    Browse the repository at this point in the history

  3. Starting to add tests for nonlinear to pw linear transformation

    @emma58
    emma58 committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    159766a View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Adding mapping between original and transformed components and starti… 

    …ng on more tests
    @emma58
    emma58 committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    f295490 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merging main

    @emma58
    emma58 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    51c3967 View commit details
    Browse the repository at this point in the history

  2. whoops, fixing typo from last commit

    @emma58
    emma58 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    4811883 View commit details
    Browse the repository at this point in the history

  3. Putting common part of log x tests into helper function for tests

    @emma58
    emma58 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    02cef2d View commit details
    Browse the repository at this point in the history

  4. Removing hard dependencies

    @emma58
    emma58 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    a619cf6 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. Generalizing log tests, adding chaos test that doesn't do anything yet

    @emma58
    emma58 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    5ccd890 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Adding in an API to get the transformed linear and general nonlinear … 

    …constraints
    @emma58
    emma58 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    2c6b760 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    f8d9c53 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Adding APIs for getting transformed nonlinear and quadratic Constrain… 

    …ts and Objectives, fixing a few bugs
    @emma58
    emma58 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    5b85af7 View commit details
    Browse the repository at this point in the history

  2. Adding a lot of tests, including 3D

    @emma58
    emma58 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    1cc71bd View commit details
    Browse the repository at this point in the history

  3. Incorporating black's opinions

    @emma58
    emma58 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    2a6ad46 View commit details
    Browse the repository at this point in the history

  4. Fixing some typos

    @emma58
    emma58 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    e3d3fd6 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Fixing a couple bugs with additive decomposition in nonlinear-to-pwl

    @emma58
    emma58 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    1fe0f00 View commit details
    Browse the repository at this point in the history

  2. Adding partial test of additive decomposition

    @emma58
    emma58 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    9ae91fb View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. NFC: Reformatting some docstrings

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    8074fe0 View commit details
    Browse the repository at this point in the history

  2. Adding max depth argument to be used for the linear tree domain parti… 

    …tioning methods
    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    b78efe5 View commit details
    Browse the repository at this point in the history

  3. Adding tests with absolute value for linear model tree partitioning

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    31a95ba View commit details
    Browse the repository at this point in the history

  4. NFC: black

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    c89ddbf View commit details
    Browse the repository at this point in the history

  5. Finishing integration test, adding bigger linear model tree test

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    e4bfca0 View commit details
    Browse the repository at this point in the history

  6. NFC: black

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    96b9aee View commit details
    Browse the repository at this point in the history

  7. nonlinear_to_pwl.py

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    76459a2 View commit details
    Browse the repository at this point in the history

  8. Black

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    c61a705 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    c8b46d5 View commit details
    Browse the repository at this point in the history

  10. Making a lot of helper functions private

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    4145590 View commit details
    Browse the repository at this point in the history

  11. NFC: removing some comments

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    9e56e1d View commit details
    Browse the repository at this point in the history

  12. Apparently black has an opinion about that

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    738a8f8 View commit details
    Browse the repository at this point in the history

  13. DomainPartitioningMethod imports with the module

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    92b8ba1 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    ad74710 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Skipping tests when numpy not available

    @emma58
    emma58 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    953a39d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    03010fe View commit details
    Browse the repository at this point in the history

  3. Merge branch 'nonlinear-to-pwl' of github.com:emma58/pyomo into nonli… 

    …near-to-pwl
    @emma58
    emma58 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    398c468 View commit details
    Browse the repository at this point in the history

  4. HA, she can code... Fixing dumb typos in previous commit

    @emma58
    emma58 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    68b15a5 View commit details
    Browse the repository at this point in the history

  5. Skipping 3 more tests if scipy is not available

    @emma58
    emma58 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    dabafbf View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Adding a (currently failing) test for cloning a transformed model

    @emma58
    emma58 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    ead6f93 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Fixing two bugs with cloning transformed PiecewiseLinearFunctions

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    7bd2118 View commit details
    Browse the repository at this point in the history

  2. Black

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    208c9d6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    ffcffc6 View commit details
    Browse the repository at this point in the history

  4. Adding a test for cloning a multivariate piecewise linear function too

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    defc953 View commit details
    Browse the repository at this point in the history

  5. Adding linear-tree to optional dependencies

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    46e5bfb View commit details
    Browse the repository at this point in the history

  6. Black being black

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    fc5ebc8 View commit details
    Browse the repository at this point in the history

  7. Adding (failing) test for sampling discrete domains

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    844b09a View commit details
    Browse the repository at this point in the history

  8. Only use linear-tree for pypi, it appears to not be on conda

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    11326eb View commit details
    Browse the repository at this point in the history

  9. Whoops, actually intercepting the logging stream I want to make sure … 

    …is empty...
    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    3c233e1 View commit details
    Browse the repository at this point in the history

  10. Not sampling outside of discrete domains in uniform_grid and random_grid

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    e890a25 View commit details
    Browse the repository at this point in the history

  11. black

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    10b9026 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a8ed8c9 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    34cc34e View commit details
    Browse the repository at this point in the history

  2. not triggering scipy install on pypy

    @emma58
    emma58 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    86d4fff View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Skipping two more tests when scipy not available--this really should … 

    …make the pypy tests pass
    @emma58
    emma58 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    5bda911 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    652389f View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Moving quadratic repn visitor to instance attribute on nonlinear to p… 

    …wl transformation
    @emma58
    emma58 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    804ad04 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'nonlinear-to-pwl' of github.com:emma58/pyomo into nonli… 

    …near-to-pwl
    @emma58
    emma58 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    3a0c49e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into nonlinear-to-pwl

    @emma58
    emma58 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    b3429e1 View commit details
    Browse the repository at this point in the history