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

Add lazy constraints #1636

Closed
wants to merge 70 commits into from
Closed

Add lazy constraints #1636

Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
bdf0d2a
Avoid duplication with Highs::startCallback(const int callback_type) …
jajhall Feb 8, 2024
3b4cbfd
Now switching off presolve when lazy constraints are permitted
jajhall Feb 8, 2024
900be85
Now calling user_callback in HighsMipSolverData::defineLazyConstraints
jajhall Feb 8, 2024
3e917ed
tsp-p01 now uses p01.tsp and includes tsp.cpp
jajhall Feb 8, 2024
2b1a92a
Replaced ../check/instances/p01.mps by ../check/instances/p01.tsp
jajhall Feb 8, 2024
04eef96
Now extracting tours from MIP solution
jajhall Feb 8, 2024
76277db
Now forming cutset in userDefineLazyConstraints
jajhall Feb 8, 2024
7fca5fe
Now defining lazy constraints as HighsCutSet in defineLazyConstraints
jajhall Feb 8, 2024
8c33e07
Added first lazy constraints to LP relaxation, but need to be in the …
jajhall Feb 9, 2024
fe6127a
Merge branch 'latest' into add-lazy-constraints
jajhall Feb 10, 2024
b844212
Corrected a couple of printf errors when using HIGHSINT64
jajhall Feb 11, 2024
25f0e31
Merge branch 'latest' into add-lazy-constraints
jajhall Feb 16, 2024
c9c0588
Now adding lazy constraints to cutpool and LP
jajhall Feb 16, 2024
5f743b0
Need to define whether new lazy constraints have been defined to avoi…
jajhall Feb 16, 2024
e94ce1f
Avoiding error report if lazy constraints are added
jajhall Feb 16, 2024
8e8f52b
Solves p01
jajhall Feb 17, 2024
87f63ed
Need to learn more about the cut pool
jajhall Feb 18, 2024
3966c47
Added origin to HighsCutPool::addCut
jajhall Feb 18, 2024
5061eca
Now reporting the cut pool
jajhall Feb 18, 2024
6448614
Merge branch 'latest' into add-lazy-constraints
jajhall Feb 19, 2024
cc5aa90
Fixed error spotted by Derya in writeModelAsMps
jajhall Feb 19, 2024
ad4c409
Need to get better idea of LP relaxation
jajhall Feb 19, 2024
25ed626
Better to distinguish my origin as debug_origin
jajhall Feb 19, 2024
088ae2c
Move HighsCutPool::debugOriginString to HighsMipSolver and distinguis…
jajhall Feb 19, 2024
cfe38ed
Move HighsCutPool::debugOriginString to HighsMipSolver and distinguis…
jajhall Feb 19, 2024
a3fccbb
Moved HighsCutPool::debugOriginString to HighsMipSolver as debugCutOr…
jajhall Feb 19, 2024
69a6dfb
Rationalised HighsLpRelaxation::debugReport and HighsCutPool::debugRe…
jajhall Feb 19, 2024
67933d1
Introduced inLp to HighsCutPool::addCut
jajhall Feb 23, 2024
bdca318
Removed debug printing
jajhall Feb 23, 2024
e1c98b3
Formatted and solving TSP p01 again
jajhall Feb 23, 2024
6197f89
Merge branch 'latest' into add-lazy-constraints
jajhall Feb 23, 2024
9ede661
Further reversions; formatted
jajhall Feb 23, 2024
b4d86ed
Added getNumLpCuts() to HighsCutPool
jajhall Feb 24, 2024
0b31a34
Added skeleton HighsLpRelaxation::addModelConstraints
jajhall Feb 24, 2024
0855037
Started adding lazy constraints to model after presolve and LP relaxa…
jajhall Feb 25, 2024
f85c0d2
Where is the presolved model for modificaiton?
jajhall Feb 25, 2024
aac4702
Now inserting lazy constraints as rows
jajhall Feb 26, 2024
79c5e9c
Now to fix domain activities
jajhall Feb 26, 2024
a1fdd40
Getting further through p01
jajhall Feb 26, 2024
68fc421
Rename kCutOrigin kLpRowOrigin
jajhall Feb 26, 2024
16f6a2c
enum cutOrigin* now enum lpRowOrigin
jajhall Feb 26, 2024
9002d58
Added dantzig.tsp and added return to bool HighsLpRelaxation::addMode…
jajhall Feb 26, 2024
8a3a97f
Merge branch 'latest' into add-lazy-constraints
jajhall Feb 26, 2024
e42dce5
Solving dantzig.tsp
jajhall Feb 26, 2024
aad4f36
Now maintaining the model and lpsolver model OK
jajhall Feb 27, 2024
290f919
Merge branch 'latest' into add-lazy-constraints
jajhall Feb 28, 2024
50c6e15
Merge branch 'latest' into add-lazy-constraints
jajhall Mar 1, 2024
f3e1ae3
Merge branch 'latest' into add-lazy-constraints
jajhall Mar 1, 2024
8bb59b2
Fixed long-standing bug in Highs::getCols and Highs::getRows
jajhall Mar 1, 2024
87a5ff4
Now failing after insertion of lazy constraints befor cuts
jajhall Mar 1, 2024
ffefa3f
Now seems to be inserting lazy constraints correctly
jajhall Mar 2, 2024
c1a5a5e
Progress: now to track down invalid read of size 1
jajhall Mar 2, 2024
cb81a81
firstrootbasis now resized OK
jajhall Mar 2, 2024
bc3afb7
Removed code relating to lazy constraints as cuts, and HighsLpRelaxat…
jajhall Mar 2, 2024
cd415b8
Removed debug assert
jajhall Mar 2, 2024
98a445f
Avoiding CI failure in unit tests LP-getrows LP-getcols where 1 is am…
jajhall Mar 2, 2024
6e4bf33
Another try
jajhall Mar 2, 2024
486f89a
Can't use null test
jajhall Mar 2, 2024
54dda95
Eliminated the 1-row/col test in TestLpModification
jajhall Mar 2, 2024
eae13f7
Chasing the CI failure
jajhall Mar 3, 2024
4170068
Chasing the CI failure
jajhall Mar 3, 2024
dffd97d
Formatted
jajhall Mar 3, 2024
87aaff7
Institutionalised possiblyResetLocalDomain
jajhall Mar 4, 2024
ddc6893
Added possiblyResetLocalDomain after addIncumbent calls in HighsSearc…
jajhall Mar 4, 2024
800f851
Cannot assume Highs::getIterate() will be OK
jajhall Mar 4, 2024
71440a2
OK to abandon getIterate
jajhall Mar 4, 2024
dd6042d
Merge branch 'latest' into add-lazy-constraints
jajhall Mar 7, 2024
5cc96b8
Removed some incorrect asserts
jajhall Mar 7, 2024
321e578
Merged latest into this branch; formatted
jajhall Mar 7, 2024
ff3135a
Merge branch 'latest' into add-lazy-constraints
jajhall Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'latest' into add-lazy-constraints
  • Loading branch information
@jajhall
jajhall committed Feb 19, 2024
commit 64486148d7ffd48716c765e971afe9d424e54ba8

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.