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.gdp: Adding gdp.bound_pretransformation #2824

Merged
merged 36 commits into from
May 19, 2023
Merged

pyomo.gdp: Adding gdp.bound_pretransformation #2824

merged 36 commits into from
May 19, 2023

Commits on Apr 6, 2023

  1. Adding bound pretransformation zygote

    @emma58
    emma58 committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    f19d65a View commit details
    Browse the repository at this point in the history

  2. Add docstring to GDPTree class

    @emma58
    emma58 committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    96ddb89 View commit details
    Browse the repository at this point in the history

  3. Sneaking in a couple things that bother me in mbigm

    @emma58
    emma58 committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    94c625d View commit details
    Browse the repository at this point in the history

  4. Registering the bounds pretransformation

    @emma58
    emma58 committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    ffb6f9b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. Fixing a lot of typo bugs, but the algorithm doesn't really exist yet

    @emma58
    emma58 committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    2b88006 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Merging main

    @emma58
    emma58 committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    610fd0b View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Bounds pretransformation works on one example, starting on a way of m… 

    …apping from the original model to the transformed one
    @emma58
    emma58 committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    e0390a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Bounds pretransformation works on two examples. (Specifically fixing … 

    …some bugs with the deferred deactivation of constraints
    @emma58
    emma58 committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    75a9078 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into gdp-bound-pretransformation

    @emma58
    emma58 committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    5334ba3 View commit details
    Browse the repository at this point in the history

  3. Fixing typos

    @emma58
    emma58 committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    91e2fa4 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. Fixing a bug with building the constraint expressions when there is m… 

    …ore than one variable bounded in the disjunction
    @emma58
    emma58 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    74acc78 View commit details
    Browse the repository at this point in the history

  2. Removing debugging and fixing a typo

    @emma58
    emma58 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    b214171 View commit details
    Browse the repository at this point in the history

  3. Adding tests for when we have to 'partially deactivate' constraints--… 

    …that is, we transform the upper or lower part, but not both
    @emma58
    emma58 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    aafba16 View commit details
    Browse the repository at this point in the history

  4. Fixing a bug with getting an already-existing transformation block

    @emma58
    emma58 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    fcaf5b6 View commit details
    Browse the repository at this point in the history

  5. Fixing bug with disjunction targets, adding tests

    @emma58
    emma58 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    c13ef65 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Testing some logging

    @emma58
    emma58 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    65869e0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into gdp-bound-pretransformation

    @emma58
    emma58 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    9dee1f6 View commit details
    Browse the repository at this point in the history

  3. Testing the other logging message

    @emma58
    emma58 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    5785502 View commit details
    Browse the repository at this point in the history

  4. Blackifying

    @emma58
    emma58 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    02c57e5 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Allowing for arbitrary univariate constraints

    @emma58
    emma58 committed May 3, 2023
    Configuration menu
    Copy the full SHA
    3153386 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. Prepopulating the bound_dict with the global scope bounds and defualt… 

    …ing to the tighter of them and the variable bounds when there's nothing better in the GDP hierarchy, adding tests
    @emma58
    emma58 committed May 4, 2023
    Configuration menu
    Copy the full SHA
    6bd2b8d View commit details
    Browse the repository at this point in the history

  2. Adding whitespace, thanks black

    @emma58
    emma58 committed May 4, 2023
    Configuration menu
    Copy the full SHA
    7011bed View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Merge branch 'main' into gdp-bound-pretransformation

    @emma58
    emma58 committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7a37a60 View commit details
    Browse the repository at this point in the history

  2. Not deactivating global constraints

    @emma58
    emma58 committed May 5, 2023
    Configuration menu
    Copy the full SHA
    8569f51 View commit details
    Browse the repository at this point in the history

  3. Settling on a name since I didn't actually do the general thing yet

    @emma58
    emma58 committed May 5, 2023
    Configuration menu
    Copy the full SHA
    aac9a97 View commit details
    Browse the repository at this point in the history

  4. Removing trailing whitespace

    @emma58
    emma58 committed May 5, 2023
    Configuration menu
    Copy the full SHA
    c3b89c7 View commit details
    Browse the repository at this point in the history

  5. Fixing a typo

    @emma58
    emma58 committed May 5, 2023
    Configuration menu
    Copy the full SHA
    6c8d0ef View commit details
    Browse the repository at this point in the history

  6. Adding another test because I was feeling (needlessly) insecure about… 

    … relying on the leaves of the GDP tree
    @emma58
    emma58 committed May 5, 2023
    Configuration menu
    Copy the full SHA
    d44ce3b View commit details
    Browse the repository at this point in the history

  7. Caching bounds when we have to go up the tree to find them

    @emma58
    emma58 committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7393b69 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Merge branch 'main' into gdp-bound-pretransformation

    @emma58
    emma58 authored May 16, 2023
    Configuration menu
    Copy the full SHA
    0c52532 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Removing special case for when constraint body is a Var

    @emma58
    emma58 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    9f332f6 View commit details
    Browse the repository at this point in the history

  2. Not walking trees for constraints with more than one variable

    @emma58
    emma58 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    ef912e3 View commit details
    Browse the repository at this point in the history

  3. Handling fixed variables correctly

    @emma58
    emma58 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    2f64805 View commit details
    Browse the repository at this point in the history

  4. Renaming the _select_tigher_bounds function since it doesn't actually… 

    … do anything about tightness, it just finds the non-None bound if there is one
    @emma58
    emma58 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    4056523 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'gdp-bound-pretransformation' of github.com:emma58/pyomo… 

    … into gdp-bound-pretransformation
    @emma58
    emma58 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    ad06a88 View commit details
    Browse the repository at this point in the history

  6. Whoops, I forgot about black

    @emma58
    emma58 committed May 17, 2023
    Configuration menu
    Copy the full SHA
    9c7001d View commit details
    Browse the repository at this point in the history