Code

Add lazy constraints#1636

Code

Draft

jajhall wants to merge 70 commits intolatestERGO-Code/HiGHS:latestfrom add-lazy-constraintsERGO-Code/HiGHS:add-lazy-constraintsCopy head branch name to clipboard

+1,411-1,052

Commits

Commits on Feb 8, 2024

• Avoid duplication with Highs::startCallback(const int callback_type) and Highs::startCallback(const HighsCallbackType callback_type)

  jajhall

  committed
  bdf0d2a

• Now switching off presolve when lazy constraints are permitted

  jajhall

  committed
  3b4cbfd

• Now calling user_callback in HighsMipSolverData::defineLazyConstraints

  jajhall

  committed
  900be85

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

  jajhall

  committed
  3e917ed

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

  jajhall

  committed
  2b1a92a

• Now extracting tours from MIP solution

  jajhall

  committed
  04eef96

• Now forming cutset in userDefineLazyConstraints

  jajhall

  committed
  76277db

• Now defining lazy constraints as HighsCutSet in defineLazyConstraints

  jajhall

  committed
  7fca5fe

Commits on Feb 9, 2024

• Added first lazy constraints to LP relaxation, but need to be in the cutpool, too

  jajhall

  committed
  8c33e07

Commits on Feb 10, 2024

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  fe6127a

Commits on Feb 11, 2024

• Corrected a couple of printf errors when using HIGHSINT64

  jajhall

  committed
  b844212

Commits on Feb 16, 2024

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  25f0e31

• Now adding lazy constraints to cutpool and LP

  jajhall

  committed
  c9c0588

• Need to define whether new lazy constraints have been defined to avoid misleading warning

  jajhall

  committed
  5f743b0

• Avoiding error report if lazy constraints are added

  jajhall

  committed
  e94ce1f

Commits on Feb 17, 2024

• Solves p01

  jajhall

  committed
  8e8f52b

Commits on Feb 18, 2024

• Need to learn more about the cut pool

  jajhall

  committed
  87f63ed

• Added origin to HighsCutPool::addCut

  jajhall

  committed
  3966c47

• Now reporting the cut pool

  jajhall

  committed
  5061eca

Commits on Feb 19, 2024

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  6448614

• Fixed error spotted by Derya in writeModelAsMps

  jajhall

  committed
  cc5aa90

• Need to get better idea of LP relaxation

  jajhall

  committed
  ad4c409

• Better to distinguish my origin as debug_origin

  jajhall

  committed
  25ed626

• Move HighsCutPool::debugOriginString to HighsMipSolver and distinguish name

  jajhall

  committed
  088ae2c

• Move HighsCutPool::debugOriginString to HighsMipSolver and distinguish name

  jajhall

  committed
  cfe38ed

• Moved HighsCutPool::debugOriginString to HighsMipSolver as debugCutOriginToString

  jajhall

  committed
  a3fccbb

• Rationalised HighsLpRelaxation::debugReport and HighsCutPool::debugReport

  jajhall

  committed
  69a6dfb

Commits on Feb 23, 2024

• Introduced inLp to HighsCutPool::addCut

  jajhall

  committed
  67933d1

• Removed debug printing

  jajhall

  committed
  bdca318

• Formatted and solving TSP p01 again

  jajhall

  committed
  e1c98b3

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  6197f89

• Further reversions; formatted

  jajhall

  committed
  9ede661

Commits on Feb 24, 2024

• Added getNumLpCuts() to HighsCutPool

  jajhall

  committed
  b4d86ed

• Added skeleton HighsLpRelaxation::addModelConstraints

  jajhall

  committed
  0b31a34

Commits on Feb 25, 2024

• Started adding lazy constraints to model after presolve and LP relaxation

  jajhall

  committed
  0855037

• Where is the presolved model for modificaiton?

  jajhall

  committed
  f85c0d2

Commits on Feb 26, 2024

• Now inserting lazy constraints as rows

  jajhall

  committed
  aac4702

• Now to fix domain activities

  jajhall

  committed
  79c5e9c

• Getting further through p01

  jajhall

  committed
  a1fdd40

• Rename kCutOrigin kLpRowOrigin

  jajhall

  committed
  68fc421

• enum cutOrigin* now enum lpRowOrigin

  jajhall

  committed
  16f6a2c

• Added dantzig.tsp and added return to bool HighsLpRelaxation::addModelConstraints

  jajhall

  committed
  9002d58

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  8a3a97f

• Solving dantzig.tsp

  jajhall

  committed
  e42dce5

Commits on Feb 27, 2024

• Now maintaining the model and lpsolver model OK

  jajhall

  committed
  aad4f36

Commits on Feb 28, 2024

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  290f919

Commits on Mar 1, 2024

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  50c6e15

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  f3e1ae3

• Fixed long-standing bug in Highs::getCols and Highs::getRows

  jajhall

  committed
  8bb59b2

• Now failing after insertion of lazy constraints befor cuts

  jajhall

  committed
  87a5ff4

Commits on Mar 2, 2024

• Now seems to be inserting lazy constraints correctly

  jajhall

  committed
  ffefa3f

• Progress: now to track down invalid read of size 1

  jajhall

  committed
  c1a5a5e

• firstrootbasis now resized OK

  jajhall

  committed
  cb81a81

• Removed code relating to lazy constraints as cuts, and HighsLpRelaxation::addCuts always clears cutset (again)

  jajhall

  committed
  bc3afb7

• Removed debug assert

  jajhall

  committed
  cd415b8

• Avoiding CI failure in unit tests LP-getrows LP-getcols where 1 is ambiguous

  jajhall

  committed
  98a445f

• Another try

  jajhall

  committed
  6e4bf33

• Can't use null test

  jajhall

  committed
  486f89a

• Eliminated the 1-row/col test in TestLpModification

  jajhall

  committed
  54dda95

Commits on Mar 3, 2024

• Chasing the CI failure

  jajhall

  committed
  eae13f7

• Chasing the CI failure

  jajhall

  committed
  4170068

• Formatted

  jajhall

  committed
  dffd97d

Commits on Mar 4, 2024

• Institutionalised possiblyResetLocalDomain

  jajhall

  committed
  87aaff7

• Added possiblyResetLocalDomain after addIncumbent calls in HighsSearch::selectBranchingCandidate

  jajhall

  committed
  ddc6893

• Cannot assume Highs::getIterate() will be OK

  jajhall

  committed
  800f851

• OK to abandon getIterate

  jajhall

  committed
  71440a2

Commits on Mar 7, 2024

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  dd6042d

• Removed some incorrect asserts

  jajhall

  committed
  5cc96b8

• Merged latest into this branch; formatted

  jajhall

  committed
  321e578

Commits on Mar 13, 2024

• Merge branch 'latest' into add-lazy-constraints

  jajhall

  committed
  ff3135a