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

highspy: updated highs_linear_expression to be immutable for issue #1888 #1891

Closed
wants to merge 53 commits into from
Closed

highspy: updated highs_linear_expression to be immutable for issue #1888 #1891

wants to merge 53 commits into from

Commits on Apr 24, 2024

  1. highspy: release python GIL when calling run

    @michaelbynum
    michaelbynum committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    c1b85ec View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. merge master into release_gil

    @michaelbynum
    michaelbynum committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    0c6cf08 View commit details
    Browse the repository at this point in the history

  2. run solve in background thread so that keyboard interrupt works

    @michaelbynum
    michaelbynum committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    e9f4235 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. merge latest into release_gil

    @michaelbynum
    michaelbynum committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    ec57e11 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. col_ecol_offset now set - as const - for greater clarity

    @jajhall
    jajhall committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    b1a7d2e View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. * changed highs_linear_expression to be immutable by default 

    * added __repr__ for easier debugging and pretty print linear expressions
* added __iadd__ for mutable operations
* added qsum for faster aggregation
* updated chained comparison support to work in immutable setting
    @mathgeekcoder
    mathgeekcoder committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    b4a0942 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Introduced examples/plot_highs_log.py and final logging line in MIP s… 

    …olver to allow complete plotting
    @jajhall
    jajhall committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    3271ee8 View commit details
    Browse the repository at this point in the history

  2. Now plotting gap

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

  3. Updated examples/plot_highs_log.py

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

  4. Moved key and using identifiers for colours to ease changes; updated … 

    …FEATURES.md
    @jajhall
    jajhall committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    4907467 View commit details
    Browse the repository at this point in the history

  5. Merge pull request ERGO-Code#1894 from ERGO-Code/MIP-log-plotter 

    Mip log plotter
    @jajhall
    jajhall authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    7ce96cb View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. Merge pull request ERGO-Code#1890 from ERGO-Code/fix-1872a 

    `col_ecol_offset` now set - as const - for greater clarity
    @jajhall
    jajhall authored Aug 26, 2024
    Configuration menu
    Copy the full SHA
    19ccf15 View commit details
    Browse the repository at this point in the history

  2. Deleted stray prinf in HighsMipSolver.cpp

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

Commits on Aug 27, 2024

  1. Fix uninitialized arrays

    @fwesselm
    fwesselm committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    032eb56 View commit details
    Browse the repository at this point in the history

  2. Use decltype and auto some more

    @fwesselm
    fwesselm committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    c096294 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Merge pull request ERGO-Code#1897 from fwesselm/uninitArrays 

    Initialize some arrays
    @jajhall
    jajhall authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    cdd1b39 View commit details
    Browse the repository at this point in the history

  2. plot_highs_log.py now avoids printing spurious incumbent lines when b… 

    …est solution is NaN
    @jajhall
    jajhall committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    754c204 View commit details
    Browse the repository at this point in the history

  3. Merge pull request ERGO-Code#1898 from ERGO-Code/MIP-log-plotter 

    plot_highs_log.py now avoids printing spurious incumbent lines when best solution is NaN
    @jajhall
    jajhall authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    f5a22b6 View commit details
    Browse the repository at this point in the history

  4. use std::array instead of C arrays if possible

    @fwesselm
    fwesselm committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    fb89986 View commit details
    Browse the repository at this point in the history

  5. Chaser

    @fwesselm
    fwesselm committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    b1862c8 View commit details
    Browse the repository at this point in the history

  6. Added public enum HessianFormat, public class HighsHessian, private s… 

    …tatic extern int Highs_passHessian, private static extern int Highs_passModel and private static extern int Highs_getHessianNumNz to highs_csharp_api.cs
    @jajhall
    jajhall committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    74682bc View commit details
    Browse the repository at this point in the history

  7. Added dim to HessianFormat and started adding Hessian to call_highs_f… 

    …rom_csharp.cs
    @jajhall
    jajhall committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    af09d2d View commit details
    Browse the repository at this point in the history

  8. Make the LP in call_highs_from_csharp.cs feasible!

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

  9. Completed call_highs_from_csharp.cs by passing a Hessian and resolving

    @jajhall
    jajhall committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    0eee142 View commit details
    Browse the repository at this point in the history

  10. Use std::array in other places

    @fwesselm
    fwesselm committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    2788fea View commit details
    Browse the repository at this point in the history

  11. Merge pull request ERGO-Code#1902 from ERGO-Code/fix-1900a 

    Fixing ERGO-Code#1900
    @jajhall
    jajhall authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    8fce625 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Use std::next a little bit

    @fwesselm
    fwesselm committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    455c007 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Make hashes an std::array

    @fwesselm
    fwesselm committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    d69e295 View commit details
    Browse the repository at this point in the history

  2. Fixed issue when using sliced numpy arrays. We enforce the underlying… 

    … data to be contiguous with additional flags to array_t.
    @mathgeekcoder
    mathgeekcoder committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    b09d2dd View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Make entries an std::array

    @fwesselm
    fwesselm committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    584069f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'HighsHashTreeChanges2' of https://github.com/fwesselm/H… 

    …iGHS into useStdArray

