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

Adding logical_to_disjunctive, moving GDP transformations from logical-to-linear to logical-to-disjunctive #2627

Merged
merged 57 commits into from
Dec 6, 2022
Merged

Adding logical_to_disjunctive, moving GDP transformations from logical-to-linear to logical-to-disjunctive #2627

merged 57 commits into from
Dec 6, 2022

Commits on Nov 11, 2022

  1. Beginnings of new to-CNF walker for logical to linear

    @emma58
    emma58 committed Nov 11, 2022
    Configuration menu
    Copy the full SHA
    1e911c5 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2022

  1. Implementing the remaining handlers

    @emma58
    emma58 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    d2c3e4c View commit details
    Browse the repository at this point in the history

  2. Adding tests for the logical to linear visitor

    @emma58
    emma58 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    ee91da8 View commit details
    Browse the repository at this point in the history

  3. Realizing that I don't yet know how to handle non-constant first argu… 

    …ments to atmost atleast and exactly
    @emma58
    emma58 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    45ccf5c View commit details
    Browse the repository at this point in the history

  4. Rewrite of logical to linear transformation with new walker. No idea … 

    …if it works yet because tests need rewriting too
    @emma58
    emma58 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    bd8aa88 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into logical-to-linear-rewrite

    @emma58
    emma58 committed Nov 17, 2022
    Configuration menu
    Copy the full SHA
    3ace928 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2022

  1. Reverting core.logical_to_linear transformation

    @emma58
    emma58 committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    102319c View commit details
    Browse the repository at this point in the history

  2. Deprecating logical to linear

    @emma58
    emma58 committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    52700a8 View commit details
    Browse the repository at this point in the history

  3. Renaming the new logical_to_linear to be logical_to_disjunctive

    @emma58
    emma58 committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    f01f8e5 View commit details
    Browse the repository at this point in the history

  4. Nothing to see here...

    @emma58
    emma58 committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    b90024d View commit details
    Browse the repository at this point in the history

  5. Punting on non-integer args to atmost atleast and exactly

    @emma58
    emma58 committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    711cff6 View commit details
    Browse the repository at this point in the history

  6. Adding more tests

    @emma58
    emma58 committed Nov 18, 2022
    Configuration menu
    Copy the full SHA
    36d68d4 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2022

  1. Cleaning up and testing the logical-to-disjunctive transformation

    @emma58
    emma58 committed Nov 19, 2022
    Configuration menu
    Copy the full SHA
    27f808a View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2022

  1. Need to figure out which comes first: logical to linear or preprocess… 

    …ing targets...
    @emma58
    emma58 committed Nov 20, 2022
    Configuration menu
    Copy the full SHA
    4a548c9 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2022

  1. Logical to disjunctive descends into Disjuncts

    @emma58
    emma58 committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    63afe4e View commit details
    Browse the repository at this point in the history

  2. BigM transformation calls logical to disjunctive, starting to fix tests

    @emma58
    emma58 committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    9af5a82 View commit details
    Browse the repository at this point in the history

  3. Having native types compare as equal without having the same class in… 

    … assertExpressionsStructurallyEqual (so that the same number as an int and as a float is equal)
    @emma58
    emma58 committed Nov 21, 2022
    Configuration menu
    Copy the full SHA
    b40922f View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2022

  1. Removing debugging

    @emma58
    emma58 committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    ae09b77 View commit details
    Browse the repository at this point in the history

  2. Correctly calculating targets for logical to disjunctive call from bigm

    @emma58
    emma58 committed Nov 23, 2022
    Configuration menu
    Copy the full SHA
    efb997e View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2022

  1. Rewriting bigm test testing that logical constraints are transformed

    @emma58
    emma58 committed Nov 24, 2022
    Configuration menu
    Copy the full SHA
    1d6f706 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2022

  1. Switching hull to use logical_to_disjunctive and rewriting the corres… 

    …ponding test
    @emma58
    emma58 committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    81861b7 View commit details
    Browse the repository at this point in the history

  2. Switching multiple bigm to logical_to_disjunctive, rewriting the test

    @emma58
    emma58 committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    5085bf1 View commit details
    Browse the repository at this point in the history

  3. Updating comment

    @emma58
    emma58 committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    6e33f83 View commit details
    Browse the repository at this point in the history

  4. Removing special handling for _DeprecatedImplicitBinaryVariables in G… 

    …DP transformations because logical_to_disjunctive doesn't create them.
    @emma58
    emma58 committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    9763f09 View commit details
    Browse the repository at this point in the history

  5. Removing unncessary check for sympy

    @emma58
    emma58 committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    f8ef97f View commit details
    Browse the repository at this point in the history

  6. Merging main

    @emma58
    emma58 committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    74caa9a View commit details
    Browse the repository at this point in the history

  7. Having fix_disjuncts call bigm by defualt after it calls logical_to_d… 

    …isjunctive, but making an option for another transformation if desired
    @emma58
    emma58 committed Nov 25, 2022
    Configuration menu
    Copy the full SHA
    1c5c970 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2022

  1. Merge branch 'main' into logical-to-linear-rewrite

    @jsiirola
    jsiirola committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    3c17da5 View commit details
    Browse the repository at this point in the history

  2. resolving merge conflicts

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    ca0a2b1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'logical-to-linear-rewrite' of github.com:emma58/pyomo i… 

    …nto logical-to-linear-rewrite
    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    b5de277 View commit details
    Browse the repository at this point in the history

  4. Switching branch and bound to call logical_to_disjunctive

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    0e2b82c View commit details
    Browse the repository at this point in the history

  5. Don't need to skip tests based on sympy

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    5fa4944 View commit details
    Browse the repository at this point in the history

  6. Switching the OA algorithms to logical_to_disjunctive

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    afe4ec0 View commit details
    Browse the repository at this point in the history

  7. Better debugging output in GDPopt

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    0b962c4 View commit details
    Browse the repository at this point in the history

  8. We cannot fix variables in the logical-to-disjunctive walker because … 

    …fixing is not interpreted as a constraint by GDP, so there it no way to relax that constraint. Switchsing fixing to a >= 1 constraint, which is valid always (because it will be properly relaxed by GDP transformations
    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    2372f6a View commit details
    Browse the repository at this point in the history

  9. Fixing tests after the change for constraining the expression to be t… 

    …rue rather than fixing it
    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    b9b886c View commit details
    Browse the repository at this point in the history

  10. Fixing bigm tests to not assume binaries are fixed

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    020c3f4 View commit details
    Browse the repository at this point in the history

  11. fixing multiple bigm tests

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    3154dc5 View commit details
    Browse the repository at this point in the history

  12. Testing the constraints requiring logical stuff to be true in hull

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    420d14a View commit details
    Browse the repository at this point in the history

  13. Allowing duck typing in before child handlers

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    a88b395 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into logical-to-linear-rewrite

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    8251de2 View commit details
    Browse the repository at this point in the history

  15. Not registering logical_to_linear with the rest of the core transform… 

    …ations
    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    1669eb1 View commit details
    Browse the repository at this point in the history

  16. Registering the logical to disjunctive transformation when you import… 

    … contrib.cp
    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    dcfb7ff View commit details
    Browse the repository at this point in the history

  17. Adding a greatly missed init file

    @emma58
    emma58 committed Nov 28, 2022
    Configuration menu
    Copy the full SHA
    857cdc5 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. Defer populating element_getattr_dispatcher until cp has been imported

    @jsiirola
    jsiirola committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    5b53c50 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into logical-to-linear-rewrite

    @jsiirola
    jsiirola committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    96c4dc5 View commit details
    Browse the repository at this point in the history

  3. Resolve merge error

    @jsiirola
    jsiirola committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    013a007 View commit details
    Browse the repository at this point in the history

  4. Fix recursion when resolving docplex.cp module

    @jsiirola
    jsiirola committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    706865d View commit details
    Browse the repository at this point in the history

  5. Add context manager interface (required by pyomo script)

    @jsiirola
    jsiirola committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    245b3ca View commit details
    Browse the repository at this point in the history

  6. Restoring registration of core.logical_to_linear; reverting 245b3ca

    @jsiirola
    jsiirola committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    e635433 View commit details
    Browse the repository at this point in the history

  7. Update deprecation of core.loogical_to_linear

    @jsiirola
    jsiirola committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    79fb642 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2022

  1. Defer populating dispatchers until docplex is loaded

    @jsiirola
    jsiirola committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    dcd3179 View commit details
    Browse the repository at this point in the history

  2. Update test to explicitly call logical_to_linear

    @jsiirola
    jsiirola committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    88b9d41 View commit details
    Browse the repository at this point in the history

  3. Updating documentation

    @jsiirola
    jsiirola committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    600996a View commit details
    Browse the repository at this point in the history

  4. Use \veebar for \underline{\lor}

    @jsiirola
    jsiirola committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    971ddc5 View commit details
    Browse the repository at this point in the history

  5. Registering contrib.cp plugins with pyomo.environ

    @jsiirola
    jsiirola committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    a9c6b2b View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. Un-deprecating logical to linear (as a whole)

    @emma58
    emma58 committed Dec 5, 2022
    Configuration menu
    Copy the full SHA
    5e885ca View commit details
    Browse the repository at this point in the history