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 lazy constraints #1636

Draft
wants to merge 70 commits into
base: latest
Choose a base branch
from
Draft

Add lazy constraints #1636

wants to merge 70 commits into from

Commits on Feb 8, 2024

  1. Avoid duplication with Highs::startCallback(const int callback_type) … 

    …and Highs::startCallback(const HighsCallbackType callback_type)
    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    bdf0d2a View commit details
    Browse the repository at this point in the history

  2. Now switching off presolve when lazy constraints are permitted

    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    3b4cbfd View commit details
    Browse the repository at this point in the history

  3. Now calling user_callback in HighsMipSolverData::defineLazyConstraints

    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    900be85 View commit details
    Browse the repository at this point in the history

  4. tsp-p01 now uses p01.tsp and includes tsp.cpp

    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    3e917ed View commit details
    Browse the repository at this point in the history

  5. Replaced ../check/instances/p01.mps by ../check/instances/p01.tsp

    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    2b1a92a View commit details
    Browse the repository at this point in the history

  6. Now extracting tours from MIP solution

    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    04eef96 View commit details
    Browse the repository at this point in the history

  7. Now forming cutset in userDefineLazyConstraints

    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    76277db View commit details
    Browse the repository at this point in the history

  8. Now defining lazy constraints as HighsCutSet in defineLazyConstraints

    @jajhall
    jajhall committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    7fca5fe View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. Added first lazy constraints to LP relaxation, but need to be in the … 

    …cutpool, too
    @jajhall
    jajhall committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    8c33e07 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    fe6127a View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. Corrected a couple of printf errors when using HIGHSINT64

    @jajhall
    jajhall committed Feb 11, 2024
    Configuration menu
    Copy the full SHA
    b844212 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    25f0e31 View commit details
    Browse the repository at this point in the history

  2. Now adding lazy constraints to cutpool and LP

    @jajhall
    jajhall committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    c9c0588 View commit details
    Browse the repository at this point in the history

  3. Need to define whether new lazy constraints have been defined to avoi… 

    …d misleading warning
    @jajhall
    jajhall committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    5f743b0 View commit details
    Browse the repository at this point in the history

  4. Avoiding error report if lazy constraints are added

    @jajhall
    jajhall committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    e94ce1f View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2024

  1. Solves p01

    @jajhall
    jajhall committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    8e8f52b View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. Need to learn more about the cut pool

    @jajhall
    jajhall committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    87f63ed View commit details
    Browse the repository at this point in the history

  2. Added origin to HighsCutPool::addCut

    @jajhall
    jajhall committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    3966c47 View commit details
    Browse the repository at this point in the history

  3. Now reporting the cut pool

    @jajhall
    jajhall committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    5061eca View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    6448614 View commit details
    Browse the repository at this point in the history

  2. Fixed error spotted by Derya in writeModelAsMps

    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    cc5aa90 View commit details
    Browse the repository at this point in the history

  3. Need to get better idea of LP relaxation

    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    ad4c409 View commit details
    Browse the repository at this point in the history

  4. Better to distinguish my origin as debug_origin

    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    25ed626 View commit details
    Browse the repository at this point in the history

  5. Move HighsCutPool::debugOriginString to HighsMipSolver and distinguis… 

    …h name
    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    088ae2c View commit details
    Browse the repository at this point in the history

  6. Move HighsCutPool::debugOriginString to HighsMipSolver and distinguis… 

    …h name
    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    cfe38ed View commit details
    Browse the repository at this point in the history

  7. Moved HighsCutPool::debugOriginString to HighsMipSolver as debugCutOr… 

    …iginToString
    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    a3fccbb View commit details
    Browse the repository at this point in the history

  8. Rationalised HighsLpRelaxation::debugReport and HighsCutPool::debugRe… 

    …port
    @jajhall
    jajhall committed Feb 19, 2024
    Configuration menu
    Copy the full SHA
    69a6dfb View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Introduced inLp to HighsCutPool::addCut

    @jajhall
    jajhall committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    67933d1 View commit details
    Browse the repository at this point in the history

  2. Removed debug printing

    @jajhall
    jajhall committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    bdca318 View commit details
    Browse the repository at this point in the history

  3. Formatted and solving TSP p01 again

    @jajhall
    jajhall committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    e1c98b3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    6197f89 View commit details
    Browse the repository at this point in the history

  5. Further reversions; formatted

    @jajhall
    jajhall committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    9ede661 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Added getNumLpCuts() to HighsCutPool

    @jajhall
    jajhall committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    b4d86ed View commit details
    Browse the repository at this point in the history

  2. Added skeleton HighsLpRelaxation::addModelConstraints

    @jajhall
    jajhall committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0b31a34 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Started adding lazy constraints to model after presolve and LP relaxa… 

    …tion
    @jajhall
    jajhall committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    0855037 View commit details
    Browse the repository at this point in the history

  2. Where is the presolved model for modificaiton?

    @jajhall
    jajhall committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    f85c0d2 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Now inserting lazy constraints as rows

    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    aac4702 View commit details
    Browse the repository at this point in the history

  2. Now to fix domain activities

    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    79c5e9c View commit details
    Browse the repository at this point in the history

  3. Getting further through p01

    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    a1fdd40 View commit details
    Browse the repository at this point in the history

  4. Rename kCutOrigin kLpRowOrigin

    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    68fc421 View commit details
    Browse the repository at this point in the history

  5. enum cutOrigin* now enum lpRowOrigin

    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    16f6a2c View commit details
    Browse the repository at this point in the history

  6. Added dantzig.tsp and added return to bool HighsLpRelaxation::addMode… 

    …lConstraints
    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    9002d58 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    8a3a97f View commit details
    Browse the repository at this point in the history

  8. Solving dantzig.tsp

    @jajhall
    jajhall committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    e42dce5 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. Now maintaining the model and lpsolver model OK

    @jajhall
    jajhall committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    aad4f36 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    290f919 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    50c6e15 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f3e1ae3 View commit details
    Browse the repository at this point in the history

  3. Fixed long-standing bug in Highs::getCols and Highs::getRows

    @jajhall
    jajhall committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    8bb59b2 View commit details
    Browse the repository at this point in the history

  4. Now failing after insertion of lazy constraints befor cuts

    @jajhall
    jajhall committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    87a5ff4 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. Now seems to be inserting lazy constraints correctly

    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    ffefa3f View commit details
    Browse the repository at this point in the history

  2. Progress: now to track down invalid read of size 1

    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    c1a5a5e View commit details
    Browse the repository at this point in the history

  3. firstrootbasis now resized OK

    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    cb81a81 View commit details
    Browse the repository at this point in the history

  4. Removed code relating to lazy constraints as cuts, and HighsLpRelaxat… 

    …ion::addCuts always clears cutset (again)
    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    bc3afb7 View commit details
    Browse the repository at this point in the history

  5. Removed debug assert

    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    cd415b8 View commit details
    Browse the repository at this point in the history

  6. Avoiding CI failure in unit tests LP-getrows LP-getcols where 1 is am… 

    …biguous
    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    98a445f View commit details
    Browse the repository at this point in the history

  7. Another try

    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    6e4bf33 View commit details
    Browse the repository at this point in the history

  8. Can't use null test

    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    486f89a View commit details
    Browse the repository at this point in the history

  9. Eliminated the 1-row/col test in TestLpModification

    @jajhall
    jajhall committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    54dda95 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Chasing the CI failure

    @jajhall
    jajhall committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    eae13f7 View commit details
    Browse the repository at this point in the history

  2. Chasing the CI failure

    @jajhall
    jajhall committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    4170068 View commit details
    Browse the repository at this point in the history

  3. Formatted

    @jajhall
    jajhall committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    dffd97d View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Institutionalised possiblyResetLocalDomain

    @jajhall
    jajhall committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    87aaff7 View commit details
    Browse the repository at this point in the history

  2. Added possiblyResetLocalDomain after addIncumbent calls in HighsSearc… 

    …h::selectBranchingCandidate
    @jajhall
    jajhall committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    ddc6893 View commit details
    Browse the repository at this point in the history

  3. Cannot assume Highs::getIterate() will be OK

    @jajhall
    jajhall committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    800f851 View commit details
    Browse the repository at this point in the history

  4. OK to abandon getIterate

    @jajhall
    jajhall committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    71440a2 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    dd6042d View commit details
    Browse the repository at this point in the history

  2. Removed some incorrect asserts

    @jajhall
    jajhall committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    5cc96b8 View commit details
    Browse the repository at this point in the history

  3. Merged latest into this branch; formatted

    @jajhall
    jajhall committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    321e578 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2024

  1. Merge branch 'latest' into add-lazy-constraints

    @jajhall
    jajhall committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    ff3135a View commit details
    Browse the repository at this point in the history