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 1 opt #1536

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

Add 1 opt #1536

wants to merge 39 commits into from

Commits on Dec 4, 2023

  1. Replaced hard-coded char values in MIP calls

    @jajhall
    jajhall committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    61618f3 View commit details
    Browse the repository at this point in the history

  2. Added key to Src column in MIP logging

    @jajhall
    jajhall committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    80ab3b8 View commit details
    Browse the repository at this point in the history

  3. Renamed source to solution_source for MIP solver

    @jajhall
    jajhall committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    b352198 View commit details
    Browse the repository at this point in the history

  4. Formatted

    @jajhall
    jajhall committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    db09887 View commit details
    Browse the repository at this point in the history

  5. Now to define methods to test column and row feasiblilty for a solution

    @jajhall
    jajhall committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    9fcecc3 View commit details
    Browse the repository at this point in the history

  6. Introduced HighsMipSolverData::solutionColFeasible and HighsMipSolver… 

    …Data::solutionRowFeasible to reduce duplicated code
    @jajhall
    jajhall committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    bfa509f View commit details
    Browse the repository at this point in the history

  7. Introduced HighsMipSolverData::solutionColFeasible and HighsMipSolver… 

    …Data::solutionRowFeasible to reduce duplicated code; formatted
    @jajhall
    jajhall committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    c98bb8a View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Four trivial heuristics implemented for IP: little apparent value

    @jajhall
    jajhall committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    b00117d View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Now understand where sub-MIPs come from and set up prototype trivial … 

    …heuristics data
    @jajhall
    jajhall committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    c9277c5 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Learned that sub-MIPs can have sub-MIPS. Now to move trivial heuristi… 

    …cs code and calls
    @jajhall
    jajhall committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    969189b View commit details
    Browse the repository at this point in the history

  2. Eliminated segfault

    @jajhall
    jajhall committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    75cf894 View commit details
    Browse the repository at this point in the history

  3. Now accounting for all trivial heuristic attempts

    @jajhall
    jajhall committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    c502450 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Add submip level tracking

    @jajhall
    jajhall committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    34a6674 View commit details
    Browse the repository at this point in the history

  2. Renaming trivial_heuristics_data_ and copy/flushTrivialHeuristicsStat… 

    …istics
    @jajhall
    jajhall committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    6700cfd View commit details
    Browse the repository at this point in the history

  3. Still cannot pass trivial_heuristics_statistics up and down!

    @jajhall
    jajhall committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    7aef9f3 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2023

  1. WIP

    @jajhall
    jajhall committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    49cc4f8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'latest' into add-trivial-heuristic

    @jajhall
    jajhall committed Dec 10, 2023
    Configuration menu
    Copy the full SHA
    1ca35f3 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. ctest passes with trivial heuristics running

    @jajhall
    jajhall committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    f0ea1f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'latest' into add-1-opt

    @jajhall
    jajhall committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    68072ec View commit details
    Browse the repository at this point in the history

  3. Merged add-trivial-heuristic into this branch

    @jajhall
    jajhall committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    d6657dd View commit details
    Browse the repository at this point in the history

  4. Removed trivial heuristics code from this branch

    @jajhall
    jajhall committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4a727ff View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Introduced HighsMipSolverData::assessIntegerFeasibleSolution as inter… 

    …im call to addIncumbent
    @jajhall
    jajhall committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    044ffb0 View commit details
    Browse the repository at this point in the history

  2. Now ready to add first level of opt-1

    @jajhall
    jajhall committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2e8df5e View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Queried Leona about return value from addIncumbent, and added print s… 

    …tatements to flag up questionable cases
    @jajhall
    jajhall committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    0ed5046 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Reworked as line search

    @jajhall
    jajhall committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    18a5a66 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. bell5 now giving large changes again

    @jajhall
    jajhall committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    5eae6eb View commit details
    Browse the repository at this point in the history

  2. Now to eliminate recursion depth for 1-opt

    @jajhall
    jajhall committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    cd1c931 View commit details
    Browse the repository at this point in the history

  3. Check that MIP solver isn't broken before proceeding

    @jajhall
    jajhall committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    40cc9ac View commit details
    Browse the repository at this point in the history

  4. Formatted

    @jajhall
    jajhall committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    1bbfcaa View commit details
    Browse the repository at this point in the history

  5. added return to HighsMipSolverData::solutionStatusToString

    @jajhall
    jajhall committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    a95a8a1 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2023

  1. Now handling solution_status as an enum

    @jajhall
    jajhall committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    f1ac4df View commit details
    Browse the repository at this point in the history

  2. 1-opt now in own method

    @jajhall
    jajhall committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    4824981 View commit details
    Browse the repository at this point in the history

  3. 2-opt now in own method

    @jajhall
    jajhall committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    e18534f View commit details
    Browse the repository at this point in the history

  4. Testing 1-opt

    @jajhall
    jajhall committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    1c9de68 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2023

  1. Rather better attention to numerical detail

    @jajhall
    jajhall committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    dc7ae54 View commit details
    Browse the repository at this point in the history

  2. Stop trying to move to edge of row infeasiblility

    @jajhall
    jajhall committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    91a6e3e View commit details
    Browse the repository at this point in the history

  3. Stop trying to move to edge of row infeasiblility

    @jajhall
    jajhall committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    755896f View commit details
    Browse the repository at this point in the history

  4. Now considering candidates by decreasing |cost| in 1-opt

    @jajhall
    jajhall committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    bd2fc3a View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Merged latest into this branch

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