# Conflicts:
#	src/util/HighsHashTree.h
    @fwesselm
    fwesselm committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    542f341 View commit details
    Browse the repository at this point in the history

  3. Fix warning along the way

    @fwesselm
    fwesselm committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    6e32cb5 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Two minor changes

    @fwesselm
    fwesselm committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ff778c6 View commit details
    Browse the repository at this point in the history

  2. No need to check for null termination

    @fwesselm
    fwesselm committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    d772edf View commit details
    Browse the repository at this point in the history

  3. Fix typo

    @fwesselm
    fwesselm committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    cc3e870 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Merge pull request ERGO-Code#1908 from fwesselm/useStdArray 

    Some minor changes
    @jajhall
    jajhall authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    8f99e6f View commit details
    Browse the repository at this point in the history

  2. Formatted

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

Commits on Sep 6, 2024

  1. Precompute expensive computations 

    Replace hot FDIVs with FMULs through saving off the inverse values
outside the loops, so we don't incur the cost on each loop iteration.
    @heshpdx
    heshpdx committed Sep 6, 2024
    Configuration menu
    Copy the full SHA
    08e57a6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request ERGO-Code#1911 from heshpdx/master 

    Precompute expensive computations
    @jajhall
    jajhall authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    0f4b0d0 View commit details
    Browse the repository at this point in the history

  3. Revert "Precompute expensive computations"

    @jajhall
    jajhall authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    f1fd3a6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request ERGO-Code#1912 from ERGO-Code/revert-1911-master 

    Revert "Precompute expensive computations"
    @jajhall
    jajhall authored Sep 6, 2024
    Configuration menu
    Copy the full SHA
    2d8d8af View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2024

  1. Significant update to highspy: 

    * additional tests (with >99% coverage)
* performance improvements
* added support for calculating a value from expression
* added support for getting expression for a given constraint
* various bug fixes
* made behaviour more consistent/intuitive
* improved numpy interability
* improved error reporting/handling
    @mathgeekcoder
    mathgeekcoder committed Sep 7, 2024
    Configuration menu
    Copy the full SHA
    1b346e8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request ERGO-Code#1886 from michaelbynum/release_gil 

    Release GIL and Run in Background Thread
    @jajhall
    jajhall authored Sep 7, 2024
    Configuration menu
    Copy the full SHA
    f7be435 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Formatted with Ubuntu clang-format version 14.0.0-1ubuntu1.1

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

  2. Merge pull request ERGO-Code#1909 from ERGO-Code/fix-1908 

    Fix 1908
    @jajhall
    jajhall authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    0f31d20 View commit details
    Browse the repository at this point in the history

  3. * changed highs_linear_expression to be immutable by default 

    * added __repr__ for easier debugging and pretty print linear expressions
* added __iadd__ for mutable operations
* added qsum for faster aggregation
* updated chained comparison support to work in immutable setting
    @mathgeekcoder
    mathgeekcoder committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    4aba651 View commit details
    Browse the repository at this point in the history

  4. Fixed issue when using sliced numpy arrays. We enforce the underlying… 

    … data to be contiguous with additional flags to array_t.
    @mathgeekcoder
    mathgeekcoder committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    7efd5e5 View commit details
    Browse the repository at this point in the history

  5. Significant update to highspy: 

    * additional tests (with >99% coverage)
* performance improvements
* added support for calculating a value from expression
* added support for getting expression for a given constraint
* various bug fixes
* made behaviour more consistent/intuitive
* improved numpy interability
* improved error reporting/handling
    @mathgeekcoder
    mathgeekcoder committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    b2107e8 View commit details
    Browse the repository at this point in the history

  6. Updated with rebase

    @mathgeekcoder
    mathgeekcoder committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    f805387 View commit details
    Browse the repository at this point in the history

  7. Fixed rebase merge issues in highspy

    @mathgeekcoder
    mathgeekcoder committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    12d5108 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. * Fixed highspy deadlocking issues 

    * Added GIL acquire for python callbacks
* Added support for user_callback_data
    @mathgeekcoder
    mathgeekcoder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    e0e0d36 View commit details
    Browse the repository at this point in the history

  2. Fixed minor issue in highspy

    @mathgeekcoder
    mathgeekcoder committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    42f9ae6 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Highspy update: 

    * added callback support
* added user/keyboard interrupt support
* fixed issues with deadlock on windows
* fixed MIP solution callback issue
* added resetGlobalScheduler
* released GIL for Presolve
* improved setCallback
* updated unit tests for 99% coverage
    @mathgeekcoder
    mathgeekcoder committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    aa4ae38 View commit details
    Browse the repository at this point in the history