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

Add SCIP Persistent Support #3200

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open

Add SCIP Persistent Support #3200

wants to merge 33 commits into from
+1,641 −2

Commits on Mar 18, 2024

  1. Add first draft of SCIP persistent solving

    @Opt-Mucca
    Opt-Mucca committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    e552439 View commit details
    Browse the repository at this point in the history

  2. Add SCIPPersistent to docs

    @Opt-Mucca
    Opt-Mucca committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6a14f10 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Add SCIp to Github action scripts

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    c107909 View commit details
    Browse the repository at this point in the history

  2. Remove 5.0.0 specific version. Add conda to workflow

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    e00ded8 View commit details
    Browse the repository at this point in the history

  3. Standardise string formatting to fstring

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    a0b6250 View commit details
    Browse the repository at this point in the history

  4. Add parameter link to docstring

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    d0816eb View commit details
    Browse the repository at this point in the history

  5. Remove redundant second objective sense check

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    0e11f11 View commit details
    Browse the repository at this point in the history

  6. Clean up _post_solve with a helper function for status handling

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    068ec99 View commit details
    Browse the repository at this point in the history

  7. Remove individual skip_test option

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    63af6d8 View commit details
    Browse the repository at this point in the history

  8. Update pyomo/solvers/plugins/solvers/scip_persistent.py 

    Co-authored-by: Miranda Mundt <[email protected]>
    @Opt-Mucca @mrmundt
    Opt-Mucca and mrmundt authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    4075d9a View commit details
    Browse the repository at this point in the history

  9. Update from the black command

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    f55fcc5 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/main'

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    e2b49b2 View commit details
    Browse the repository at this point in the history

  11. Fix typos

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    91eae7b View commit details
    Browse the repository at this point in the history

  12. Replace trySol via more safe checkSol

    @Opt-Mucca
    Opt-Mucca committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    5ee2007 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Adds support for partial solution loading

    @Opt-Mucca
    Opt-Mucca committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    f6ff092 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Add error handling for setting non-linear objective

    @Opt-Mucca
    Opt-Mucca committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    e7ac980 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge branch 'main' into main

    @Opt-Mucca
    Opt-Mucca authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    c90bb23 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. Remove dual and rc loading for SCIP. Fix bug of ranged rows

    @Opt-Mucca
    Opt-Mucca committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    2540f65 View commit details
    Browse the repository at this point in the history

  2. Add safe con.body.constant check

    @Opt-Mucca
    Opt-Mucca committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    9e5d944 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. Remove slack loading for SCIP

    @Opt-Mucca
    Opt-Mucca committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f90dfad View commit details
    Browse the repository at this point in the history

  2. Remove dual loading test for SCIP

    @Opt-Mucca
    Opt-Mucca committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    f703d1f View commit details
    Browse the repository at this point in the history

  3. Remove slack for suffix in tests

    @Opt-Mucca
    Opt-Mucca committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    5c02d32 View commit details
    Browse the repository at this point in the history

  4. Remove TODO for nonlinear handling

    @Opt-Mucca
    Opt-Mucca committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    8ebcf88 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. Merge branch 'main' into main

    @mrmundt
    mrmundt authored Apr 30, 2024
    Configuration menu
    Copy the full SHA
    236427f View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Skip LP_trivial_constraints for SCIP persistent

    @Opt-Mucca
    Opt-Mucca committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    30d8cc6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into main

    @Opt-Mucca
    Opt-Mucca authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    8d787ae View commit details
    Browse the repository at this point in the history

  3. Add transformation for add_cons with non float/int rhs e.g. np.int

    @Opt-Mucca
    Opt-Mucca committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    30e5e65 View commit details
    Browse the repository at this point in the history

  4. Add warning if type is converted. Tidy up logic

    @Opt-Mucca
    Opt-Mucca committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    9104a92 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. Merge branch 'main' into main

    @blnicho
    blnicho authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    a0324af View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Merge branch 'main' into main

    @blnicho
    blnicho authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    cbcb96d View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Merge branch 'main' into main

    @mrmundt
    mrmundt authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    fecd201 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Merge branch 'main' into pr/3200

    @blnicho
    blnicho committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    1a4663d View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2024

  1. Merge branch 'main' into main

    @blnicho
    blnicho authored Nov 19, 2024
    Configuration menu
    Copy the full SHA
    cadfe5c View commit details
    Browse the repository at this point in the history